From dd8d3f30c5c1e0beeaf093acdf28bc1ec7426c16 Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Wed, 16 Apr 2025 15:40:06 +0800 Subject: [PATCH] HADOOP-19430. Upgrade JUnit from 4 to 5 in hadoop-datajoin. --- .../hadoop/contrib/utils/join/TestDataJoin.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java index 2daae2e803b48..ecd1e9f63376f 100644 --- a/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java +++ b/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java @@ -20,10 +20,11 @@ import java.io.IOException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.MiniDFSCluster; @@ -43,13 +44,13 @@ public class TestDataJoin { private static MiniDFSCluster cluster = null; - @Before + @BeforeEach public void setUp() throws Exception { Configuration conf = new Configuration(); cluster = new MiniDFSCluster.Builder(conf).numDataNodes(2).build(); } - @After + @AfterEach public void tearDown() throws Exception { if (cluster != null) { cluster.shutdown();