connectionSupplier;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterExtension.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterExtension.java
new file mode 100644
index 000000000000..8be469f6fa5b
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterExtension.java
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase;
+
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.client.AsyncConnection;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * An {@link Extension} that manages an instance of the {@link MiniHBaseCluster}. Built on top of an
+ * instance of {@link HBaseTestingUtility}, so be weary of intermixing direct use of that class with
+ * this Extension.
+ *
+ * Use in combination with {@link ConnectionExtension}, for example:
+ *
+ *
+ * {
+ * @code
+ * public class TestMyClass {
+ *
+ * @RegisterExtension
+ * public static final MiniClusterExtension miniClusterExtension =
+ * MiniClusterExtension.newBuilder().build();
+ *
+ * @RegisterExtension
+ * public final ConnectionExtension connectionExtension = ConnectionExtension
+ * .createAsyncConnectionExtension(miniClusterExtension::createAsyncConnection);
+ * }
+ * }
+ *
+ */
+public final class MiniClusterExtension implements BeforeAllCallback, AfterAllCallback {
+
+ /**
+ * A builder for fluent composition of a new {@link MiniClusterExtension}.
+ */
+ public static final class Builder {
+
+ private StartMiniClusterOption miniClusterOption;
+ private Configuration conf;
+
+ /**
+ * Use the provided {@link StartMiniClusterOption} to construct the {@link MiniHBaseCluster}.
+ */
+ public Builder setMiniClusterOption(final StartMiniClusterOption miniClusterOption) {
+ this.miniClusterOption = miniClusterOption;
+ return this;
+ }
+
+ /**
+ * Seed the underlying {@link HBaseTestingUtility} with the provided {@link Configuration}.
+ */
+ public Builder setConfiguration(final Configuration conf) {
+ this.conf = conf;
+ return this;
+ }
+
+ public Builder setConfiguration(final Supplier supplier) {
+ return setConfiguration(supplier.get());
+ }
+
+ public MiniClusterExtension build() {
+ return new MiniClusterExtension(conf,
+ miniClusterOption != null ? miniClusterOption : StartMiniClusterOption.builder().build());
+ }
+ }
+
+ /**
+ * Returns the underlying instance of {@link HBaseTestingUtility}
+ */
+ private final HBaseTestingUtility testingUtility;
+ private final StartMiniClusterOption miniClusterOptions;
+
+ private MiniHBaseCluster miniCluster;
+
+ private MiniClusterExtension(final Configuration conf,
+ final StartMiniClusterOption miniClusterOptions) {
+ this.testingUtility = new HBaseTestingUtility(conf);
+ this.miniClusterOptions = miniClusterOptions;
+ }
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ /**
+ * Returns the underlying instance of {@link HBaseTestingUtility}
+ */
+ public HBaseTestingUtility getTestingUtility() {
+ return testingUtility;
+ }
+
+ /**
+ * Create a {@link Connection} to the managed {@link MiniHBaseCluster}. It's up to the caller to
+ * {@link Connection#close() close()} the connection when finished.
+ */
+ public Connection createConnection() {
+ if (miniCluster == null) {
+ throw new IllegalStateException("test cluster not initialized");
+ }
+ try {
+ return ConnectionFactory.createConnection(miniCluster.getConf());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Create a {@link AsyncConnection} to the managed {@link MiniHBaseCluster}. It's up to the caller
+ * to {@link AsyncConnection#close() close()} the connection when finished.
+ */
+ public CompletableFuture createAsyncConnection() {
+ if (miniCluster == null) {
+ throw new IllegalStateException("test cluster not initialized");
+ }
+ return ConnectionFactory.createAsyncConnection(miniCluster.getConf());
+ }
+
+ @Override
+ public void beforeAll(ExtensionContext context) throws Exception {
+ miniCluster = testingUtility.startMiniCluster(miniClusterOptions);
+ }
+
+ @Override
+ public void afterAll(ExtensionContext context) {
+ try {
+ testingUtility.shutdownMiniCluster();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterRule.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterRule.java
index 5919a088a77e..2d035c87235f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterRule.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterRule.java
@@ -49,7 +49,14 @@
* }
* }
*
+ *
+ * @deprecated Use {@link MiniClusterExtension} instead, Once we finish the migration of JUnit5,
+ * which means we do not need {@link MiniClusterRule} any more, we can remove these
+ * dependencies, see
+ * HBASE-23671 for more
+ * details.
*/
+@Deprecated
public final class MiniClusterRule extends ExternalResource {
/**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAccessControlAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAccessControlAdminApi.java
index 07204eac2614..6585bd5a6bac 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAccessControlAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAccessControlAdminApi.java
@@ -17,13 +17,14 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.List;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.function.Supplier;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.security.access.GetUserPermissionsRequest;
@@ -34,24 +35,23 @@
import org.apache.hadoop.hbase.security.access.UserPermission;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
-@RunWith(Parameterized.class)
-@Category({ ClientTests.class, SmallTests.class })
+@Tag(ClientTests.TAG)
+@Tag(SmallTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: admin = {0}")
public class TestAsyncAccessControlAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncAccessControlAdminApi.class);
+ public TestAsyncAccessControlAdminApi(Supplier admin) {
+ super(admin);
+ }
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration());
TEST_UTIL.startMiniCluster(1);
@@ -59,7 +59,12 @@ public static void setUpBeforeClass() throws Exception {
ASYNC_CONN = ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
}
- @Test
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @TestTemplate
public void test() throws Exception {
TableName tableName = TableName.valueOf("test-table");
String userName1 = "user1";
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
index e20e70509c36..77beca2d008d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
@@ -20,25 +20,20 @@
import static org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER_COUNT_KEY;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ForkJoinPool;
import java.util.function.Supplier;
import java.util.regex.Pattern;
+import java.util.stream.Stream;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.StartMiniClusterOption;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.params.provider.Arguments;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,9 +53,12 @@ public abstract class TestAsyncAdminBase extends AbstractTestUpdateConfiguration
protected static AsyncConnection ASYNC_CONN;
protected AsyncAdmin admin;
- @Parameter
public Supplier getAdmin;
+ public TestAsyncAdminBase(Supplier admin) {
+ this.getAdmin = admin;
+ }
+
private static AsyncAdmin getRawAsyncAdmin() {
return ASYNC_CONN.getAdmin();
}
@@ -69,17 +67,13 @@ private static AsyncAdmin getAsyncAdmin() {
return ASYNC_CONN.getAdmin(ForkJoinPool.commonPool());
}
- @Parameters
- public static List params() {
- return Arrays.asList(new Supplier[] { TestAsyncAdminBase::getRawAsyncAdmin },
- new Supplier[] { TestAsyncAdminBase::getAsyncAdmin });
+ public static Stream parameters() {
+ return Stream.of(Arguments.of((Supplier) TestAsyncAdminBase::getRawAsyncAdmin),
+ Arguments.of((Supplier) TestAsyncAdminBase::getAsyncAdmin));
}
- @Rule
- public TestName testName = new TestName();
protected TableName tableName;
- @BeforeClass
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, 60000);
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 120000);
@@ -91,20 +85,19 @@ public static void setUpBeforeClass() throws Exception {
ASYNC_CONN = ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
}
- @AfterClass
public static void tearDownAfterClass() throws Exception {
Closeables.close(ASYNC_CONN, true);
TEST_UTIL.shutdownMiniCluster();
}
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ public void setUp(TestInfo testInfo) throws Exception {
admin = getAdmin.get();
- String methodName = testName.getMethodName();
+ String methodName = testInfo.getTestMethod().get().getName();
tableName = TableName.valueOf(methodName.substring(0, methodName.length() - 3));
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
admin.listTableNames(Pattern.compile(tableName.getNameAsString() + ".*"), false)
.whenCompleteAsync((tables, err) -> {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminClearMasterStubCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminClearMasterStubCache.java
index 6f73b4dec36a..460dcc4ecce7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminClearMasterStubCache.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminClearMasterStubCache.java
@@ -17,12 +17,13 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.net.Socket;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.function.Supplier;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.ServerName;
@@ -30,36 +31,46 @@
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.FutureUtils;
import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+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.TestTemplate;
/**
* Testcase for HBASE-29214
*/
-@RunWith(Parameterized.class)
-@Category({ ClientTests.class, MediumTests.class })
+@Tag(ClientTests.TAG)
+@Tag(MediumTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncAdminClearMasterStubCache extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncAdminClearMasterStubCache.class);
+ public TestAsyncAdminClearMasterStubCache(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
- @Before
+ @BeforeEach
public void waitMasterReady() throws Exception {
assertTrue(TEST_UTIL.getHBaseCluster().waitForActiveAndReadyMaster(30000));
}
- @After
+ @AfterEach
public void clearPortConfig() {
TEST_UTIL.getHBaseCluster().getConf().setInt(HConstants.MASTER_PORT, 0);
}
- @Test
+ @TestTemplate
public void testClearMasterStubCache() throws Exception {
// cache master stub
assertNotNull(FutureUtils.get(admin.getClusterMetrics()));
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminMasterSwitch.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminMasterSwitch.java
index f8a8f0ed5079..4d1251d0f16c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminMasterSwitch.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminMasterSwitch.java
@@ -17,33 +17,44 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.EnumSet;
+import java.util.function.Supplier;
import org.apache.hadoop.hbase.ClusterMetrics;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Testcase for HBASE-22135.
*/
-@RunWith(Parameterized.class)
-@Category({ MediumTests.class, ClientTests.class })
+@Tag(MediumTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncAdminMasterSwitch extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncAdminMasterSwitch.class);
+ public TestAsyncAdminMasterSwitch(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
- @Test
+ @TestTemplate
public void testSwitch() throws IOException, InterruptedException {
assertEquals(TEST_UTIL.getHBaseCluster().getRegionServerThreads().size(),
admin.getClusterMetrics(EnumSet.of(ClusterMetrics.Option.SERVERS_NAME)).join()
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminModifyStoreFileTracker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminModifyStoreFileTracker.java
index fb6f55c4df0f..9aaa9e043950 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminModifyStoreFileTracker.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminModifyStoreFileTracker.java
@@ -17,14 +17,15 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
+import java.util.function.Supplier;
import org.apache.hadoop.hbase.DoNotRetryIOException;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotEnabledException;
import org.apache.hadoop.hbase.TableNotFoundException;
@@ -34,24 +35,34 @@
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.FutureUtils;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
+
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncAdminModifyStoreFileTracker extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncAdminModifyStoreFileTracker.class);
-
private static final String SRC_IMPL = "hbase.store.file-tracker.migration.src.impl";
private static final String DST_IMPL = "hbase.store.file-tracker.migration.dst.impl";
+ public TestAsyncAdminModifyStoreFileTracker(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
private void verifyModifyTableResult(TableName tableName, byte[] family, byte[] qual, byte[] row,
byte[] value, String sft) throws IOException {
TableDescriptor td = admin.getDescriptor(tableName).join();
@@ -64,7 +75,7 @@ private void verifyModifyTableResult(TableName tableName, byte[] family, byte[]
}
}
- @Test
+ @TestTemplate
public void testModifyTableStoreFileTracker() throws IOException {
byte[] family = Bytes.toBytes("info");
byte[] qual = Bytes.toBytes("q");
@@ -123,7 +134,7 @@ private void verifyModifyColumnFamilyResult(TableName tableName, byte[] family,
}
}
- @Test
+ @TestTemplate
public void testModifyColumnFamilyStoreFileTracker() throws IOException {
byte[] family = Bytes.toBytes("info");
byte[] qual = Bytes.toBytes("q");
@@ -173,7 +184,7 @@ public void testModifyColumnFamilyStoreFileTracker() throws IOException {
StoreFileTrackerFactory.Trackers.DEFAULT.name());
}
- @Test
+ @TestTemplate
public void testModifyStoreFileTrackerError() throws IOException {
byte[] family = Bytes.toBytes("info");
TEST_UTIL.createTable(tableName, family).close();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminWithRegionReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminWithRegionReplicas.java
index 033401cdc32f..b4feb8f06d40 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminWithRegionReplicas.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminWithRegionReplicas.java
@@ -19,15 +19,16 @@
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
@@ -35,22 +36,21 @@
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncAdminWithRegionReplicas extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncAdminWithRegionReplicas.class);
+ public TestAsyncAdminWithRegionReplicas(Supplier admin) {
+ super(admin);
+ }
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TestAsyncAdminBase.setUpBeforeClass();
HBaseTestingUtility.setReplicas(TEST_UTIL.getAdmin(), TableName.META_TABLE_NAME, 3);
@@ -60,6 +60,11 @@ public static void setUpBeforeClass() throws Exception {
}
}
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
private void testMoveNonDefaultReplica(TableName tableName)
throws InterruptedException, ExecutionException {
AsyncTableRegionLocator locator = ASYNC_CONN.getRegionLocator(tableName);
@@ -74,7 +79,7 @@ private void testMoveNonDefaultReplica(TableName tableName)
locator.getRegionLocation(HConstants.EMPTY_START_ROW, 2, true).get());
}
- @Test
+ @TestTemplate
public void testMoveNonDefaultReplica()
throws InterruptedException, ExecutionException, IOException {
createTableWithDefaultConf(tableName, 3);
@@ -82,7 +87,7 @@ public void testMoveNonDefaultReplica()
testMoveNonDefaultReplica(TableName.META_TABLE_NAME);
}
- @Test
+ @TestTemplate
public void testSplitNonDefaultReplica()
throws InterruptedException, ExecutionException, IOException {
createTableWithDefaultConf(tableName, 3);
@@ -100,7 +105,7 @@ public void testSplitNonDefaultReplica()
}
}
- @Test
+ @TestTemplate
public void testMergeNonDefaultReplicas()
throws InterruptedException, ExecutionException, IOException {
byte[][] splitRows = new byte[][] { Bytes.toBytes(0) };
@@ -128,14 +133,14 @@ public void testMergeNonDefaultReplicas()
}
}
- @Test
+ @TestTemplate
public void testCloneTableSchema() throws IOException, InterruptedException, ExecutionException {
createTableWithDefaultConf(tableName, 3);
admin.cloneTableSchema(tableName, TableName.valueOf(tableName.getNameAsString() + "_new"), true)
.get();
}
- @Test
+ @TestTemplate
public void testGetTableRegions() throws InterruptedException, ExecutionException, IOException {
List metaRegions = admin.getRegions(TableName.META_TABLE_NAME).get();
assertEquals(3, metaRegions.size());
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
index 30cb95d80d16..fac6b7ef06fb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
@@ -18,8 +18,8 @@
package org.apache.hadoop.hbase.client;
import static org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER_COUNT_KEY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,10 +28,11 @@
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
+import java.util.function.Supplier;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ClusterMetrics;
import org.apache.hadoop.hbase.ClusterMetrics.Option;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.RegionMetrics;
@@ -44,25 +45,24 @@
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
import org.apache.hbase.thirdparty.com.google.common.collect.Maps;
-@RunWith(Parameterized.class)
-@Category({ ClientTests.class, LargeTests.class })
+@Tag(ClientTests.TAG)
+@Tag(LargeTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncClusterAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncClusterAdminApi.class);
+ public TestAsyncClusterAdminApi(Supplier admin) {
+ super(admin);
+ }
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
setUpConfigurationFiles(TEST_UTIL);
@@ -77,13 +77,18 @@ public static void setUpBeforeClass() throws Exception {
addResourceToRegionServerConfiguration(TEST_UTIL);
}
- @Test
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @TestTemplate
public void testGetMasterInfoPort() throws Exception {
assertEquals(TEST_UTIL.getHBaseCluster().getMaster().getInfoServer().getPort(),
(int) admin.getMasterInfoPort().get());
}
- @Test
+ @TestTemplate
public void testRegionServerOnlineConfigChange() throws Exception {
replaceHBaseSiteXML();
admin.getRegionServers().get().forEach(server -> admin.updateConfiguration(server).join());
@@ -97,7 +102,7 @@ public void testRegionServerOnlineConfigChange() throws Exception {
restoreHBaseSiteXML();
}
- @Test
+ @TestTemplate
public void testMasterOnlineConfigChange() throws Exception {
replaceHBaseSiteXML();
ServerName master = admin.getMaster().get();
@@ -114,7 +119,7 @@ public void testMasterOnlineConfigChange() throws Exception {
restoreHBaseSiteXML();
}
- @Test
+ @TestTemplate
public void testAllClusterOnlineConfigChange() throws IOException {
replaceHBaseSiteXML();
admin.updateConfiguration().join();
@@ -134,7 +139,7 @@ public void testAllClusterOnlineConfigChange() throws IOException {
restoreHBaseSiteXML();
}
- @Test
+ @TestTemplate
public void testRollWALWALWriter() throws Exception {
setUpforLogRolling();
String className = this.getClass().getName();
@@ -214,7 +219,7 @@ private HRegionServer startAndWriteData(TableName tableName, byte[] value) throw
return regionServer;
}
- @Test
+ @TestTemplate
public void testGetRegionLoads() throws Exception {
// Turn off the balancer
admin.balancerSwitch(false).join();
@@ -257,7 +262,7 @@ public void testGetRegionLoads() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testGetRegionServers() throws Exception {
List serverNames = new ArrayList<>(admin.getRegionServers(true).get());
assertEquals(2, serverNames.size());
@@ -280,8 +285,8 @@ public void testGetRegionServers() throws Exception {
private void compareRegionLoads(Collection regionLoadCluster,
Collection regionLoads) {
- assertEquals("No of regionLoads from clusterStatus and regionloads from RS doesn't match",
- regionLoadCluster.size(), regionLoads.size());
+ assertEquals(regionLoadCluster.size(), regionLoads.size(),
+ "No of regionLoads from clusterStatus and regionloads from RS doesn't match");
for (RegionMetrics loadCluster : regionLoadCluster) {
boolean matched = false;
@@ -291,22 +296,23 @@ private void compareRegionLoads(Collection regionLoadCluster,
continue;
}
}
- assertTrue("The contents of region load from cluster and server should match", matched);
+ assertTrue(matched, "The contents of region load from cluster and server should match");
}
}
private void checkRegionsAndRegionLoads(Collection regions,
Collection regionLoads) {
- assertEquals("No of regions and regionloads doesn't match", regions.size(), regionLoads.size());
+ assertEquals(regions.size(), regionLoads.size(), "No of regions and regionloads doesn't match");
Map regionLoadMap = Maps.newTreeMap(Bytes.BYTES_COMPARATOR);
for (RegionMetrics regionLoad : regionLoads) {
regionLoadMap.put(regionLoad.getRegionName(), regionLoad);
}
for (RegionInfo info : regions) {
- assertTrue("Region not in regionLoadMap region:" + info.getRegionNameAsString()
- + " regionMap: " + regionLoadMap, regionLoadMap.containsKey(info.getRegionName()));
+ assertTrue(regionLoadMap.containsKey(info.getRegionName()),
+ "Region not in regionLoadMap region:" + info.getRegionNameAsString() + " regionMap: "
+ + regionLoadMap);
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi2.java
index 40cb0a66c77d..513aad374d6a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi2.java
@@ -18,37 +18,40 @@
package org.apache.hadoop.hbase.client;
import static org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER_COUNT_KEY;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.concurrent.TimeUnit;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.function.Supplier;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
-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.TestInfo;
+import org.junit.jupiter.api.TestTemplate;
import org.apache.hbase.thirdparty.com.google.common.io.Closeables;
/**
* Only used to test stopMaster/stopRegionServer/shutdown methods.
*/
-@Category({ ClientTests.class, MediumTests.class })
+@Tag(ClientTests.TAG)
+@Tag(MediumTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncClusterAdminApi2 extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncClusterAdminApi2.class);
+ public TestAsyncClusterAdminApi2(Supplier admin) {
+ super(admin);
+ }
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, 60000);
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 120000);
@@ -56,27 +59,27 @@ public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setInt(START_LOG_ERRORS_AFTER_COUNT_KEY, 0);
}
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() throws Exception {
// do nothing
}
- @Before
+ @BeforeEach
@Override
- public void setUp() throws Exception {
+ public void setUp(TestInfo testInfo) throws Exception {
TEST_UTIL.startMiniCluster(3);
ASYNC_CONN = ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
admin = ASYNC_CONN.getAdmin();
}
- @After
+ @AfterEach
@Override
public void tearDown() throws Exception {
Closeables.close(ASYNC_CONN, true);
TEST_UTIL.shutdownMiniCluster();
}
- @Test
+ @TestTemplate
public void testStop() throws Exception {
HRegionServer rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);
assertFalse(rs.isStopped());
@@ -89,7 +92,7 @@ public void testStop() throws Exception {
assertTrue(master.isStopped());
}
- @Test
+ @TestTemplate
public void testShutdown() throws Exception {
TEST_UTIL.getMiniHBaseCluster().getMasterThreads().forEach(thread -> {
assertFalse(thread.getMaster().isStopped());
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncDecommissionAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncDecommissionAdminApi.java
index 659aa0d05c68..5bc1aff3a2f3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncDecommissionAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncDecommissionAdminApi.java
@@ -17,34 +17,45 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.apache.hadoop.hbase.ClusterMetrics.Option;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-@Category({ ClientTests.class, MediumTests.class })
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
+
+@Tag(ClientTests.TAG)
+@Tag(MediumTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncDecommissionAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncDecommissionAdminApi.class);
+ public TestAsyncDecommissionAdminApi(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
- @Test
+ @TestTemplate
public void testAsyncDecommissionRegionServers() throws Exception {
admin.balancerSwitch(false, true);
List decommissionedRegionServers = admin.listDecommissionedRegionServers().get();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNamespaceAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNamespaceAdminApi.java
index 2df8f269d2c6..13f75ecfc00e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNamespaceAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNamespaceAdminApi.java
@@ -18,14 +18,15 @@
package org.apache.hadoop.hbase.client;
import static org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER_COUNT_KEY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.concurrent.Callable;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.function.Supplier;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
@@ -38,29 +39,28 @@
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous namespace admin operations.
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncNamespaceAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncNamespaceAdminApi.class);
-
private String prefix = "TestNamespace";
private static HMaster master;
private static ZKNamespaceManager zkNamespaceManager;
- @BeforeClass
+ public TestAsyncNamespaceAdminApi(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, 60000);
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 120000);
@@ -74,7 +74,12 @@ public static void setUpBeforeClass() throws Exception {
LOG.info("Done initializing cluster");
}
- @Test
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @TestTemplate
public void testCreateAndDelete() throws Exception {
String testName = "testCreateAndDelete";
String nsName = prefix + "_" + testName;
@@ -98,7 +103,7 @@ public boolean evaluate() throws Exception {
assertNull(zkNamespaceManager.get(nsName));
}
- @Test
+ @TestTemplate
public void testDeleteReservedNS() throws Exception {
boolean exceptionCaught = false;
try {
@@ -120,7 +125,7 @@ public void testDeleteReservedNS() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testNamespaceOperations() throws Exception {
admin.createNamespace(NamespaceDescriptor.create(prefix + "ns1").build()).join();
admin.createNamespace(NamespaceDescriptor.create(prefix + "ns2").build()).join();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcedureAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcedureAdminApi.java
index 4cc9d1275da6..c4f25453a295 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcedureAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcedureAdminApi.java
@@ -18,14 +18,15 @@
package org.apache.hadoop.hbase.client;
import static org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER_COUNT_KEY;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.function.Supplier;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
import org.apache.hadoop.hbase.procedure.ProcedureManagerHost;
@@ -34,26 +35,24 @@
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous procedure admin operations.
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncProcedureAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncProcedureAdminApi.class);
+ public TestAsyncProcedureAdminApi(Supplier admin) {
+ super(admin);
+ }
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, 60000);
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 120000);
@@ -68,7 +67,12 @@ public static void setUpBeforeClass() throws Exception {
ASYNC_CONN = ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
}
- @Test
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @TestTemplate
public void testExecProcedure() throws Exception {
String snapshotString = "offlineTableSnapshot";
try {
@@ -89,21 +93,21 @@ public void testExecProcedure() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testExecProcedureWithRet() throws Exception {
byte[] result = admin.execProcedureWithReturn(SimpleMasterProcedureManager.SIMPLE_SIGNATURE,
"myTest2", new HashMap<>()).get();
- assertArrayEquals("Incorrect return data from execProcedure",
- Bytes.toBytes(SimpleMasterProcedureManager.SIMPLE_DATA), result);
+ assertArrayEquals(Bytes.toBytes(SimpleMasterProcedureManager.SIMPLE_DATA), result,
+ "Incorrect return data from execProcedure");
}
- @Test
+ @TestTemplate
public void listProcedure() throws Exception {
String procList = admin.getProcedures().get();
assertTrue(procList.startsWith("["));
}
- @Test
+ @TestTemplate
public void isProcedureFinished() throws Exception {
boolean failed = false;
try {
@@ -111,10 +115,10 @@ public void isProcedureFinished() throws Exception {
} catch (Exception e) {
failed = true;
}
- Assert.assertTrue(failed);
+ assertTrue(failed);
}
- @Test
+ @TestTemplate
public void abortProcedure() throws Exception {
long procId = ThreadLocalRandom.current().nextLong();
boolean abortResult = admin.abortProcedure(procId, true).get();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncQuotaAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncQuotaAdminApi.java
index ab18244af191..26ff7f83a9fc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncQuotaAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncQuotaAdminApi.java
@@ -18,13 +18,14 @@
package org.apache.hadoop.hbase.client;
import static org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER_COUNT_KEY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.function.Supplier;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.quotas.QuotaCache;
@@ -37,22 +38,21 @@
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-@Category({ ClientTests.class, MediumTests.class })
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
+
+@Tag(ClientTests.TAG)
+@Tag(MediumTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncQuotaAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncQuotaAdminApi.class);
+ public TestAsyncQuotaAdminApi(Supplier admin) {
+ super(admin);
+ }
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
TEST_UTIL.getConfiguration().setInt(QuotaCache.REFRESH_CONF_KEY, 2000);
@@ -65,7 +65,12 @@ public static void setUpBeforeClass() throws Exception {
ASYNC_CONN = ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
}
- @Test
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @TestTemplate
public void testThrottleType() throws Exception {
String userName = User.getCurrent().getShortName();
@@ -101,7 +106,7 @@ public void testThrottleType() throws Exception {
assertNumResults(0, null);
}
- @Test
+ @TestTemplate
public void testQuotaRetrieverFilter() throws Exception {
TableName[] tables = new TableName[] { TableName.valueOf("T0"), TableName.valueOf("T01"),
TableName.valueOf("NS0:T2"), };
@@ -181,7 +186,7 @@ public void testQuotaRetrieverFilter() throws Exception {
assertNumResults(0, null);
}
- @Test
+ @TestTemplate
public void testSwitchRpcThrottle() throws Exception {
CompletableFuture future1 = ASYNC_CONN.getAdmin().switchRpcThrottle(true);
assertEquals(true, future1.get().booleanValue());
@@ -189,7 +194,7 @@ public void testSwitchRpcThrottle() throws Exception {
assertEquals(true, future2.get().booleanValue());
}
- @Test
+ @TestTemplate
public void testSwitchExceedThrottleQuota() throws Exception {
AsyncAdmin admin = ASYNC_CONN.getAdmin();
assertEquals(false, admin.exceedThrottleQuotaSwitch(false).get().booleanValue());
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
index d3b4f51e1d21..400b9a87678c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
@@ -19,11 +19,11 @@
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.ArrayList;
@@ -32,9 +32,10 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotFoundException;
@@ -52,25 +53,36 @@
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.JVMClusterUtil;
import org.apache.hadoop.hbase.util.Threads;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous region admin operations.
* @see TestAsyncRegionAdminApi2 This test and it used to be joined it was taking longer than our
* ten minute timeout so they were split.
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncRegionAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncRegionAdminApi.class);
- @Test
+ public TestAsyncRegionAdminApi(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @TestTemplate
public void testAssignRegionAndUnassignRegion() throws Exception {
createTableWithDefaultConf(tableName);
@@ -126,7 +138,7 @@ RegionInfo createTableAndGetOneRegion(final TableName tableName)
}
}
- @Test
+ @TestTemplate
public void testGetRegionByStateOfTable() throws Exception {
RegionInfo hri = createTableAndGetOneRegion(tableName);
@@ -139,7 +151,7 @@ public void testGetRegionByStateOfTable() throws Exception {
.anyMatch(r -> RegionInfo.COMPARATOR.compare(r, hri) == 0));
}
- @Test
+ @TestTemplate
public void testMoveRegion() throws Exception {
admin.balancerSwitch(false).join();
@@ -178,7 +190,7 @@ public void testMoveRegion() throws Exception {
admin.balancerSwitch(true).join();
}
- @Test
+ @TestTemplate
public void testGetOnlineRegions() throws Exception {
createTableAndGetOneRegion(tableName);
AtomicInteger regionServerCount = new AtomicInteger(0);
@@ -196,7 +208,7 @@ public void testGetOnlineRegions() throws Exception {
regionServerCount.get());
}
- @Test
+ @TestTemplate
public void testFlushTableAndRegion() throws Exception {
RegionInfo hri = createTableAndGetOneRegion(tableName);
ServerName serverName = TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager()
@@ -247,7 +259,7 @@ private void waitUntilMobCompactionFinished(TableName tableName)
assertEquals(CompactionState.NONE, state);
}
- @Test
+ @TestTemplate
public void testCompactMob() throws Exception {
ColumnFamilyDescriptor columnDescriptor = ColumnFamilyDescriptorBuilder
.newBuilder(Bytes.toBytes("mob")).setMobEnabled(true).setMobThreshold(0).build();
@@ -268,7 +280,7 @@ public void testCompactMob() throws Exception {
waitUntilMobCompactionFinished(tableName);
}
- @Test
+ @TestTemplate
public void testCompactRegionServer() throws Exception {
byte[][] families = { Bytes.toBytes("f1"), Bytes.toBytes("f2"), Bytes.toBytes("f3") };
createTableWithDefaultConf(tableName, null, families);
@@ -297,7 +309,7 @@ public void testCompactRegionServer() throws Exception {
assertEquals(3, countAfterMajorCompaction);
}
- @Test
+ @TestTemplate
public void testCompactionSwitchStates() throws Exception {
// Create a table with regions
byte[] family = Bytes.toBytes("family");
@@ -312,20 +324,20 @@ public void testCompactionSwitchStates() throws Exception {
admin.compactionSwitch(true, new ArrayList<>());
Map pairs = listCompletableFuture.get();
for (Map.Entry p : pairs.entrySet()) {
- assertEquals("Default compaction state, expected=enabled actual=disabled", true,
- p.getValue());
+ assertEquals(true, p.getValue(),
+ "Default compaction state, expected=enabled actual=disabled");
}
CompletableFuture> listCompletableFuture1 =
admin.compactionSwitch(false, new ArrayList<>());
Map pairs1 = listCompletableFuture1.get();
for (Map.Entry p : pairs1.entrySet()) {
- assertEquals("Last compaction state, expected=enabled actual=disabled", true, p.getValue());
+ assertEquals(true, p.getValue(), "Last compaction state, expected=enabled actual=disabled");
}
CompletableFuture> listCompletableFuture2 =
admin.compactionSwitch(true, new ArrayList<>());
Map pairs2 = listCompletableFuture2.get();
for (Map.Entry p : pairs2.entrySet()) {
- assertEquals("Last compaction state, expected=disabled actual=enabled", false, p.getValue());
+ assertEquals(false, p.getValue(), "Last compaction state, expected=disabled actual=enabled");
}
ServerName serverName = TEST_UTIL.getHBaseCluster().getRegionServer(0).getServerName();
List serverNameList = new ArrayList();
@@ -335,18 +347,18 @@ public void testCompactionSwitchStates() throws Exception {
Map pairs3 = listCompletableFuture3.get();
assertEquals(pairs3.entrySet().size(), 1);
for (Map.Entry p : pairs3.entrySet()) {
- assertEquals("Last compaction state, expected=enabled actual=disabled", true, p.getValue());
+ assertEquals(true, p.getValue(), "Last compaction state, expected=enabled actual=disabled");
}
CompletableFuture> listCompletableFuture4 =
admin.compactionSwitch(true, serverNameList);
Map pairs4 = listCompletableFuture4.get();
assertEquals(pairs4.entrySet().size(), 1);
for (Map.Entry p : pairs4.entrySet()) {
- assertEquals("Last compaction state, expected=disabled actual=enabled", false, p.getValue());
+ assertEquals(false, p.getValue(), "Last compaction state, expected=disabled actual=enabled");
}
}
- @Test
+ @TestTemplate
public void testCompact() throws Exception {
compactionTest(TableName.valueOf("testCompact1"), 15, CompactionState.MINOR, false);
compactionTest(TableName.valueOf("testCompact2"), 15, CompactionState.MINOR, true);
@@ -454,12 +466,12 @@ private void compactionTest(final TableName tableName, final int flushes,
if (expectedState == CompactionState.MAJOR) {
assertEquals(1, countAfterSingleFamily);
} else {
- assertTrue("" + countAfterSingleFamily, 1 <= countAfterSingleFamily);
+ assertTrue(1 <= countAfterSingleFamily, "" + countAfterSingleFamily);
}
}
}
- @Test
+ @TestTemplate
public void testNonExistentTableCompaction() {
testNonExistentTableCompaction(CompactionState.MINOR);
testNonExistentTableCompaction(CompactionState.MAJOR);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.java
index 44106fb4ccf0..5f8367f07258 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.java
@@ -20,19 +20,20 @@
import static org.apache.hadoop.hbase.TableName.META_TABLE_NAME;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.apache.hadoop.hbase.AsyncMetaTableAccessor;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.TableName;
@@ -42,27 +43,37 @@
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous region admin operations.
* @see TestAsyncRegionAdminApi This test and it used to be joined it was taking longer than our ten
* minute timeout so they were split.
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncRegionAdminApi2 extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncRegionAdminApi2.class);
+ public TestAsyncRegionAdminApi2(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
- @Test
+ @TestTemplate
public void testGetRegionLocation() throws Exception {
RawAsyncHBaseAdmin rawAdmin = (RawAsyncHBaseAdmin) ASYNC_CONN.getAdmin();
TEST_UTIL.createMultiRegionTable(tableName, HConstants.CATALOG_FAMILY);
@@ -76,7 +87,7 @@ public void testGetRegionLocation() throws Exception {
assertTrue(Bytes.equals(regionName, location.getRegion().getRegionName()));
}
- @Test
+ @TestTemplate
public void testSplitSwitch() throws Exception {
createTableWithDefaultConf(tableName);
byte[][] families = { FAMILY };
@@ -106,8 +117,8 @@ public void testSplitSwitch() throws Exception {
assertTrue(originalCount < count);
}
- @Test
- @Ignore
+ @TestTemplate
+ @Disabled
// It was ignored in TestSplitOrMergeStatus, too
public void testMergeSwitch() throws Exception {
createTableWithDefaultConf(tableName);
@@ -125,8 +136,8 @@ public void testMergeSwitch() throws Exception {
while ((postSplitCount = admin.getRegions(tableName).get().size()) == originalCount) {
Threads.sleep(100);
}
- assertTrue("originalCount=" + originalCount + ", postSplitCount=" + postSplitCount,
- originalCount != postSplitCount);
+ assertTrue(originalCount != postSplitCount,
+ "originalCount=" + originalCount + ", postSplitCount=" + postSplitCount);
// Merge switch is off so merge should NOT succeed.
assertTrue(admin.mergeSwitch(false).get());
@@ -134,7 +145,7 @@ public void testMergeSwitch() throws Exception {
assertTrue(regions.size() > 1);
admin.mergeRegions(regions.get(0).getRegionName(), regions.get(1).getRegionName(), true).join();
int count = admin.getRegions(tableName).get().size();
- assertTrue("postSplitCount=" + postSplitCount + ", count=" + count, postSplitCount == count);
+ assertTrue(postSplitCount == count, "postSplitCount=" + postSplitCount + ", count=" + count);
// Merge switch is on so merge should succeed.
assertFalse(admin.mergeSwitch(true).get());
@@ -154,7 +165,7 @@ private void initSplitMergeSwitch() throws Exception {
assertTrue(admin.isMergeEnabled().get());
}
- @Test
+ @TestTemplate
public void testMergeRegions() throws Exception {
byte[][] splitRows = new byte[][] { Bytes.toBytes("3"), Bytes.toBytes("6") };
createTableWithDefaultConf(tableName, splitRows);
@@ -200,7 +211,7 @@ public void testMergeRegions() throws Exception {
assertEquals(1, regionLocations.size());
}
- @Test
+ @TestTemplate
public void testMergeRegionsInvalidRegionCount() throws Exception {
byte[][] splitRows = new byte[][] { Bytes.toBytes("3"), Bytes.toBytes("6") };
createTableWithDefaultConf(tableName, splitRows);
@@ -224,7 +235,7 @@ public void testMergeRegionsInvalidRegionCount() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testSplitTable() throws Exception {
initSplitMergeSwitch();
splitTest(TableName.valueOf("testSplitTable"), 3000, false, null);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApi.java
index 59d9e1d8dec8..0c71d74c25ed 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApi.java
@@ -21,12 +21,12 @@
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.ArrayList;
@@ -37,8 +37,9 @@
import java.util.Set;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
import org.apache.hadoop.hbase.DoNotRetryIOException;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ReplicationPeerNotFoundException;
import org.apache.hadoop.hbase.ServerName;
@@ -52,31 +53,30 @@
import org.apache.hadoop.hbase.replication.regionserver.HBaseInterClusterReplicationEndpoint;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous replication admin operations.
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncReplicationAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncReplicationAdminApi.class);
-
private final String ID_ONE = "1";
private static String KEY_ONE;
private final String ID_TWO = "2";
private static String KEY_TWO;
- @BeforeClass
+ public TestAsyncReplicationAdminApi(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, 60000);
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 120000);
@@ -88,7 +88,12 @@ public static void setUpBeforeClass() throws Exception {
ASYNC_CONN = ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
}
- @After
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @AfterEach
public void clearPeerAndQueues() throws IOException, ReplicationException {
try {
admin.removeReplicationPeer(ID_ONE).join();
@@ -107,7 +112,7 @@ public void clearPeerAndQueues() throws IOException, ReplicationException {
}
}
- @Test
+ @TestTemplate
public void testAddRemovePeer() throws Exception {
ReplicationPeerConfig rpc1 = new ReplicationPeerConfig();
rpc1.setClusterKey(KEY_ONE);
@@ -141,7 +146,7 @@ public void testAddRemovePeer() throws Exception {
assertEquals(0, admin.listReplicationPeers().get().size());
}
- @Test
+ @TestTemplate
public void testPeerConfig() throws Exception {
ReplicationPeerConfig config = new ReplicationPeerConfig();
config.setClusterKey(KEY_ONE);
@@ -159,7 +164,7 @@ public void testPeerConfig() throws Exception {
admin.removeReplicationPeer(ID_ONE).join();
}
- @Test
+ @TestTemplate
public void testEnableDisablePeer() throws Exception {
ReplicationPeerConfig rpc1 = new ReplicationPeerConfig();
rpc1.setClusterKey(KEY_ONE);
@@ -175,7 +180,7 @@ public void testEnableDisablePeer() throws Exception {
admin.removeReplicationPeer(ID_ONE).join();
}
- @Test
+ @TestTemplate
public void testAppendPeerTableCFs() throws Exception {
ReplicationPeerConfig rpc1 = new ReplicationPeerConfig();
rpc1.setClusterKey(KEY_ONE);
@@ -208,8 +213,8 @@ public void testAppendPeerTableCFs() throws Exception {
admin.appendReplicationPeerTableCFs(ID_ONE, tableCFs).join();
result = admin.getReplicationPeerConfig(ID_ONE).get().getTableCFsMap();
assertEquals(2, result.size());
- assertTrue("Should contain t1", result.containsKey(tableName1));
- assertTrue("Should contain t2", result.containsKey(tableName2));
+ assertTrue(result.containsKey(tableName1), "Should contain t1");
+ assertTrue(result.containsKey(tableName2), "Should contain t2");
assertNull(result.get(tableName1));
assertNull(result.get(tableName2));
@@ -220,9 +225,9 @@ public void testAppendPeerTableCFs() throws Exception {
admin.appendReplicationPeerTableCFs(ID_ONE, tableCFs).join();
result = admin.getReplicationPeerConfig(ID_ONE).get().getTableCFsMap();
assertEquals(3, result.size());
- assertTrue("Should contain t1", result.containsKey(tableName1));
- assertTrue("Should contain t2", result.containsKey(tableName2));
- assertTrue("Should contain t3", result.containsKey(tableName3));
+ assertTrue(result.containsKey(tableName1), "Should contain t1");
+ assertTrue(result.containsKey(tableName2), "Should contain t2");
+ assertTrue(result.containsKey(tableName3), "Should contain t3");
assertNull(result.get(tableName1));
assertNull(result.get(tableName2));
assertEquals(1, result.get(tableName3).size());
@@ -236,10 +241,10 @@ public void testAppendPeerTableCFs() throws Exception {
admin.appendReplicationPeerTableCFs(ID_ONE, tableCFs).join();
result = admin.getReplicationPeerConfig(ID_ONE).get().getTableCFsMap();
assertEquals(4, result.size());
- assertTrue("Should contain t1", result.containsKey(tableName1));
- assertTrue("Should contain t2", result.containsKey(tableName2));
- assertTrue("Should contain t3", result.containsKey(tableName3));
- assertTrue("Should contain t4", result.containsKey(tableName4));
+ assertTrue(result.containsKey(tableName1), "Should contain t1");
+ assertTrue(result.containsKey(tableName2), "Should contain t2");
+ assertTrue(result.containsKey(tableName3), "Should contain t3");
+ assertTrue(result.containsKey(tableName4), "Should contain t4");
assertNull(result.get(tableName1));
assertNull(result.get(tableName2));
assertEquals(1, result.get(tableName3).size());
@@ -258,7 +263,7 @@ public void testAppendPeerTableCFs() throws Exception {
admin.appendReplicationPeerTableCFs(ID_ONE, tableCFs).join();
result = admin.getReplicationPeerConfig(ID_ONE).get().getTableCFsMap();
assertEquals(5, result.size());
- assertTrue("Should contain t5", result.containsKey(tableName5));
+ assertTrue(result.containsKey(tableName5), "Should contain t5");
// null means replication all cfs of tab5
assertNull(result.get(tableName5));
@@ -272,14 +277,14 @@ public void testAppendPeerTableCFs() throws Exception {
admin.appendReplicationPeerTableCFs(ID_ONE, tableCFs).join();
result = admin.getReplicationPeerConfig(ID_ONE).get().getTableCFsMap();
assertEquals(6, result.size());
- assertTrue("Should contain t6", result.containsKey(tableName6));
+ assertTrue(result.containsKey(tableName6), "Should contain t6");
// null means replication all cfs of tab6
assertNull(result.get(tableName6));
admin.removeReplicationPeer(ID_ONE).join();
}
- @Test
+ @TestTemplate
public void testRemovePeerTableCFs() throws Exception {
ReplicationPeerConfig rpc1 = new ReplicationPeerConfig();
rpc1.setClusterKey(KEY_ONE);
@@ -319,8 +324,8 @@ public void testRemovePeerTableCFs() throws Exception {
Map> result =
admin.getReplicationPeerConfig(ID_ONE).get().getTableCFsMap();
assertEquals(2, result.size());
- assertTrue("Should contain t1", result.containsKey(tableName1));
- assertTrue("Should contain t2", result.containsKey(tableName2));
+ assertTrue(result.containsKey(tableName1), "Should contain t1");
+ assertTrue(result.containsKey(tableName2), "Should contain t2");
assertNull(result.get(tableName1));
assertEquals(1, result.get(tableName2).size());
assertEquals("cf1", result.get(tableName2).get(0));
@@ -365,7 +370,7 @@ public void testRemovePeerTableCFs() throws Exception {
admin.removeReplicationPeer(ID_ONE);
}
- @Test
+ @TestTemplate
public void testSetPeerNamespaces() throws Exception {
String ns1 = "ns1";
String ns2 = "ns2";
@@ -401,7 +406,7 @@ public void testSetPeerNamespaces() throws Exception {
admin.removeReplicationPeer(ID_ONE).join();
}
- @Test
+ @TestTemplate
public void testNamespacesAndTableCfsConfigConflict() throws Exception {
String ns1 = "ns1";
String ns2 = "ns2";
@@ -451,7 +456,7 @@ public void testNamespacesAndTableCfsConfigConflict() throws Exception {
admin.removeReplicationPeer(ID_ONE).join();
}
- @Test
+ @TestTemplate
public void testPeerBandwidth() throws Exception {
ReplicationPeerConfig rpc = new ReplicationPeerConfig();
rpc.setClusterKey(KEY_ONE);
@@ -467,7 +472,7 @@ public void testPeerBandwidth() throws Exception {
admin.removeReplicationPeer(ID_ONE).join();
}
- @Test
+ @TestTemplate
public void testInvalidClusterKey() throws InterruptedException {
try {
admin.addReplicationPeer(ID_ONE,
@@ -478,7 +483,7 @@ public void testInvalidClusterKey() throws InterruptedException {
}
}
- @Test
+ @TestTemplate
public void testClusterKeyWithTrailingSpace() throws Exception {
admin.addReplicationPeer(ID_ONE,
ReplicationPeerConfig.newBuilder().setClusterKey(KEY_ONE + " ").build()).get();
@@ -486,7 +491,7 @@ public void testClusterKeyWithTrailingSpace() throws Exception {
assertEquals(KEY_ONE, clusterKey);
}
- @Test
+ @TestTemplate
public void testInvalidReplicationEndpoint() throws InterruptedException {
try {
admin.addReplicationPeer(ID_ONE,
@@ -498,7 +503,7 @@ public void testInvalidReplicationEndpoint() throws InterruptedException {
}
}
- @Test
+ @TestTemplate
public void testSetReplicationEndpoint() throws InterruptedException, ExecutionException {
// make sure that we do not need to set cluster key when we use customized ReplicationEndpoint
admin
@@ -519,10 +524,10 @@ public void testSetReplicationEndpoint() throws InterruptedException, ExecutionE
}
}
- /*
+ /**
* Tests that admin api throws ReplicationPeerNotFoundException if peer doesn't exist.
*/
- @Test
+ @TestTemplate
public void testReplicationPeerNotFoundException() throws InterruptedException {
String dummyPeer = "dummy_peer";
try {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java
index 80a640dde9c2..78ffb0c815ef 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java
@@ -18,21 +18,21 @@
package org.apache.hadoop.hbase.client;
import static org.apache.hadoop.hbase.client.AsyncProcess.START_LOG_ERRORS_AFTER_COUNT_KEY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ForkJoinPool;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
@@ -41,26 +41,20 @@
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-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.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous replication admin operations when more than 1 cluster
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncReplicationAdminApiWithClusters extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncReplicationAdminApiWithClusters.class);
-
private final static String ID_SECOND = "2";
private static HBaseTestingUtility TEST_UTIL2;
@@ -68,7 +62,11 @@ public class TestAsyncReplicationAdminApiWithClusters extends TestAsyncAdminBase
private static AsyncAdmin admin2;
private static AsyncConnection connection;
- @BeforeClass
+ public TestAsyncReplicationAdminApiWithClusters(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, 60000);
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 120000);
@@ -90,13 +88,14 @@ public static void setUpBeforeClass() throws Exception {
ASYNC_CONN.getAdmin().addReplicationPeer(ID_SECOND, rpc).join();
}
- @AfterClass
- public static void clearUp() throws IOException {
+ @AfterAll
+ public static void clearUp() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
connection.close();
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
Pattern pattern = Pattern.compile(tableName.getNameAsString() + ".*");
cleanupTables(admin, pattern);
@@ -124,7 +123,7 @@ private void createTableWithDefaultConf(AsyncAdmin admin, TableName tableName) {
admin.createTable(builder.build()).join();
}
- @Test
+ @TestTemplate
public void testEnableAndDisableTableReplication() throws Exception {
// default replication scope is local
createTableWithDefaultConf(tableName);
@@ -141,7 +140,7 @@ public void testEnableAndDisableTableReplication() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testEnableReplicationWhenSlaveClusterDoesntHaveTable() throws Exception {
// Only create table in source cluster
createTableWithDefaultConf(tableName);
@@ -150,7 +149,7 @@ public void testEnableReplicationWhenSlaveClusterDoesntHaveTable() throws Except
assertTrue(admin2.tableExists(tableName).get());
}
- @Test
+ @TestTemplate
public void testEnableReplicationWhenTableDescriptorIsNotSameInClusters() throws Exception {
createTableWithDefaultConf(admin, tableName);
createTableWithDefaultConf(admin2, tableName);
@@ -179,7 +178,7 @@ public void testEnableReplicationWhenTableDescriptorIsNotSameInClusters() throws
}
}
- @Test
+ @TestTemplate
public void testDisableReplicationForNonExistingTable() throws Exception {
try {
admin.disableTableReplication(tableName).join();
@@ -188,7 +187,7 @@ public void testDisableReplicationForNonExistingTable() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testEnableReplicationForNonExistingTable() throws Exception {
try {
admin.enableTableReplication(tableName).join();
@@ -197,7 +196,7 @@ public void testEnableReplicationForNonExistingTable() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testDisableReplicationWhenTableNameAsNull() throws Exception {
try {
admin.disableTableReplication(null).join();
@@ -206,7 +205,7 @@ public void testDisableReplicationWhenTableNameAsNull() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testEnableReplicationWhenTableNameAsNull() throws Exception {
try {
admin.enableTableReplication(null).join();
@@ -219,15 +218,15 @@ public void testEnableReplicationWhenTableNameAsNull() throws Exception {
* Test enable table replication should create table only in user explicit specified table-cfs.
* HBASE-14717
*/
- @Test
+ @TestTemplate
public void testEnableReplicationForExplicitSetTableCfs() throws Exception {
TableName tableName2 = TableName.valueOf(tableName.getNameAsString() + "2");
// Only create table in source cluster
createTableWithDefaultConf(tableName);
createTableWithDefaultConf(tableName2);
- assertFalse("Table should not exists in the peer cluster", admin2.tableExists(tableName).get());
- assertFalse("Table should not exists in the peer cluster",
- admin2.tableExists(tableName2).get());
+ assertFalse(admin2.tableExists(tableName).get(), "Table should not exists in the peer cluster");
+ assertFalse(admin2.tableExists(tableName2).get(),
+ "Table should not exists in the peer cluster");
Map> tableCfs = new HashMap<>();
tableCfs.put(tableName, null);
@@ -238,17 +237,16 @@ public void testEnableReplicationForExplicitSetTableCfs() throws Exception {
// Only add tableName to replication peer config
admin.updateReplicationPeerConfig(ID_SECOND, rpc).join();
admin.enableTableReplication(tableName2).join();
- assertFalse("Table should not be created if user has set table cfs explicitly for the "
- + "peer and this is not part of that collection", admin2.tableExists(tableName2).get());
+ assertFalse(admin2.tableExists(tableName2).get(), "Table should not be created if user "
+ + "has set table cfs explicitly for the peer and this is not part of that collection");
// Add tableName2 to replication peer config, too
tableCfs.put(tableName2, null);
rpc.setTableCFsMap(tableCfs);
admin.updateReplicationPeerConfig(ID_SECOND, rpc).join();
admin.enableTableReplication(tableName2).join();
- assertTrue(
- "Table should be created if user has explicitly added table into table cfs collection",
- admin2.tableExists(tableName2).get());
+ assertTrue(admin2.tableExists(tableName2).get(),
+ "Table should be created if user has explicitly added table into table cfs collection");
} finally {
rpc.setTableCFsMap(null);
rpc.setReplicateAllUserTables(true);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.java
index 70cd00981340..4fa6a2603a04 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncSnapshotAdminApi.java
@@ -17,49 +17,61 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.After;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.TestTemplate;
+
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncSnapshotAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncSnapshotAdminApi.class);
-
private static final Pattern MATCH_ALL = Pattern.compile(".*");
String snapshotName1 = "snapshotName1";
String snapshotName2 = "snapshotName2";
String snapshotName3 = "snapshotName3";
- @After
+ public TestAsyncSnapshotAdminApi(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @AfterEach
public void cleanup() throws Exception {
admin.deleteSnapshots(MATCH_ALL).get();
admin.listTableNames().get().forEach(t -> admin.disableTable(t).join());
admin.listTableNames().get().forEach(t -> admin.deleteTable(t).join());
}
- @Test
+ @TestTemplate
public void testTakeSnapshot() throws Exception {
Admin syncAdmin = TEST_UTIL.getAdmin();
@@ -88,7 +100,7 @@ public void testTakeSnapshot() throws Exception {
assertEquals(SnapshotType.FLUSH, snapshots.get(1).getType());
}
- @Test
+ @TestTemplate
public void testCloneSnapshot() throws Exception {
TableName tableName2 = TableName.valueOf("testCloneSnapshot2");
Admin syncAdmin = TEST_UTIL.getAdmin();
@@ -138,7 +150,7 @@ private void assertResult(TableName tableName, int expectedRowCount) throws IOEx
}
}
- @Test
+ @TestTemplate
public void testRestoreSnapshot() throws Exception {
Table table = TEST_UTIL.createTable(tableName, Bytes.toBytes("f1"));
for (int i = 0; i < 3000; i++) {
@@ -162,8 +174,9 @@ public void testRestoreSnapshot() throws Exception {
assertResult(tableName, 3000);
}
- @Test
- public void testListSnapshots() throws Exception {
+ @TestTemplate
+ public void testListSnapshots(TestInfo testInfo) throws Exception {
+ tableName = TableName.valueOf(testInfo.getTestMethod().get().getName());
Table table = TEST_UTIL.createTable(tableName, Bytes.toBytes("f1"));
for (int i = 0; i < 3000; i++) {
table.put(new Put(Bytes.toBytes(i)).addColumn(Bytes.toBytes("f1"), Bytes.toBytes("cq"),
@@ -191,7 +204,7 @@ public void testListSnapshots() throws Exception {
.size());
}
- @Test
+ @TestTemplate
public void testDeleteSnapshots() throws Exception {
Table table = TEST_UTIL.createTable(tableName, Bytes.toBytes("f1"));
for (int i = 0; i < 3000; i++) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java
index 93f4362b9ff3..429c52321c3e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java
@@ -19,10 +19,10 @@
import static org.apache.hadoop.hbase.TableName.META_TABLE_NAME;
import static org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerFactory.TRACKER_IMPL;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.HashMap;
@@ -31,8 +31,9 @@
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletionException;
+import java.util.function.Supplier;
import org.apache.hadoop.hbase.AsyncMetaTableAccessor;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.ServerName;
@@ -44,11 +45,10 @@
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous table admin operations.
@@ -56,23 +56,34 @@
* minute timeout so they were split.
* @see TestAsyncTableAdminApi3 Another split out from this class so each runs under ten minutes.
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncTableAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncTableAdminApi.class);
+ public TestAsyncTableAdminApi(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
- @Test
+ @TestTemplate
public void testCreateTable() throws Exception {
List tables = admin.listTableDescriptors().get();
int numTables = tables.size();
createTableWithDefaultConf(tableName);
tables = admin.listTableDescriptors().get();
assertEquals(numTables + 1, tables.size());
- assertTrue("Table must be enabled.", TEST_UTIL.getHBaseCluster().getMaster()
- .getTableStateManager().isTableState(tableName, TableState.State.ENABLED));
+ assertTrue(TEST_UTIL.getHBaseCluster().getMaster().getTableStateManager()
+ .isTableState(tableName, TableState.State.ENABLED), "Table must be enabled.");
assertEquals(TableState.State.ENABLED, getStateFromMeta(tableName));
}
@@ -83,26 +94,26 @@ static TableState.State getStateFromMeta(TableName table) throws Exception {
return state.get().getState();
}
- @Test
+ @TestTemplate
public void testCreateTableNumberOfRegions() throws Exception {
AsyncTable metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);
createTableWithDefaultConf(tableName);
List regionLocations =
AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName).get();
- assertEquals("Table should have only 1 region", 1, regionLocations.size());
+ assertEquals(1, regionLocations.size(), "Table should have only 1 region");
final TableName tableName2 = TableName.valueOf(tableName.getNameAsString() + "_2");
createTableWithDefaultConf(tableName2, new byte[][] { new byte[] { 42 } });
regionLocations = AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName2).get();
- assertEquals("Table should have only 2 region", 2, regionLocations.size());
+ assertEquals(2, regionLocations.size(), "Table should have only 2 region");
final TableName tableName3 = TableName.valueOf(tableName.getNameAsString() + "_3");
TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName3);
builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY));
admin.createTable(builder.build(), Bytes.toBytes("a"), Bytes.toBytes("z"), 3).join();
regionLocations = AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName3).get();
- assertEquals("Table should have only 3 region", 3, regionLocations.size());
+ assertEquals(3, regionLocations.size(), "Table should have only 3 region");
final TableName tableName4 = TableName.valueOf(tableName.getNameAsString() + "_4");
builder = TableDescriptorBuilder.newBuilder(tableName4);
@@ -119,10 +130,10 @@ public void testCreateTableNumberOfRegions() throws Exception {
builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY));
admin.createTable(builder.build(), new byte[] { 1 }, new byte[] { 127 }, 16).join();
regionLocations = AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName5).get();
- assertEquals("Table should have 16 region", 16, regionLocations.size());
+ assertEquals(16, regionLocations.size(), "Table should have 16 region");
}
- @Test
+ @TestTemplate
public void testCreateTableWithRegions() throws Exception {
byte[][] splitKeys = { new byte[] { 1, 1, 1 }, new byte[] { 2, 2, 2 }, new byte[] { 3, 3, 3 },
new byte[] { 4, 4, 4 }, new byte[] { 5, 5, 5 }, new byte[] { 6, 6, 6 },
@@ -132,16 +143,15 @@ public void testCreateTableWithRegions() throws Exception {
createTableWithDefaultConf(tableName, splitKeys);
boolean tableAvailable = admin.isTableAvailable(tableName, splitKeys).get();
- assertTrue("Table should be created with splitKyes + 1 rows in META", tableAvailable);
+ assertTrue(tableAvailable, "Table should be created with splitKyes + 1 rows in META");
AsyncTable metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);
List regions =
AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName).get();
Iterator hris = regions.iterator();
- assertEquals(
- "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size(),
- expectedRegions, regions.size());
+ assertEquals(expectedRegions, regions.size(),
+ "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size());
System.err.println("Found " + regions.size() + " regions");
RegionInfo hri;
@@ -195,9 +205,8 @@ public void testCreateTableWithRegions() throws Exception {
admin.createTable(builder.build(), startKey, endKey, expectedRegions).join();
regions = AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName2).get();
- assertEquals(
- "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size(),
- expectedRegions, regions.size());
+ assertEquals(expectedRegions, regions.size(),
+ "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size());
System.err.println("Found " + regions.size() + " regions");
hris = regions.iterator();
@@ -247,9 +256,8 @@ public void testCreateTableWithRegions() throws Exception {
admin.createTable(builder.build(), startKey, endKey, expectedRegions).join();
regions = AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName3).get();
- assertEquals(
- "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size(),
- expectedRegions, regions.size());
+ assertEquals(expectedRegions, regions.size(),
+ "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size());
System.err.println("Found " + regions.size() + " regions");
if (tablesOnMaster) {
// This don't work if master is not carrying regions. FIX. TODO.
@@ -289,7 +297,7 @@ private void verifyRoundRobinDistribution(List regions, int exp
});
}
- @Test
+ @TestTemplate
public void testCreateTableWithOnlyEmptyStartRow() throws Exception {
byte[][] splitKeys = new byte[1][];
splitKeys[0] = HConstants.EMPTY_BYTE_ARRAY;
@@ -301,7 +309,7 @@ public void testCreateTableWithOnlyEmptyStartRow() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testCreateTableWithEmptyRowInTheSplitKeys() throws Exception {
byte[][] splitKeys = new byte[3][];
splitKeys[0] = "region1".getBytes();
@@ -315,7 +323,7 @@ public void testCreateTableWithEmptyRowInTheSplitKeys() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testDeleteTable() throws Exception {
createTableWithDefaultConf(tableName);
assertTrue(admin.tableExists(tableName).get());
@@ -324,12 +332,12 @@ public void testDeleteTable() throws Exception {
assertFalse(admin.tableExists(tableName).get());
}
- @Test
+ @TestTemplate
public void testTruncateTable() throws Exception {
testTruncateTable(tableName, false);
}
- @Test
+ @TestTemplate
public void testTruncateTablePreservingSplits() throws Exception {
testTruncateTable(tableName, true);
}
@@ -364,13 +372,13 @@ private void testTruncateTable(final TableName tableName, boolean preserveSplits
}
}
- @Test
+ @TestTemplate
public void testCloneTableSchema() throws Exception {
final TableName newTableName = TableName.valueOf(tableName.getNameAsString() + "_new");
testCloneTableSchema(tableName, newTableName, false);
}
- @Test
+ @TestTemplate
public void testCloneTableSchemaPreservingSplits() throws Exception {
final TableName newTableName = TableName.valueOf(tableName.getNameAsString() + "_new");
testCloneTableSchema(tableName, newTableName, true);
@@ -396,8 +404,8 @@ private void testCloneTableSchema(final TableName tableName, final TableName new
admin.createTable(tableDesc, splitKeys).join();
assertEquals(NUM_REGIONS, TEST_UTIL.getHBaseCluster().getRegions(tableName).size());
- assertTrue("Table should be created with splitKyes + 1 rows in META",
- admin.isTableAvailable(tableName, splitKeys).get());
+ assertTrue(admin.isTableAvailable(tableName).get(),
+ "Table should be created with splitKyes + 1 rows in META");
// Clone & Verify
admin.cloneTableSchema(tableName, newTableName, preserveSplits).join();
@@ -414,14 +422,14 @@ private void testCloneTableSchema(final TableName tableName, final TableName new
if (preserveSplits) {
assertEquals(NUM_REGIONS, TEST_UTIL.getHBaseCluster().getRegions(newTableName).size());
- assertTrue("New table should be created with splitKyes + 1 rows in META",
- admin.isTableAvailable(newTableName, splitKeys).get());
+ assertTrue(admin.isTableAvailable(newTableName).get(),
+ "New table should be created with splitKyes + 1 rows in META");
} else {
assertEquals(1, TEST_UTIL.getHBaseCluster().getRegions(newTableName).size());
}
}
- @Test
+ @TestTemplate
public void testCloneTableSchemaWithNonExistentSourceTable() throws Exception {
final TableName newTableName = TableName.valueOf(tableName.getNameAsString() + "_new");
// test for non-existent source table
@@ -433,7 +441,7 @@ public void testCloneTableSchemaWithNonExistentSourceTable() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testCloneTableSchemaWithExistentDestinationTable() throws Exception {
final TableName newTableName = TableName.valueOf(tableName.getNameAsString() + "_new");
byte[] FAMILY_0 = Bytes.toBytes("cf0");
@@ -448,7 +456,7 @@ public void testCloneTableSchemaWithExistentDestinationTable() throws Exception
}
}
- @Test
+ @TestTemplate
public void testIsTableAvailableWithInexistantTable() throws Exception {
final TableName newTableName = TableName.valueOf(tableName.getNameAsString() + "_new");
// test for inexistant table
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java
index 347b355acc85..7675a4091ff8 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java
@@ -17,15 +17,16 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.Optional;
import java.util.Set;
+import java.util.function.Supplier;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.master.MasterFileSystem;
import org.apache.hadoop.hbase.testclassification.ClientTests;
@@ -35,26 +36,36 @@
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.FSTableDescriptors;
import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous table admin operations
* @see TestAsyncTableAdminApi This test and it used to be joined it was taking longer than our ten
* minute timeout so they were split.
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncTableAdminApi2 extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncTableAdminApi2.class);
+ public TestAsyncTableAdminApi2(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
- @Test
+ @TestTemplate
public void testDisableCatalogTable() throws Exception {
try {
this.admin.disableTable(TableName.META_TABLE_NAME).join();
@@ -66,7 +77,7 @@ public void testDisableCatalogTable() throws Exception {
createTableWithDefaultConf(tableName);
}
- @Test
+ @TestTemplate
public void testAddColumnFamily() throws Exception {
// Create a table with two families
TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);
@@ -81,7 +92,7 @@ public void testAddColumnFamily() throws Exception {
verifyTableDescriptor(tableName, FAMILY_0, FAMILY_1);
}
- @Test
+ @TestTemplate
public void testAddSameColumnFamilyTwice() throws Exception {
// Create a table with one families
TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);
@@ -104,7 +115,7 @@ public void testAddSameColumnFamilyTwice() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testModifyColumnFamily() throws Exception {
TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);
ColumnFamilyDescriptor cfd = ColumnFamilyDescriptorBuilder.of(FAMILY_0);
@@ -124,7 +135,7 @@ public void testModifyColumnFamily() throws Exception {
assertTrue(hcfd.getBlocksize() == newBlockSize);
}
- @Test
+ @TestTemplate
public void testModifyNonExistingColumnFamily() throws Exception {
TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);
ColumnFamilyDescriptor cfd = ColumnFamilyDescriptorBuilder.of(FAMILY_0);
@@ -146,7 +157,7 @@ public void testModifyNonExistingColumnFamily() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testDeleteColumnFamily() throws Exception {
// Create a table with two families
TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);
@@ -162,7 +173,7 @@ public void testDeleteColumnFamily() throws Exception {
verifyTableDescriptor(tableName, FAMILY_0);
}
- @Test
+ @TestTemplate
public void testDeleteSameColumnFamilyTwice() throws Exception {
// Create a table with two families
TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);
@@ -205,20 +216,20 @@ private void verifyTableDescriptor(final TableDescriptor htd, final TableName ta
assertEquals(tableName, htd.getTableName());
assertEquals(families.length, htdFamilies.size());
for (byte[] familyName : families) {
- assertTrue("Expected family " + Bytes.toString(familyName), htdFamilies.contains(familyName));
+ assertTrue(htdFamilies.contains(familyName), "Expected family " + Bytes.toString(familyName));
}
}
- @Test
+ @TestTemplate
public void testTableAvailableWithRandomSplitKeys() throws Exception {
createTableWithDefaultConf(tableName);
byte[][] splitKeys = new byte[1][];
splitKeys = new byte[][] { new byte[] { 1, 1, 1 }, new byte[] { 2, 2, 2 } };
boolean tableAvailable = admin.isTableAvailable(tableName, splitKeys).get();
- assertFalse("Table should be created with 1 row in META", tableAvailable);
+ assertFalse(tableAvailable, "Table should be created with 1 row in META");
}
- @Test
+ @TestTemplate
public void testCompactionTimestamps() throws Exception {
createTableWithDefaultConf(tableName);
AsyncTable table = ASYNC_CONN.getTable(tableName);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java
index b55518892c12..775e5f894ded 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi3.java
@@ -21,19 +21,20 @@
import static org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerFactory.TRACKER_IMPL;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
import org.apache.hadoop.hbase.AsyncMetaTableAccessor;
import org.apache.hadoop.hbase.DoNotRetryIOException;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder.ModifyableTableDescriptor;
@@ -41,25 +42,36 @@
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Class to test asynchronous table admin operations.
* @see TestAsyncTableAdminApi2 This test and it used to be joined it was taking longer than our ten
* minute timeout so they were split.
*/
-@RunWith(Parameterized.class)
-@Category({ LargeTests.class, ClientTests.class })
+@Tag(LargeTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncTableAdminApi3 extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncTableAdminApi3.class);
- @Test
+ public TestAsyncTableAdminApi3(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
+
+ @TestTemplate
public void testTableExist() throws Exception {
boolean exist;
exist = admin.tableExists(tableName).get();
@@ -74,7 +86,7 @@ public void testTableExist() throws Exception {
assertTrue(exist);
}
- @Test
+ @TestTemplate
public void testListTables() throws Exception {
int numTables = admin.listTableDescriptors().get().size();
final TableName tableName1 = TableName.valueOf(tableName.getNameAsString() + "1");
@@ -96,7 +108,7 @@ public void testListTables() throws Exception {
break;
}
}
- assertTrue("Not found: " + tables[i], found);
+ assertTrue(found, "Not found: " + tables[i]);
}
List tableNames = admin.listTableNames().get();
@@ -110,7 +122,7 @@ public void testListTables() throws Exception {
break;
}
}
- assertTrue("Not found: " + tables[i], found);
+ assertTrue(found, "Not found: " + tables[i]);
}
tableNames = new ArrayList(tables.length + 1);
@@ -124,8 +136,8 @@ public void testListTables() throws Exception {
size = tableDescs.size();
assertEquals(tables.length + 1, size);
for (int i = 0, j = 0; i < tables.length && j < size; i++, j++) {
- assertTrue("tableName should be equal in order",
- tableDescs.get(j).getTableName().equals(tables[i]));
+ assertTrue(tableDescs.get(j).getTableName().equals(tables[i]),
+ "tableName should be equal in order");
}
assertTrue(tableDescs.get(size - 1).getTableName().equals(TableName.META_TABLE_NAME));
@@ -135,12 +147,12 @@ public void testListTables() throws Exception {
}
tableDescs = admin.listTableDescriptors(true).get();
- assertTrue("Not found system tables", tableDescs.size() > 0);
+ assertTrue(tableDescs.size() > 0, "Not found system tables");
tableNames = admin.listTableNames(true).get();
- assertTrue("Not found system tables", tableNames.size() > 0);
+ assertTrue(tableNames.size() > 0, "Not found system tables");
}
- @Test
+ @TestTemplate
public void testGetTableDescriptor() throws Exception {
byte[][] families = { FAMILY, FAMILY_0, FAMILY_1 };
TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);
@@ -157,7 +169,7 @@ public void testGetTableDescriptor() throws Exception {
assertEquals(0, TableDescriptor.COMPARATOR.compare(desc, confirmedHtd));
}
- @Test
+ @TestTemplate
public void testDisableAndEnableTable() throws Exception {
createTableWithDefaultConf(tableName);
AsyncTable table = ASYNC_CONN.getTable(tableName);
@@ -172,8 +184,8 @@ public void testDisableAndEnableTable() throws Exception {
table.get(get).get();
this.admin.disableTable(tableName).join();
- assertTrue("Table must be disabled.", TEST_UTIL.getHBaseCluster().getMaster()
- .getTableStateManager().isTableState(tableName, TableState.State.DISABLED));
+ assertTrue(TEST_UTIL.getHBaseCluster().getMaster().getTableStateManager()
+ .isTableState(tableName, TableState.State.DISABLED), "Table must be disabled.");
assertEquals(TableState.State.DISABLED, TestAsyncTableAdminApi.getStateFromMeta(tableName));
// Test that table is disabled
@@ -194,8 +206,8 @@ public void testDisableAndEnableTable() throws Exception {
}
assertTrue(ok);
this.admin.enableTable(tableName).join();
- assertTrue("Table must be enabled.", TEST_UTIL.getHBaseCluster().getMaster()
- .getTableStateManager().isTableState(tableName, TableState.State.ENABLED));
+ assertTrue(TEST_UTIL.getHBaseCluster().getMaster().getTableStateManager()
+ .isTableState(tableName, TableState.State.ENABLED), "Table must be enabled.");
assertEquals(TableState.State.ENABLED, TestAsyncTableAdminApi.getStateFromMeta(tableName));
// Test that table is enabled
@@ -215,7 +227,7 @@ public void testDisableAndEnableTable() throws Exception {
}
}
- @Test
+ @TestTemplate
public void testDisableAndEnableTables() throws Exception {
final TableName tableName1 = TableName.valueOf(tableName.getNameAsString() + "1");
final TableName tableName2 = TableName.valueOf(tableName.getNameAsString() + "2");
@@ -279,7 +291,7 @@ public void testDisableAndEnableTables() throws Exception {
assertEquals(TableState.State.ENABLED, TestAsyncTableAdminApi.getStateFromMeta(tableName2));
}
- @Test
+ @TestTemplate
public void testEnableTableRetainAssignment() throws Exception {
byte[][] splitKeys = { new byte[] { 1, 1, 1 }, new byte[] { 2, 2, 2 }, new byte[] { 3, 3, 3 },
new byte[] { 4, 4, 4 }, new byte[] { 5, 5, 5 }, new byte[] { 6, 6, 6 },
@@ -290,9 +302,8 @@ public void testEnableTableRetainAssignment() throws Exception {
AsyncTable metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);
List regions =
AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName).get();
- assertEquals(
- "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size(),
- expectedRegions, regions.size());
+ assertEquals(expectedRegions, regions.size(),
+ "Tried to create " + expectedRegions + " regions " + "but only found " + regions.size());
// Disable table.
admin.disableTable(tableName).join();
@@ -306,7 +317,7 @@ public void testEnableTableRetainAssignment() throws Exception {
assertTrue(regions2.containsAll(regions));
}
- @Test
+ @TestTemplate
public void testIsTableEnabledAndDisabled() throws Exception {
createTableWithDefaultConf(tableName);
assertTrue(admin.isTableEnabled(tableName).get());
@@ -320,7 +331,7 @@ public void testIsTableEnabledAndDisabled() throws Exception {
assertFalse(admin.isTableDisabled(TableName.META_TABLE_NAME).get());
}
- @Test
+ @TestTemplate
public void testIsTableAvailable() throws Exception {
createTableWithDefaultConf(tableName);
TEST_UTIL.waitTableAvailable(tableName);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncToolAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncToolAdminApi.java
index 1bab0b89a4a3..d00af13183fc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncToolAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncToolAdminApi.java
@@ -17,29 +17,40 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.function.Supplier;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Test the admin operations for Balancer, Normalizer, CleanerChore, and CatalogJanitor.
*/
-@RunWith(Parameterized.class)
-@Category({ MediumTests.class, ClientTests.class })
+@Tag(MediumTests.TAG)
+@Tag(ClientTests.TAG)
+@HBaseParameterizedTestTemplate(name = "{index}: policy = {0}")
public class TestAsyncToolAdminApi extends TestAsyncAdminBase {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestAsyncToolAdminApi.class);
+ public TestAsyncToolAdminApi(Supplier admin) {
+ super(admin);
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ TestAsyncAdminBase.setUpBeforeClass();
+ }
+
+ @AfterAll
+ public static void tearDownAfterClass() throws Exception {
+ TestAsyncAdminBase.tearDownAfterClass();
+ }
- @Test
+ @TestTemplate
public void testBalancer() throws Exception {
boolean initialState = admin.isBalancerEnabled().get();
@@ -62,7 +73,7 @@ public void testBalancer() throws Exception {
assertEquals(initialState, admin.isBalancerEnabled().get());
}
- @Test
+ @TestTemplate
public void testNormalizer() throws Exception {
boolean initialState = admin.isNormalizerEnabled().get();
@@ -85,7 +96,7 @@ public void testNormalizer() throws Exception {
assertEquals(initialState, admin.isNormalizerEnabled().get());
}
- @Test
+ @TestTemplate
public void testCleanerChore() throws Exception {
boolean initialState = admin.isCleanerChoreEnabled().get();
@@ -108,7 +119,7 @@ public void testCleanerChore() throws Exception {
assertEquals(initialState, admin.isCleanerChoreEnabled().get());
}
- @Test
+ @TestTemplate
public void testCatalogJanitor() throws Exception {
boolean initialState = admin.isCatalogJanitorEnabled().get();