This is an automated email from the ASF dual-hosted git repository.
Apache9 pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new dbb1063ff01 HBASE-30123 Addendum upgrade missing tests to junit5
(#8251)
dbb1063ff01 is described below
commit dbb1063ff016263289f33f6b073663e667add1b8
Author: Duo Zhang <[email protected]>
AuthorDate: Tue May 19 11:17:29 2026 +0800
HBASE-30123 Addendum upgrade missing tests to junit5 (#8251)
---
.../hbase/io/TestFSDataInputStreamWrapper.java | 2 +-
.../hbase/io/encoding/TestEncodedSeekers.java | 42 ++++++-------
.../io/encoding/TestLoadAndSwitchEncodeOnDisk.java | 40 +++++--------
.../hbase/util/TestMiniClusterLoadEncoded.java | 26 ++++----
.../hbase/util/TestMiniClusterLoadParallel.java | 26 ++++----
.../hbase/util/TestMiniClusterLoadSequential.java | 69 ++++++++++------------
6 files changed, 89 insertions(+), 116 deletions(-)
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFSDataInputStreamWrapper.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFSDataInputStreamWrapper.java
index e1429811421..6fd57143dbf 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFSDataInputStreamWrapper.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFSDataInputStreamWrapper.java
@@ -36,8 +36,8 @@ import org.apache.hadoop.fs.StreamCapabilities;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.io.ByteBufferPool;
-import org.junit.Test;
import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
@Tag(SmallTests.TAG)
@Tag(MiscTests.TAG)
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java
index dba1ca0e124..bcdfe504bfe 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java
@@ -17,16 +17,16 @@
*/
package org.apache.hadoop.hbase.io.encoding;
-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;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.stream.Stream;
import org.apache.hadoop.hbase.ArrayBackedTag;
-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.KeyValue;
@@ -48,24 +48,17 @@ import
org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.LoadTestKVGenerator;
import org.apache.hadoop.hbase.util.Strings;
-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.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Tests encoded seekers by loading and reading values.
*/
-@Category({ IOTests.class, LargeTests.class })
-@RunWith(Parameterized.class)
[email protected](IOTests.TAG)
[email protected](LargeTests.TAG)
+@HBaseParameterizedTestTemplate
public class TestEncodedSeekers {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestEncodedSeekers.class);
-
private static final String TABLE_NAME = "encodedSeekersTable";
private static final String CF_NAME = "encodedSeekersCF";
private static final byte[] CF_BYTES = Bytes.toBytes(CF_NAME);
@@ -79,7 +72,7 @@ public class TestEncodedSeekers {
private static final int NUM_HFILES = 4;
private static final int NUM_ROWS_PER_FLUSH = NUM_ROWS / NUM_HFILES;
- private final HBaseTestingUtility testUtil =
HBaseTestingUtility.createLocalHTU();
+ private final HBaseTestingUtility testUtil = new HBaseTestingUtility();
private final DataBlockEncoding encoding;
private final boolean includeTags;
private final boolean compressTags;
@@ -87,17 +80,16 @@ public class TestEncodedSeekers {
/** Enable when debugging */
private static final boolean VERBOSE = false;
- @Parameters
- public static Collection<Object[]> parameters() {
- List<Object[]> paramList = new ArrayList<>();
+ public static Stream<Arguments> parameters() {
+ List<Arguments> params = new ArrayList<>();
for (DataBlockEncoding encoding : DataBlockEncoding.values()) {
for (boolean includeTags : new boolean[] { false, true }) {
for (boolean compressTags : new boolean[] { false, true }) {
- paramList.add(new Object[] { encoding, includeTags, compressTags });
+ params.add(Arguments.of(encoding, includeTags, compressTags));
}
}
}
- return paramList;
+ return params.stream();
}
public TestEncodedSeekers(DataBlockEncoding encoding, boolean includeTags,
boolean compressTags) {
@@ -106,7 +98,7 @@ public class TestEncodedSeekers {
this.compressTags = compressTags;
}
- @Test
+ @TestTemplate
public void testEncodedSeeker() throws IOException {
System.err.println("Testing encoded seekers for encoding : " + encoding +
", includeTags : "
+ includeTags + ", compressTags : " + compressTags);
@@ -146,7 +138,7 @@ public class TestEncodedSeekers {
private void doPuts(HRegion region) throws IOException {
LoadTestKVGenerator dataGenerator = new
LoadTestKVGenerator(MIN_VALUE_SIZE, MAX_VALUE_SIZE);
for (int i = 0; i < NUM_ROWS; ++i) {
- byte[] key = LoadTestKVGenerator.md5PrefixedKey(i).getBytes();
+ byte[] key = Bytes.toBytes(LoadTestKVGenerator.md5PrefixedKey(i));
for (int j = 0; j < NUM_COLS_PER_ROW; ++j) {
Put put = new Put(key);
put.setDurability(Durability.ASYNC_WAL);
@@ -174,7 +166,7 @@ public class TestEncodedSeekers {
private void doGets(Region region) throws IOException {
for (int i = 0; i < NUM_ROWS; ++i) {
- final byte[] rowKey = LoadTestKVGenerator.md5PrefixedKey(i).getBytes();
+ final byte[] rowKey =
Bytes.toBytes(LoadTestKVGenerator.md5PrefixedKey(i));
for (int j = 0; j < NUM_COLS_PER_ROW; ++j) {
final String qualStr = String.valueOf(j);
if (VERBOSE) {
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
index 0f5983bd3d8..750a02d321f 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java
@@ -17,14 +17,14 @@
*/
package org.apache.hadoop.hbase.io.encoding;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
@@ -34,33 +34,23 @@ import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.testclassification.IOTests;
-import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.TestMiniClusterLoadSequential;
import org.apache.hadoop.hbase.util.Threads;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
/**
* Uses the load tester
*/
-@Category({ IOTests.class, MediumTests.class })
+@Tag(IOTests.TAG)
+@Tag(LargeTests.TAG)
+@HBaseParameterizedTestTemplate
public class TestLoadAndSwitchEncodeOnDisk extends
TestMiniClusterLoadSequential {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestLoadAndSwitchEncodeOnDisk.class);
-
/** We do not alternate the multi-put flag in this test. */
private static final boolean USE_MULTI_PUT = true;
- /** Un-parameterize the test */
- @Parameters
- public static Collection<Object[]> parameters() {
- return Arrays.asList(new Object[][] { new Object[0] });
- }
-
public TestLoadAndSwitchEncodeOnDisk() {
super(USE_MULTI_PUT, DataBlockEncoding.PREFIX);
conf.setBoolean(CacheConfig.CACHE_BLOCKS_ON_WRITE_KEY, true);
@@ -72,14 +62,14 @@ public class TestLoadAndSwitchEncodeOnDisk extends
TestMiniClusterLoadSequential
}
@Override
- @Test
+ @TestTemplate
public void loadTest() throws Exception {
Admin admin = TEST_UTIL.getAdmin();
compression = Compression.Algorithm.GZ; // used for table setup
super.loadTest();
- HColumnDescriptor hcd = getColumnDesc(admin);
+ ColumnFamilyDescriptor hcd = getColumnDesc(admin);
System.err.println("\nDisabling encode-on-disk. Old column descriptor: " +
hcd + "\n");
Table t = TEST_UTIL.getConnection().getTable(TABLE);
assertAllOnLine(t);
@@ -114,11 +104,11 @@ public class TestLoadAndSwitchEncodeOnDisk extends
TestMiniClusterLoadSequential
regions = rl.getAllRegionLocations();
}
for (HRegionLocation e : regions) {
- byte[] startkey = e.getRegionInfo().getStartKey();
- Scan s = new Scan(startkey);
+ byte[] startkey = e.getRegion().getStartKey();
+ Scan s = new Scan().withStartRow(startkey);
ResultScanner scanner = t.getScanner(s);
Result r = scanner.next();
- org.junit.Assert.assertTrue(r != null && r.size() > 0);
+ assertTrue(r != null && r.size() > 0);
scanner.close();
}
}
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java
index c45e396fc91..f27f8ece682 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java
@@ -18,38 +18,34 @@
package org.apache.hadoop.hbase.util;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.stream.Stream;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.params.provider.Arguments;
/**
* Runs a load test on a mini HBase cluster with data block encoding turned
on. Compared to other
* load-test-style unit tests, this one writes a smaller amount of data, but
goes through all
* available data block encoding algorithms.
*/
-@Category({ MiscTests.class, LargeTests.class })
+@Tag(MiscTests.TAG)
+@Tag(LargeTests.TAG)
+@HBaseParameterizedTestTemplate
public class TestMiniClusterLoadEncoded extends TestMiniClusterLoadParallel {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestMiniClusterLoadEncoded.class);
-
/** We do not alternate the multi-put flag in this test. */
private static final boolean USE_MULTI_PUT = true;
- @Parameters
- public static Collection<Object[]> parameters() {
- List<Object[]> parameters = new ArrayList<>();
+ public static Stream<Arguments> parameters() {
+ List<Arguments> params = new ArrayList<>();
for (DataBlockEncoding dataBlockEncoding : DataBlockEncoding.values()) {
- parameters.add(new Object[] { dataBlockEncoding });
+ params.add(Arguments.of(dataBlockEncoding));
}
- return parameters;
+ return params.stream();
}
public TestMiniClusterLoadEncoded(DataBlockEncoding encoding) {
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java
index e5136a1ffd4..b655b280e1d 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java
@@ -17,36 +17,36 @@
*/
package org.apache.hadoop.hbase.util;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
+import java.util.stream.Stream;
+import org.apache.hadoop.hbase.HBaseParameterizedTestTemplate;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
-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.Tag;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.params.provider.Arguments;
/**
* A write/read/verify load test on a mini HBase cluster. Tests reading and
writing at the same
* time.
*/
-@Category({ MiscTests.class, LargeTests.class })
-@RunWith(Parameterized.class)
+@Tag(MiscTests.TAG)
+@Tag(LargeTests.TAG)
+@HBaseParameterizedTestTemplate
public class TestMiniClusterLoadParallel extends TestMiniClusterLoadSequential
{
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestMiniClusterLoadParallel.class);
+ public static Stream<Arguments> parameters() {
+ return TestMiniClusterLoadSequential.parameters();
+ }
public TestMiniClusterLoadParallel(boolean isMultiPut, DataBlockEncoding
encoding) {
super(isMultiPut, encoding);
}
@Override
- @Test
+ @TestTemplate
public void loadTest() throws Exception {
prepareForLoadTest();
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java
index 6fd4b4111b2..6bfa039ced2 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java
@@ -17,50 +17,46 @@
*/
package org.apache.hadoop.hbase.util;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
+import java.util.stream.Stream;
import org.apache.hadoop.conf.Configuration;
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.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotFoundException;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.hadoop.hbase.client.TableDescriptor;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.util.test.LoadTestDataGenerator;
-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.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.params.provider.Arguments;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A write/read/verify load test on a mini HBase cluster. Tests reading and
then writing.
*/
-@Category({ MiscTests.class, LargeTests.class })
-@RunWith(Parameterized.class)
+@Tag(MiscTests.TAG)
+@Tag(LargeTests.TAG)
+@HBaseParameterizedTestTemplate
public class TestMiniClusterLoadSequential {
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestMiniClusterLoadSequential.class);
-
private static final Logger LOG =
LoggerFactory.getLogger(TestMiniClusterLoadSequential.class);
protected static final TableName TABLE = TableName.valueOf("load_test_tbl");
@@ -89,25 +85,24 @@ public class TestMiniClusterLoadSequential {
conf.setFloat(HConstants.LOAD_BALANCER_SLOP_KEY, 10.0f);
}
- @Parameters
- public static Collection<Object[]> parameters() {
- List<Object[]> parameters = new ArrayList<>();
+ public static Stream<Arguments> parameters() {
+ List<Arguments> params = new ArrayList<>();
for (boolean multiPut : new boolean[] { false, true }) {
for (DataBlockEncoding dataBlockEncoding : new DataBlockEncoding[] {
DataBlockEncoding.NONE,
DataBlockEncoding.PREFIX }) {
- parameters.add(new Object[] { multiPut, dataBlockEncoding });
+ params.add(Arguments.of(multiPut, dataBlockEncoding));
}
}
- return parameters;
+ return params.stream();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
LOG.debug("Test setup: isMultiPut=" + isMultiPut);
TEST_UTIL.startMiniCluster(NUM_RS);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
LOG.debug("Test teardown: isMultiPut=" + isMultiPut);
TEST_UTIL.shutdownMiniCluster();
@@ -126,7 +121,7 @@ public class TestMiniClusterLoadSequential {
return writer;
}
- @Test
+ @TestTemplate
public void loadTest() throws Exception {
prepareForLoadTest();
runLoadTestOnExistingTable();
@@ -144,10 +139,10 @@ public class TestMiniClusterLoadSequential {
assertEquals(numKeys, readerThreads.getNumKeysVerified());
}
- protected void createPreSplitLoadTestTable(HTableDescriptor htd,
HColumnDescriptor hcd)
- throws IOException {
- HBaseTestingUtility.createPreSplitLoadTestTable(conf, htd, hcd);
- TEST_UTIL.waitUntilAllRegionsAssigned(htd.getTableName());
+ protected void createPreSplitLoadTestTable(TableDescriptor tableDescriptor,
+ ColumnFamilyDescriptor familyDescriptor) throws IOException {
+ HBaseTestingUtility.createPreSplitLoadTestTable(conf, tableDescriptor,
familyDescriptor);
+ TEST_UTIL.waitUntilAllRegionsAssigned(tableDescriptor.getTableName());
}
protected void prepareForLoadTest() throws IOException {
@@ -164,10 +159,10 @@ public class TestMiniClusterLoadSequential {
}
admin.close();
- HTableDescriptor htd = new HTableDescriptor(TABLE);
- HColumnDescriptor hcd = new
HColumnDescriptor(CF).setCompressionType(compression)
- .setDataBlockEncoding(dataBlockEncoding);
- createPreSplitLoadTestTable(htd, hcd);
+ TableDescriptor tableDescriptor =
TableDescriptorBuilder.newBuilder(TABLE).build();
+ ColumnFamilyDescriptor familyDescriptor =
ColumnFamilyDescriptorBuilder.newBuilder(CF)
+
.setCompressionType(compression).setDataBlockEncoding(dataBlockEncoding).build();
+ createPreSplitLoadTestTable(tableDescriptor, familyDescriptor);
LoadTestDataGenerator dataGen = new
MultiThreadedAction.DefaultDataGenerator(CF);
writerThreads = prepareWriterThreads(dataGen, conf, TABLE);
@@ -178,9 +173,9 @@ public class TestMiniClusterLoadSequential {
return 1000;
}
- protected HColumnDescriptor getColumnDesc(Admin admin)
+ protected ColumnFamilyDescriptor getColumnDesc(Admin admin)
throws TableNotFoundException, IOException {
- return admin.getTableDescriptor(TABLE).getFamily(CF);
+ return admin.getDescriptor(TABLE).getColumnFamily(CF);
}
}
