Skip to content

Commit b38f0e2

Browse files
liuxiaocs7liuxiaocs7
committed
HBASE-30079 Upgrade hbase-compression to use junit5
1 parent 3b4c670 commit b38f0e2

File tree

33 files changed

+296
-341
lines changed

33 files changed

+296
-341
lines changed

‎hbase-common/src/test/java/org/apache/hadoop/hbase/io/compress/CompressionTestBase.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package org.apache.hadoop.hbase.io.compress;
1919

20-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.jupiter.api.Assertions.assertTrue;
2121

2222
import java.io.ByteArrayInputStream;
2323
import java.io.ByteArrayOutputStream;
@@ -94,8 +94,9 @@ protected void codecTest(final CompressionCodec codec, final byte[][] input,
9494
LOG.info("{} compressed {} bytes to {} bytes in {} ms", codec.getClass().getSimpleName(), inLen,
9595
compressed.length, end - start);
9696
if (expectedCompressedSize != null) {
97-
assertTrue("Expected compressed size does not match: (expected=" + expectedCompressedSize
98-
+ ", actual=" + compressed.length + ")", expectedCompressedSize == compressed.length);
97+
assertTrue(expectedCompressedSize == compressed.length,
98+
"Expected compressed size does not match: (expected=" + expectedCompressedSize + ", actual="
99+
+ compressed.length + ")");
99100
}
100101
// Decompress
101102
final byte[] plain = new byte[inLen];
@@ -111,8 +112,8 @@ protected void codecTest(final CompressionCodec codec, final byte[][] input,
111112
// Decompressed bytes should equal the original
112113
int offset = 0;
113114
for (int i = 0; i < input.length; i++) {
114-
assertTrue("Comparison failed at offset " + offset,
115-
Bytes.compareTo(plain, offset, input[i].length, input[i], 0, input[i].length) == 0);
115+
assertTrue(Bytes.compareTo(plain, offset, input[i].length, input[i], 0, input[i].length) == 0,
116+
"Comparison failed at offset " + offset);
116117
offset += input[i].length;
117118
}
118119
}

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestHFileCompressionLz4.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,22 @@
1919

2020
import org.apache.hadoop.conf.Configuration;
2121
import org.apache.hadoop.fs.Path;
22-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2322
import org.apache.hadoop.hbase.HBaseTestingUtil;
2423
import org.apache.hadoop.hbase.io.compress.Compression;
2524
import org.apache.hadoop.hbase.io.compress.HFileTestBase;
2625
import org.apache.hadoop.hbase.testclassification.IOTests;
2726
import org.apache.hadoop.hbase.testclassification.SmallTests;
28-
import org.junit.BeforeClass;
29-
import org.junit.ClassRule;
30-
import org.junit.Test;
31-
import org.junit.experimental.categories.Category;
27+
import org.junit.jupiter.api.BeforeAll;
28+
import org.junit.jupiter.api.Tag;
29+
import org.junit.jupiter.api.Test;
3230

33-
@Category({ IOTests.class, SmallTests.class })
31+
@Tag(IOTests.TAG)
32+
@Tag(SmallTests.TAG)
3433
public class TestHFileCompressionLz4 extends HFileTestBase {
3534

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestHFileCompressionLz4.class);
39-
4035
private static Configuration conf;
4136

42-
@BeforeClass
37+
@BeforeAll
4338
public static void setUpBeforeClass() throws Exception {
4439
conf = TEST_UTIL.getConfiguration();
4540
conf.set(Compression.LZ4_CODEC_CLASS_KEY, Lz4Codec.class.getCanonicalName());

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestHFileCompressionLzo.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,22 @@
1919

2020
import org.apache.hadoop.conf.Configuration;
2121
import org.apache.hadoop.fs.Path;
22-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2322
import org.apache.hadoop.hbase.HBaseTestingUtil;
2423
import org.apache.hadoop.hbase.io.compress.Compression;
2524
import org.apache.hadoop.hbase.io.compress.HFileTestBase;
2625
import org.apache.hadoop.hbase.testclassification.IOTests;
2726
import org.apache.hadoop.hbase.testclassification.SmallTests;
28-
import org.junit.BeforeClass;
29-
import org.junit.ClassRule;
30-
import org.junit.Test;
31-
import org.junit.experimental.categories.Category;
27+
import org.junit.jupiter.api.BeforeAll;
28+
import org.junit.jupiter.api.Tag;
29+
import org.junit.jupiter.api.Test;
3230

33-
@Category({ IOTests.class, SmallTests.class })
31+
@Tag(IOTests.TAG)
32+
@Tag(SmallTests.TAG)
3433
public class TestHFileCompressionLzo extends HFileTestBase {
3534

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestHFileCompressionLzo.class);
39-
4035
private static Configuration conf;
4136

42-
@BeforeClass
37+
@BeforeAll
4338
public static void setUpBeforeClass() throws Exception {
4439
conf = TEST_UTIL.getConfiguration();
4540
conf.set(Compression.LZO_CODEC_CLASS_KEY, LzoCodec.class.getCanonicalName());

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestHFileCompressionSnappy.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,22 @@
1919

2020
import org.apache.hadoop.conf.Configuration;
2121
import org.apache.hadoop.fs.Path;
22-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2322
import org.apache.hadoop.hbase.HBaseTestingUtil;
2423
import org.apache.hadoop.hbase.io.compress.Compression;
2524
import org.apache.hadoop.hbase.io.compress.HFileTestBase;
2625
import org.apache.hadoop.hbase.testclassification.IOTests;
2726
import org.apache.hadoop.hbase.testclassification.SmallTests;
28-
import org.junit.BeforeClass;
29-
import org.junit.ClassRule;
30-
import org.junit.Test;
31-
import org.junit.experimental.categories.Category;
27+
import org.junit.jupiter.api.BeforeAll;
28+
import org.junit.jupiter.api.Tag;
29+
import org.junit.jupiter.api.Test;
3230

33-
@Category({ IOTests.class, SmallTests.class })
31+
@Tag(IOTests.TAG)
32+
@Tag(SmallTests.TAG)
3433
public class TestHFileCompressionSnappy extends HFileTestBase {
3534

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestHFileCompressionSnappy.class);
39-
4035
private static Configuration conf;
4136

42-
@BeforeClass
37+
@BeforeAll
4338
public static void setUpBeforeClass() throws Exception {
4439
conf = TEST_UTIL.getConfiguration();
4540
conf.set(Compression.SNAPPY_CODEC_CLASS_KEY, SnappyCodec.class.getCanonicalName());

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestHFileCompressionZstd.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,22 @@
1919

2020
import org.apache.hadoop.conf.Configuration;
2121
import org.apache.hadoop.fs.Path;
22-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2322
import org.apache.hadoop.hbase.HBaseTestingUtil;
2423
import org.apache.hadoop.hbase.io.compress.Compression;
2524
import org.apache.hadoop.hbase.io.compress.HFileTestBase;
2625
import org.apache.hadoop.hbase.testclassification.IOTests;
2726
import org.apache.hadoop.hbase.testclassification.SmallTests;
28-
import org.junit.BeforeClass;
29-
import org.junit.ClassRule;
30-
import org.junit.Test;
31-
import org.junit.experimental.categories.Category;
27+
import org.junit.jupiter.api.BeforeAll;
28+
import org.junit.jupiter.api.Tag;
29+
import org.junit.jupiter.api.Test;
3230

33-
@Category({ IOTests.class, SmallTests.class })
31+
@Tag(IOTests.TAG)
32+
@Tag(SmallTests.TAG)
3433
public class TestHFileCompressionZstd extends HFileTestBase {
3534

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestHFileCompressionZstd.class);
39-
4035
private static Configuration conf;
4136

42-
@BeforeClass
37+
@BeforeAll
4338
public static void setUpBeforeClass() throws Exception {
4439
conf = TEST_UTIL.getConfiguration();
4540
conf.set(Compression.ZSTD_CODEC_CLASS_KEY, ZstdCodec.class.getCanonicalName());

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestLz4Codec.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,14 @@
1717
*/
1818
package org.apache.hadoop.hbase.io.compress.aircompressor;
1919

20-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2120
import org.apache.hadoop.hbase.io.compress.CompressionTestBase;
2221
import org.apache.hadoop.hbase.testclassification.SmallTests;
23-
import org.junit.ClassRule;
24-
import org.junit.Test;
25-
import org.junit.experimental.categories.Category;
22+
import org.junit.jupiter.api.Tag;
23+
import org.junit.jupiter.api.Test;
2624

27-
@Category(SmallTests.class)
25+
@Tag(SmallTests.TAG)
2826
public class TestLz4Codec extends CompressionTestBase {
2927

30-
@ClassRule
31-
public static final HBaseClassTestRule CLASS_RULE =
32-
HBaseClassTestRule.forClass(TestLz4Codec.class);
33-
3428
@Test
3529
public void testLz4CodecSmall() throws Exception {
3630
codecSmallTest(new Lz4Codec());

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestLzoCodec.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,14 @@
1717
*/
1818
package org.apache.hadoop.hbase.io.compress.aircompressor;
1919

20-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2120
import org.apache.hadoop.hbase.io.compress.CompressionTestBase;
2221
import org.apache.hadoop.hbase.testclassification.SmallTests;
23-
import org.junit.ClassRule;
24-
import org.junit.Test;
25-
import org.junit.experimental.categories.Category;
22+
import org.junit.jupiter.api.Tag;
23+
import org.junit.jupiter.api.Test;
2624

27-
@Category(SmallTests.class)
25+
@Tag(SmallTests.TAG)
2826
public class TestLzoCodec extends CompressionTestBase {
2927

30-
@ClassRule
31-
public static final HBaseClassTestRule CLASS_RULE =
32-
HBaseClassTestRule.forClass(TestLzoCodec.class);
33-
3428
@Test
3529
public void testLzoCodecSmall() throws Exception {
3630
codecSmallTest(new LzoCodec());

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestSnappyCodec.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,14 @@
1717
*/
1818
package org.apache.hadoop.hbase.io.compress.aircompressor;
1919

20-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2120
import org.apache.hadoop.hbase.io.compress.CompressionTestBase;
2221
import org.apache.hadoop.hbase.testclassification.SmallTests;
23-
import org.junit.ClassRule;
24-
import org.junit.Test;
25-
import org.junit.experimental.categories.Category;
22+
import org.junit.jupiter.api.Tag;
23+
import org.junit.jupiter.api.Test;
2624

27-
@Category(SmallTests.class)
25+
@Tag(SmallTests.TAG)
2826
public class TestSnappyCodec extends CompressionTestBase {
2927

30-
@ClassRule
31-
public static final HBaseClassTestRule CLASS_RULE =
32-
HBaseClassTestRule.forClass(TestSnappyCodec.class);
33-
3428
@Test
3529
public void testSnappyCodecSmall() throws Exception {
3630
codecSmallTest(new SnappyCodec());

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestWALCompressionLz4.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,22 @@
1818
package org.apache.hadoop.hbase.io.compress.aircompressor;
1919

2020
import org.apache.hadoop.conf.Configuration;
21-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2221
import org.apache.hadoop.hbase.HConstants;
2322
import org.apache.hadoop.hbase.io.compress.Compression;
2423
import org.apache.hadoop.hbase.regionserver.wal.CompressionContext;
2524
import org.apache.hadoop.hbase.testclassification.MediumTests;
2625
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
2726
import org.apache.hadoop.hbase.wal.CompressedWALTestBase;
28-
import org.junit.AfterClass;
29-
import org.junit.BeforeClass;
30-
import org.junit.ClassRule;
31-
import org.junit.experimental.categories.Category;
27+
import org.junit.jupiter.api.AfterAll;
28+
import org.junit.jupiter.api.BeforeAll;
29+
import org.junit.jupiter.api.Tag;
30+
import org.junit.jupiter.api.Test;
3231

33-
@Category({ RegionServerTests.class, MediumTests.class })
32+
@Tag(RegionServerTests.TAG)
33+
@Tag(MediumTests.TAG)
3434
public class TestWALCompressionLz4 extends CompressedWALTestBase {
3535

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestWALCompressionLz4.class);
39-
40-
@BeforeClass
36+
@BeforeAll
4137
public static void setUpBeforeClass() throws Exception {
4238
Configuration conf = TEST_UTIL.getConfiguration();
4339
conf.set(Compression.LZ4_CODEC_CLASS_KEY, Lz4Codec.class.getCanonicalName());
@@ -48,9 +44,18 @@ public static void setUpBeforeClass() throws Exception {
4844
TEST_UTIL.startMiniDFSCluster(3);
4945
}
5046

51-
@AfterClass
47+
@AfterAll
5248
public static void tearDown() throws Exception {
5349
TEST_UTIL.shutdownMiniCluster();
5450
}
5551

52+
@Test
53+
public void test() throws Exception {
54+
super.test();
55+
}
56+
57+
@Test
58+
public void testLarge() throws Exception {
59+
super.testLarge();
60+
}
5661
}

‎hbase-compression/hbase-compression-aircompressor/src/test/java/org/apache/hadoop/hbase/io/compress/aircompressor/TestWALCompressionLzo.java‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,22 @@
1818
package org.apache.hadoop.hbase.io.compress.aircompressor;
1919

2020
import org.apache.hadoop.conf.Configuration;
21-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2221
import org.apache.hadoop.hbase.HConstants;
2322
import org.apache.hadoop.hbase.io.compress.Compression;
2423
import org.apache.hadoop.hbase.regionserver.wal.CompressionContext;
2524
import org.apache.hadoop.hbase.testclassification.MediumTests;
2625
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
2726
import org.apache.hadoop.hbase.wal.CompressedWALTestBase;
28-
import org.junit.AfterClass;
29-
import org.junit.BeforeClass;
30-
import org.junit.ClassRule;
31-
import org.junit.experimental.categories.Category;
27+
import org.junit.jupiter.api.AfterAll;
28+
import org.junit.jupiter.api.BeforeAll;
29+
import org.junit.jupiter.api.Tag;
30+
import org.junit.jupiter.api.Test;
3231

33-
@Category({ RegionServerTests.class, MediumTests.class })
32+
@Tag(RegionServerTests.TAG)
33+
@Tag(MediumTests.TAG)
3434
public class TestWALCompressionLzo extends CompressedWALTestBase {
3535

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestWALCompressionLzo.class);
39-
40-
@BeforeClass
36+
@BeforeAll
4137
public static void setUpBeforeClass() throws Exception {
4238
Configuration conf = TEST_UTIL.getConfiguration();
4339
conf.set(Compression.LZO_CODEC_CLASS_KEY, LzoCodec.class.getCanonicalName());
@@ -48,8 +44,18 @@ public static void setUpBeforeClass() throws Exception {
4844
TEST_UTIL.startMiniDFSCluster(3);
4945
}
5046

51-
@AfterClass
47+
@AfterAll
5248
public static void tearDown() throws Exception {
5349
TEST_UTIL.shutdownMiniCluster();
5450
}
51+
52+
@Test
53+
public void test() throws Exception {
54+
super.test();
55+
}
56+
57+
@Test
58+
public void testLarge() throws Exception {
59+
super.testLarge();
60+
}
5561
}

0 commit comments

Comments
 (0)