Skip to content

Commit 30f7266

Browse files
liuxiaocs7liuxiaocs7
authored
HBASE-30079 Upgrade hbase-compression to use junit5 (apache#8072)
Signed-off-by: Duo Zhang <zhangduo@apache.org>
1 parent fab7c6e commit 30f7266

31 files changed

Lines changed: 180 additions & 354 deletions

File tree

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

Lines changed: 6 additions & 12 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());
@@ -53,5 +48,4 @@ public void test() throws Exception {
5348
new Path(TEST_UTIL.getDataTestDir(), HBaseTestingUtil.getRandomUUID().toString() + ".hfile");
5449
doTest(conf, path, Compression.Algorithm.LZ4);
5550
}
56-
5751
}

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

Lines changed: 6 additions & 12 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());
@@ -53,5 +48,4 @@ public void test() throws Exception {
5348
new Path(TEST_UTIL.getDataTestDir(), HBaseTestingUtil.getRandomUUID().toString() + ".hfile");
5449
doTest(conf, path, Compression.Algorithm.LZO);
5550
}
56-
5751
}

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

Lines changed: 6 additions & 12 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());
@@ -53,5 +48,4 @@ public void test() throws Exception {
5348
new Path(TEST_UTIL.getDataTestDir(), HBaseTestingUtil.getRandomUUID().toString() + ".hfile");
5449
doTest(conf, path, Compression.Algorithm.SNAPPY);
5550
}
56-
5751
}

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

Lines changed: 6 additions & 12 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());
@@ -53,5 +48,4 @@ public void test() throws Exception {
5348
new Path(TEST_UTIL.getDataTestDir(), HBaseTestingUtil.getRandomUUID().toString() + ".hfile");
5449
doTest(conf, path, Compression.Algorithm.ZSTD);
5550
}
56-
5751
}

‎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 & 10 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());
@@ -47,5 +41,4 @@ public void testLzoCodecLarge() throws Exception {
4741
public void testLzoCodecVeryLarge() throws Exception {
4842
codecVeryLargeTest(new LzoCodec(), 3); // like text
4943
}
50-
5144
}

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

Lines changed: 3 additions & 10 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());
@@ -47,5 +41,4 @@ public void testSnappyCodecLarge() throws Exception {
4741
public void testSnappyCodecVeryLarge() throws Exception {
4842
codecVeryLargeTest(new SnappyCodec(), 3); // like text
4943
}
50-
5144
}

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,21 @@
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;
3230

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

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestWALCompressionLz4.class);
39-
40-
@BeforeClass
35+
@BeforeAll
4136
public static void setUpBeforeClass() throws Exception {
4237
Configuration conf = TEST_UTIL.getConfiguration();
4338
conf.set(Compression.LZ4_CODEC_CLASS_KEY, Lz4Codec.class.getCanonicalName());
@@ -48,9 +43,8 @@ public static void setUpBeforeClass() throws Exception {
4843
TEST_UTIL.startMiniDFSCluster(3);
4944
}
5045

51-
@AfterClass
46+
@AfterAll
5247
public static void tearDown() throws Exception {
5348
TEST_UTIL.shutdownMiniCluster();
5449
}
55-
5650
}

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,21 @@
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;
3230

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

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestWALCompressionLzo.class);
39-
40-
@BeforeClass
35+
@BeforeAll
4136
public static void setUpBeforeClass() throws Exception {
4237
Configuration conf = TEST_UTIL.getConfiguration();
4338
conf.set(Compression.LZO_CODEC_CLASS_KEY, LzoCodec.class.getCanonicalName());
@@ -48,7 +43,7 @@ public static void setUpBeforeClass() throws Exception {
4843
TEST_UTIL.startMiniDFSCluster(3);
4944
}
5045

51-
@AfterClass
46+
@AfterAll
5247
public static void tearDown() throws Exception {
5348
TEST_UTIL.shutdownMiniCluster();
5449
}

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,21 @@
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;
3230

33-
@Category({ RegionServerTests.class, MediumTests.class })
31+
@Tag(RegionServerTests.TAG)
32+
@Tag(MediumTests.TAG)
3433
public class TestWALCompressionSnappy extends CompressedWALTestBase {
3534

36-
@ClassRule
37-
public static final HBaseClassTestRule CLASS_RULE =
38-
HBaseClassTestRule.forClass(TestWALCompressionSnappy.class);
39-
40-
@BeforeClass
35+
@BeforeAll
4136
public static void setUpBeforeClass() throws Exception {
4237
Configuration conf = TEST_UTIL.getConfiguration();
4338
conf.set(Compression.SNAPPY_CODEC_CLASS_KEY, SnappyCodec.class.getCanonicalName());
@@ -48,9 +43,8 @@ public static void setUpBeforeClass() throws Exception {
4843
TEST_UTIL.startMiniDFSCluster(3);
4944
}
5045

51-
@AfterClass
46+
@AfterAll
5247
public static void tearDown() throws Exception {
5348
TEST_UTIL.shutdownMiniCluster();
5449
}
55-
5650
}

0 commit comments

Comments
 (0)