Skip to content

HBASE-29876 Upgrade hbase-shell to use junit5 #7721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liuxiaocs7 wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −79
Open

HBASE-29876 Upgrade hbase-shell to use junit5 #7721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions hbase-shell/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,6 @@
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.jruby.embed.ScriptingContainer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public abstract class AbstractTestShell implements RubyShellTest {
protected final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
Expand All @@ -43,7 +43,7 @@ public String getSuitePattern() {
return "**/*_test.rb";
}

@Before
@BeforeEach
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);

Expand All @@ -55,7 +55,7 @@ public void setUp() throws Exception {
RubyShellTest.doTestSetup(this);
}

@After
@AfterEach
public void tearDown() throws Exception {
TEST_UTIL.shutdownMiniCluster();
}
Expand Down
2 changes: 1 addition & 1 deletion hbase-shell/src/test/java/org/apache/hadoop/hbase/client/RubyShellTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.slf4j.LoggerFactory;

public interface RubyShellTest {
static Logger LOG = LoggerFactory.getLogger(RubyShellTest.class);
Logger LOG = LoggerFactory.getLogger(RubyShellTest.class);

HBaseTestingUtil getTEST_UTIL();

Expand Down
18 changes: 5 additions & 13 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,22 @@

import java.io.IOException;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;

@Category({ ClientTests.class, LargeTests.class })
@Tag(ClientTests.TAG)
@Tag(LargeTests.TAG)
public class TestAdminShell extends AbstractTestShell {
private static final Logger LOG = LoggerFactory.getLogger(TestAdminShell.class);

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAdminShell.class);

@Override
public String getIncludeList() {
return "admin_test.rb";
}

@Before
@BeforeEach
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);

Expand Down
10 changes: 3 additions & 7 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestListTablesShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@
*/
package org.apache.hadoop.hbase.client;

import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Tag;

@Category({ ClientTests.class, LargeTests.class })
@Tag(ClientTests.TAG)
@Tag(LargeTests.TAG)
public class TestListTablesShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestListTablesShell.class);

@Override
public String getIncludeList() {
Expand Down
10 changes: 3 additions & 7 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@
*/
package org.apache.hadoop.hbase.client;

import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Tag;

@Category({ ClientTests.class, LargeTests.class })
@Tag(ClientTests.TAG)
@Tag(LargeTests.TAG)
public class TestQuotasShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestQuotasShell.class);

@Override
public String getIncludeList() {
Expand Down
15 changes: 5 additions & 10 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,18 @@
*/
package org.apache.hadoop.hbase.client;

import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.rsgroup.RSGroupUtil;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;

@Category({ ClientTests.class, LargeTests.class })
@Tag(ClientTests.TAG)
@Tag(LargeTests.TAG)
public class TestRSGroupShell extends AbstractTestShell {

@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestRSGroupShell.class);

@Override
@Before
@BeforeEach
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
// enable rs group
Expand Down
10 changes: 3 additions & 7 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@
*/
package org.apache.hadoop.hbase.client;

import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Tag;

@Category({ ClientTests.class, LargeTests.class })
@Tag(ClientTests.TAG)
@Tag(LargeTests.TAG)
public class TestReplicationShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestReplicationShell.class);

@Override
public String getIncludeList() {
Expand Down
9 changes: 3 additions & 6 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@
*/
package org.apache.hadoop.hbase.client;

import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Tag;

@Category({ ClientTests.class, LargeTests.class })
@Tag(ClientTests.TAG)
@Tag(LargeTests.TAG)
public class TestShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestShell.class);

@Override
public String getSuitePattern() {
Expand Down
18 changes: 7 additions & 11 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,18 @@
*/
package org.apache.hadoop.hbase.client;

import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;

@Category({ ClientTests.class, MediumTests.class })
@Tag(ClientTests.TAG)
@Tag(MediumTests.TAG)
public class TestShellNoCluster extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestShellNoCluster.class);

@Override
@Before
@BeforeEach
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);

Expand All @@ -44,7 +40,7 @@ public void setUp() throws Exception {
}

@Override
@After
@AfterEach
public void tearDown() throws Exception {
// no cluster
}
Expand Down
10 changes: 3 additions & 7 deletions hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@
*/
package org.apache.hadoop.hbase.client;

import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.junit.jupiter.api.Tag;

@Category({ ClientTests.class, LargeTests.class })
@Tag(ClientTests.TAG)
@Tag(LargeTests.TAG)
public class TestTableShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestTableShell.class);

@Override
public String getIncludeList() {
Expand Down