From cec07f9ee204ae11b8a56e33b7b154112dd15d24 Mon Sep 17 00:00:00 2001 From: liuxiaocs7 Date: Sun, 31 May 2026 02:29:43 +0800 Subject: [PATCH 1/2] HBASE-30191 Upgrade hbase-testing-util to use junit5 --- hbase-testing-util/pom.xml | 15 +++++++ .../hbase/TestHBaseTestingUtilitySpinup.java | 25 +++++------- .../testing/TestTestingHBaseCluster.java | 39 ++++++++----------- .../TestTestingHBaseClusterImplForCPs.java | 29 ++++++-------- ...estingHBaseClusterReplicationShareDfs.java | 14 ++----- ...TestingHBaseClusterReplicationShareZk.java | 14 ++----- ...tingHBaseClusterReplicationShareZkDfs.java | 14 ++----- ...ingHBaseClusterReplicationTwoClusters.java | 11 ++---- ...estingHBaseClusterReplicationTestBase.java | 14 +++---- 9 files changed, 73 insertions(+), 102 deletions(-) diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index d3d5bf9ef11e..07b92ddbe485 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -115,6 +115,21 @@ mockito-core compile + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.jupiter + junit-jupiter-params + test + com.github.stephenc.findbugs findbugs-annotations diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java index ede6277a01da..9abf5ee87095 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java @@ -17,30 +17,25 @@ */ package org.apache.hadoop.hbase; -import static org.junit.Assert.assertFalse; - +import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.List; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; /** * Make sure we can spin up a HBTU without a hbase-site.xml */ -@Category({ MiscTests.class, MediumTests.class }) +@Tag(MiscTests.TAG) +@Tag(MediumTests.TAG) public class TestHBaseTestingUtilitySpinup { - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestHBaseTestingUtilitySpinup.class); - private final static HBaseTestingUtility UTIL = new HBaseTestingUtility(); - @BeforeClass + @BeforeAll public static void beforeClass() throws Exception { UTIL.startMiniCluster(); if (!UTIL.getHBaseCluster().waitForActiveAndReadyMaster(30000)) { @@ -48,7 +43,7 @@ public static void beforeClass() throws Exception { } } - @AfterClass + @AfterAll public static void afterClass() throws Exception { UTIL.shutdownMiniCluster(); } @@ -56,7 +51,7 @@ public static void afterClass() throws Exception { @Test public void testGetMetaTableRows() throws Exception { List results = UTIL.getMetaTableRows(); - assertFalse("results should have some entries and is empty.", results.isEmpty()); + assertFalse(results.isEmpty(), "results should have some entries and is empty."); } } diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseCluster.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseCluster.java index 874e7562a23f..61cfd180faf7 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseCluster.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseCluster.java @@ -17,13 +17,11 @@ */ package org.apache.hadoop.hbase.testing; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collection; -import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.client.Admin; @@ -33,44 +31,39 @@ import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.DNS; import org.apache.hadoop.hbase.util.DNS.ServerType; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.experimental.categories.Category; - +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.apache.hbase.thirdparty.com.google.common.collect.Iterables; import org.apache.hbase.thirdparty.com.google.common.io.Closeables; -@Category({ MiscTests.class, LargeTests.class }) +@Tag(MiscTests.TAG) +@Tag(LargeTests.TAG) public class TestTestingHBaseCluster { - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestTestingHBaseCluster.class); - private static TestingHBaseCluster CLUSTER; private Connection conn; private Admin admin; - @BeforeClass + @BeforeAll public static void setUpBeforeClass() throws Exception { CLUSTER = TestingHBaseCluster.create(TestingHBaseClusterOption.builder().numMasters(2) .numRegionServers(3).numDataNodes(3).build()); } - @AfterClass + @AfterAll public static void tearDownAfterClass() throws Exception { if (CLUSTER.isClusterRunning()) { CLUSTER.stop(); } } - @Before + @BeforeEach public void setUp() throws Exception { if (!CLUSTER.isClusterRunning()) { CLUSTER.start(); @@ -82,7 +75,7 @@ public void setUp() throws Exception { admin = conn.getAdmin(); } - @After + @AfterEach public void tearDown() throws Exception { Closeables.close(admin, true); Closeables.close(conn, true); diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java index 4454dcbaa205..0323413f1a7d 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java @@ -17,13 +17,11 @@ */ package org.apache.hadoop.hbase.testing; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; - +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; import java.io.IOException; import java.util.List; -import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; @@ -39,21 +37,16 @@ import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.experimental.categories.Category; - +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.apache.hbase.thirdparty.com.google.common.io.Closeables; -@Category({ MiscTests.class, LargeTests.class }) +@Tag(MiscTests.TAG) +@Tag(LargeTests.TAG) public class TestTestingHBaseClusterImplForCPs { - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestTestingHBaseClusterImplForCPs.class); - private static TestingHBaseCluster CLUSTER; private static TableName NAME = TableName.valueOf("test"); @@ -64,7 +57,7 @@ public class TestTestingHBaseClusterImplForCPs { private static Admin ADMIN; - @BeforeClass + @BeforeAll public static void setUpBeforeClass() throws Exception { CLUSTER = TestingHBaseCluster.create(TestingHBaseClusterOption.builder().numMasters(2) .numRegionServers(3).numDataNodes(3).build()); @@ -76,7 +69,7 @@ public static void setUpBeforeClass() throws Exception { ADMIN.balancerSwitch(false, true); } - @AfterClass + @AfterAll public static void tearDownAfterClass() throws Exception { Closeables.close(ADMIN, true); Closeables.close(CONN, true); diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java index 092520059916..9dcf1809a17a 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java @@ -17,24 +17,18 @@ */ package org.apache.hadoop.hbase.testing; -import static org.junit.Assert.assertNotEquals; - -import org.apache.hadoop.hbase.HBaseClassTestRule; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.apache.hadoop.hbase.HBaseTestingUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.junit.ClassRule; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; -@Category({ MiscTests.class, LargeTests.class }) +@Tag(MiscTests.TAG) +@Tag(LargeTests.TAG) public class TestTestingHBaseClusterReplicationShareDfs extends TestingHBaseClusterReplicationTestBase { - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestTestingHBaseClusterReplicationShareDfs.class); - private HBaseTestingUtil util = new HBaseTestingUtil(); @Override diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java index b941b9b479dc..bdcf34a734e8 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java @@ -17,24 +17,18 @@ */ package org.apache.hadoop.hbase.testing; -import static org.junit.Assert.assertNotEquals; - -import org.apache.hadoop.hbase.HBaseClassTestRule; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.apache.hadoop.hbase.HBaseTestingUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.junit.ClassRule; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; -@Category({ MiscTests.class, LargeTests.class }) +@Tag(MiscTests.TAG) +@Tag(LargeTests.TAG) public class TestTestingHBaseClusterReplicationShareZk extends TestingHBaseClusterReplicationTestBase { - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestTestingHBaseClusterReplicationShareZk.class); - private HBaseTestingUtil util = new HBaseTestingUtil(); @Override diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java index ba2c0e75db21..8dbbf69c20ca 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java @@ -17,24 +17,18 @@ */ package org.apache.hadoop.hbase.testing; -import static org.junit.Assert.assertNotEquals; - -import org.apache.hadoop.hbase.HBaseClassTestRule; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.apache.hadoop.hbase.HBaseTestingUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.junit.ClassRule; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; -@Category({ MiscTests.class, LargeTests.class }) +@Tag(MiscTests.TAG) +@Tag(LargeTests.TAG) public class TestTestingHBaseClusterReplicationShareZkDfs extends TestingHBaseClusterReplicationTestBase { - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestTestingHBaseClusterReplicationShareZkDfs.class); - private HBaseTestingUtil util = new HBaseTestingUtil(); @Override diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationTwoClusters.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationTwoClusters.java index 4c57edd095ca..83d825acc483 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationTwoClusters.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationTwoClusters.java @@ -17,20 +17,15 @@ */ package org.apache.hadoop.hbase.testing; -import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.MiscTests; -import org.junit.ClassRule; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; -@Category({ MiscTests.class, LargeTests.class }) +@Tag(MiscTests.TAG) +@Tag(LargeTests.TAG) public class TestTestingHBaseClusterReplicationTwoClusters extends TestingHBaseClusterReplicationTestBase { - @ClassRule - public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestTestingHBaseClusterReplicationTwoClusters.class); - @Override protected void startClusters() throws Exception { sourceCluster = TestingHBaseCluster.create(TestingHBaseClusterOption.builder().build()); diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterReplicationTestBase.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterReplicationTestBase.java index 445c35e3c360..b23026cbe1f1 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterReplicationTestBase.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterReplicationTestBase.java @@ -17,8 +17,7 @@ */ package org.apache.hadoop.hbase.testing; -import static org.junit.Assert.assertArrayEquals; - +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import java.io.IOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; @@ -35,10 +34,9 @@ import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZKConfig; -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; import org.apache.hbase.thirdparty.com.google.common.io.Closeables; /** @@ -64,7 +62,7 @@ private String getPeerClusterKey() { return ZKConfig.getZooKeeperClusterKey(peerCluster.getConf()); } - @Before + @BeforeEach public void setUp() throws Exception { startClusters(); sourceConn = ConnectionFactory.createConnection(sourceCluster.getConf()); @@ -82,7 +80,7 @@ public void setUp() throws Exception { } } - @After + @AfterEach public void tearDown() throws Exception { Closeables.close(sourceConn, true); Closeables.close(peerConn, true); From 565709c49ec9b62b6db5bfce1ea1927ed655b154 Mon Sep 17 00:00:00 2001 From: liuxiaocs7 Date: Sun, 31 May 2026 03:27:13 +0800 Subject: [PATCH 2/2] spotless --- .../org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java | 1 + .../apache/hadoop/hbase/testing/TestTestingHBaseCluster.java | 2 ++ .../hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java | 2 ++ .../testing/TestTestingHBaseClusterReplicationShareDfs.java | 1 + .../testing/TestTestingHBaseClusterReplicationShareZk.java | 1 + .../testing/TestTestingHBaseClusterReplicationShareZkDfs.java | 1 + .../hbase/testing/TestingHBaseClusterReplicationTestBase.java | 2 ++ 7 files changed, 10 insertions(+) diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java index 9abf5ee87095..181aca35374e 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtilitySpinup.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase; import static org.junit.jupiter.api.Assertions.assertFalse; + import java.util.List; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MiscTests; diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseCluster.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseCluster.java index 61cfd180faf7..e9ead60befa3 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseCluster.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseCluster.java @@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Collection; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.Waiter; @@ -37,6 +38,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; + import org.apache.hbase.thirdparty.com.google.common.collect.Iterables; import org.apache.hbase.thirdparty.com.google.common.io.Closeables; diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java index 0323413f1a7d..ef9b5c0775e0 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterImplForCPs.java @@ -20,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertSame; + import java.io.IOException; import java.util.List; import org.apache.hadoop.hbase.ServerName; @@ -41,6 +42,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; + import org.apache.hbase.thirdparty.com.google.common.io.Closeables; @Tag(MiscTests.TAG) diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java index 9dcf1809a17a..1ebf512dd8c4 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareDfs.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.testing; import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.apache.hadoop.hbase.HBaseTestingUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.testclassification.LargeTests; diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java index bdcf34a734e8..04b85cf042b8 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZk.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.testing; import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.apache.hadoop.hbase.HBaseTestingUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.testclassification.LargeTests; diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java index 8dbbf69c20ca..324f5bb1f193 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestTestingHBaseClusterReplicationShareZkDfs.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.testing; import static org.junit.jupiter.api.Assertions.assertNotEquals; + import org.apache.hadoop.hbase.HBaseTestingUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.testclassification.LargeTests; diff --git a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterReplicationTestBase.java b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterReplicationTestBase.java index b23026cbe1f1..47c9634a1e44 100644 --- a/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterReplicationTestBase.java +++ b/hbase-testing-util/src/test/java/org/apache/hadoop/hbase/testing/TestingHBaseClusterReplicationTestBase.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.testing; import static org.junit.jupiter.api.Assertions.assertArrayEquals; + import java.io.IOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; @@ -37,6 +38,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.apache.hbase.thirdparty.com.google.common.io.Closeables; /**