Skip to content

Commit 7b970c7

Browse files
liuxiaocs7liuxiaocs7
committed
HBASE-29968 Upgrade hbase-mapreduce to use junit5
1 parent 40edced commit 7b970c7

File tree

87 files changed

+1227
-1640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1227
-1640
lines changed

‎hbase-mapreduce/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
</dependency>
162162
<dependency>
163163
<groupId>org.mockito</groupId>
164-
<artifactId>mockito-core</artifactId>
164+
<artifactId>mockito-junit-jupiter</artifactId>
165165
<scope>test</scope>
166166
</dependency>
167167
<dependency>
@@ -191,11 +191,6 @@
191191
<artifactId>junit-jupiter-params</artifactId>
192192
<scope>test</scope>
193193
</dependency>
194-
<dependency>
195-
<groupId>org.junit.vintage</groupId>
196-
<artifactId>junit-vintage-engine</artifactId>
197-
<scope>test</scope>
198-
</dependency>
199194
<dependency>
200195
<groupId>org.slf4j</groupId>
201196
<artifactId>jcl-over-slf4j</artifactId>

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,17 @@
2020
import static org.mockito.Mockito.mock;
2121
import static org.mockito.Mockito.verify;
2222

23-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2423
import org.apache.hadoop.hbase.testclassification.MapReduceTests;
2524
import org.apache.hadoop.hbase.testclassification.SmallTests;
2625
import org.apache.hadoop.util.ProgramDriver;
27-
import org.junit.ClassRule;
28-
import org.junit.Test;
29-
import org.junit.experimental.categories.Category;
26+
import org.junit.jupiter.api.Tag;
27+
import org.junit.jupiter.api.Test;
3028
import org.mockito.Mockito;
3129

32-
@Category({ MapReduceTests.class, SmallTests.class })
30+
@Tag(MapReduceTests.TAG)
31+
@Tag(SmallTests.TAG)
3332
public class TestDriver {
3433

35-
@ClassRule
36-
public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestDriver.class);
37-
3834
@Test
3935
public void testDriverMainMethod() throws Throwable {
4036
ProgramDriver programDriverMock = mock(ProgramDriver.class);

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
*/
1818
package org.apache.hadoop.hbase.mapred;
1919

20-
import static org.junit.Assert.assertArrayEquals;
21-
import static org.junit.Assert.assertNull;
20+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
21+
import static org.junit.jupiter.api.Assertions.assertNull;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2223
import static org.mockito.ArgumentMatchers.any;
2324
import static org.mockito.Mockito.mock;
2425
import static org.mockito.Mockito.times;
@@ -32,7 +33,6 @@
3233
import java.util.concurrent.atomic.AtomicBoolean;
3334
import org.apache.hadoop.conf.Configuration;
3435
import org.apache.hadoop.hbase.Cell;
35-
import org.apache.hadoop.hbase.HBaseClassTestRule;
3636
import org.apache.hadoop.hbase.KeyValue;
3737
import org.apache.hadoop.hbase.client.Result;
3838
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
@@ -42,20 +42,15 @@
4242
import org.apache.hadoop.mapred.JobConf;
4343
import org.apache.hadoop.mapred.OutputCollector;
4444
import org.apache.hadoop.mapred.Reporter;
45-
import org.junit.Assert;
46-
import org.junit.ClassRule;
47-
import org.junit.Test;
48-
import org.junit.experimental.categories.Category;
45+
import org.junit.jupiter.api.Tag;
46+
import org.junit.jupiter.api.Test;
4947

5048
import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableList;
5149

52-
@Category({ MapReduceTests.class, SmallTests.class })
50+
@Tag(MapReduceTests.TAG)
51+
@Tag(SmallTests.TAG)
5352
public class TestGroupingTableMap {
5453

55-
@ClassRule
56-
public static final HBaseClassTestRule CLASS_RULE =
57-
HBaseClassTestRule.forClass(TestGroupingTableMap.class);
58-
5954
@Test
6055
@SuppressWarnings("unchecked")
6156
public void shouldNotCallCollectonSinceFindUniqueKeyValueMoreThanOnes() throws Exception {
@@ -156,7 +151,7 @@ public void collect(ImmutableBytesWritable arg, Result result) throws IOExceptio
156151

157152
gTableMap.map(null, result, outputCollector, reporter);
158153
verify(result).listCells();
159-
Assert.assertTrue("Output not received", outputCollected.get());
154+
assertTrue(outputCollected.get(), "Output not received");
160155

161156
final byte[] firstPartValue = Bytes.toBytes("238947928");
162157
final byte[] secondPartValue = Bytes.toBytes("4678456942345");

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,20 @@
2222
import static org.mockito.Mockito.verify;
2323

2424
import java.io.IOException;
25-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2625
import org.apache.hadoop.hbase.client.Result;
2726
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
2827
import org.apache.hadoop.hbase.testclassification.MapReduceTests;
2928
import org.apache.hadoop.hbase.testclassification.SmallTests;
3029
import org.apache.hadoop.mapred.OutputCollector;
3130
import org.apache.hadoop.mapred.Reporter;
32-
import org.junit.ClassRule;
33-
import org.junit.Test;
34-
import org.junit.experimental.categories.Category;
31+
import org.junit.jupiter.api.Tag;
32+
import org.junit.jupiter.api.Test;
3533
import org.mockito.Mockito;
3634

37-
@Category({ MapReduceTests.class, SmallTests.class })
35+
@Tag(MapReduceTests.TAG)
36+
@Tag(SmallTests.TAG)
3837
public class TestIdentityTableMap {
3938

40-
@ClassRule
41-
public static final HBaseClassTestRule CLASS_RULE =
42-
HBaseClassTestRule.forClass(TestIdentityTableMap.class);
43-
4439
@Test
4540
@SuppressWarnings({ "deprecation", "unchecked" })
4641
public void shouldCollectPredefinedTimes() throws IOException {

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestMultiTableSnapshotInputFormat.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
*/
1818
package org.apache.hadoop.hbase.mapred;
1919

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

2222
import java.io.IOException;
2323
import java.util.Iterator;
2424
import java.util.List;
2525
import org.apache.hadoop.conf.Configuration;
2626
import org.apache.hadoop.fs.Path;
27-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2827
import org.apache.hadoop.hbase.client.Result;
2928
import org.apache.hadoop.hbase.client.Scan;
3029
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
@@ -37,21 +36,17 @@
3736
import org.apache.hadoop.mapred.OutputCollector;
3837
import org.apache.hadoop.mapred.Reporter;
3938
import org.apache.hadoop.mapred.RunningJob;
40-
import org.junit.ClassRule;
41-
import org.junit.experimental.categories.Category;
39+
import org.junit.jupiter.api.Tag;
4240
import org.slf4j.Logger;
4341
import org.slf4j.LoggerFactory;
4442

4543
import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
4644

47-
@Category({ VerySlowMapReduceTests.class, LargeTests.class })
45+
@Tag(VerySlowMapReduceTests.TAG)
46+
@Tag(LargeTests.TAG)
4847
public class TestMultiTableSnapshotInputFormat
4948
extends org.apache.hadoop.hbase.mapreduce.TestMultiTableSnapshotInputFormat {
5049

51-
@ClassRule
52-
public static final HBaseClassTestRule CLASS_RULE =
53-
HBaseClassTestRule.forClass(TestMultiTableSnapshotInputFormat.class);
54-
5550
private static final Logger LOG =
5651
LoggerFactory.getLogger(TestMultiTableSnapshotInputFormat.class);
5752

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java‎

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

20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertNotNull;
22-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertNotNull;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2323
import static org.mockito.ArgumentMatchers.any;
2424
import static org.mockito.ArgumentMatchers.anyLong;
2525
import static org.mockito.Mockito.mock;
@@ -28,7 +28,6 @@
2828
import java.io.ByteArrayOutputStream;
2929
import java.io.IOException;
3030
import java.io.PrintStream;
31-
import org.apache.hadoop.hbase.HBaseClassTestRule;
3231
import org.apache.hadoop.hbase.HBaseConfiguration;
3332
import org.apache.hadoop.hbase.client.Result;
3433
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
@@ -38,20 +37,16 @@
3837
import org.apache.hadoop.mapred.JobConf;
3938
import org.apache.hadoop.mapred.OutputCollector;
4039
import org.apache.hadoop.mapred.Reporter;
41-
import org.junit.ClassRule;
42-
import org.junit.Test;
43-
import org.junit.experimental.categories.Category;
40+
import org.junit.jupiter.api.Tag;
41+
import org.junit.jupiter.api.Test;
4442
import org.mockito.Mockito;
4543

4644
import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
4745

48-
@Category({ MapReduceTests.class, MediumTests.class })
46+
@Tag(MapReduceTests.TAG)
47+
@Tag(MediumTests.TAG)
4948
public class TestRowCounter {
5049

51-
@ClassRule
52-
public static final HBaseClassTestRule CLASS_RULE =
53-
HBaseClassTestRule.forClass(TestRowCounter.class);
54-
5550
@Test
5651
@SuppressWarnings("deprecation")
5752
public void shouldPrintUsage() throws Exception {

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestSplitTable.java‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,21 @@
1717
*/
1818
package org.apache.hadoop.hbase.mapred;
1919

20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertNotEquals;
22-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2323

24-
import org.apache.hadoop.hbase.HBaseClassTestRule;
2524
import org.apache.hadoop.hbase.TableName;
2625
import org.apache.hadoop.hbase.testclassification.MapReduceTests;
2726
import org.apache.hadoop.hbase.testclassification.SmallTests;
2827
import org.apache.hadoop.hbase.util.Bytes;
29-
import org.junit.Assert;
30-
import org.junit.ClassRule;
31-
import org.junit.Rule;
32-
import org.junit.Test;
33-
import org.junit.experimental.categories.Category;
34-
import org.junit.rules.TestName;
35-
36-
@Category({ MapReduceTests.class, SmallTests.class })
37-
public class TestSplitTable {
38-
39-
@ClassRule
40-
public static final HBaseClassTestRule CLASS_RULE =
41-
HBaseClassTestRule.forClass(TestSplitTable.class);
28+
import org.junit.jupiter.api.Tag;
29+
import org.junit.jupiter.api.Test;
30+
import org.junit.jupiter.api.TestInfo;
4231

43-
@Rule
44-
public TestName name = new TestName();
32+
@Tag(MapReduceTests.TAG)
33+
@Tag(SmallTests.TAG)
34+
public class TestSplitTable {
4535

4636
@Test
4737
@SuppressWarnings({ "deprecation", "SelfComparison" })
@@ -104,16 +94,16 @@ public void testSplitTableEquals() {
10494

10595
@Test
10696
@SuppressWarnings("deprecation")
107-
public void testToString() {
108-
TableSplit split = new TableSplit(TableName.valueOf(name.getMethodName()),
97+
public void testToString(TestInfo testInfo) {
98+
TableSplit split = new TableSplit(TableName.valueOf(testInfo.getTestMethod().get().getName()),
10999
Bytes.toBytes("row-start"), Bytes.toBytes("row-end"), "location");
110-
String str = "HBase table split(table name: " + name.getMethodName()
100+
String str = "HBase table split(table name: " + testInfo.getTestMethod().get().getName()
111101
+ ", start row: row-start, " + "end row: row-end, region location: location)";
112-
Assert.assertEquals(str, split.toString());
102+
assertEquals(str, split.toString());
113103

114104
split = new TableSplit((TableName) null, null, null, null);
115105
str = "HBase table split(table name: null, start row: null, "
116106
+ "end row: null, region location: null)";
117-
Assert.assertEquals(str, split.toString());
107+
assertEquals(str, split.toString());
118108
}
119109
}

0 commit comments

Comments
 (0)