From f09b946cd84d837717ad417c71edfe32bd9fedce Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Sat, 29 Mar 2025 17:06:05 +0800 Subject: [PATCH 1/2] HADOOP-19439. Upgrade JUnit from 4 to 5 in hadoop-rumen. --- .../hadoop/tools/rumen/TestHistograms.java | 18 +++++++++-------- .../TestPiecewiseLinearInterpolation.java | 10 +++++----- .../tools/rumen/TestRandomSeedGenerator.java | 20 +++++++++---------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java index 187251900b75d..b5792a7b8cb76 100644 --- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java +++ b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java @@ -34,10 +34,12 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.junit.Ignore; -import org.junit.Test; -import static org.junit.Assert.*; -@Ignore +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + +@Disabled public class TestHistograms { /** @@ -71,7 +73,7 @@ public void testHistograms() throws IOException { if (fileName.startsWith("input")) { String testName = fileName.substring("input".length()); Path goldFilePath = new Path(rootInputFile, "gold"+testName); - assertTrue("Gold file dies not exist", lfs.exists(goldFilePath)); + assertTrue(lfs.exists(goldFilePath), "Gold file dies not exist"); LoggedDiscreteCDF newResult = histogramFileToCDF(filePath, lfs); System.out.println("Testing a Histogram for " + fileName); FSDataInputStream goldStream = lfs.open(goldFilePath); @@ -107,11 +109,11 @@ private static LoggedDiscreteCDF histogramFileToCDF(Path path, FileSystem fs) List typeProbeData = new HistogramRawTestData().getData(); assertTrue( - "The data attribute of a jackson-reconstructed HistogramRawTestData " + + measurements.getClass() == typeProbeData.getClass(), "The data attribute of a jackson-reconstructed HistogramRawTestData " + " should be a " + typeProbeData.getClass().getName() + ", like a virgin HistogramRawTestData, but it's a " - + measurements.getClass().getName(), - measurements.getClass() == typeProbeData.getClass()); + + measurements.getClass().getName()); for (int j = 0; j < measurements.size(); ++j) { hist.enter(measurements.get(j)); diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java index 573f8628ee5d7..937244d840d89 100644 --- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java +++ b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java @@ -20,8 +20,8 @@ import java.util.ArrayList; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestPiecewiseLinearInterpolation { @@ -115,9 +115,9 @@ public void testOneRun() { System.out.println("Cumulative error is " + RMSNormalizedError); - assertTrue("The RMS relative error per bucket, " + RMSNormalizedError - + ", exceeds our tolerance of " + maximumRelativeError, - RMSNormalizedError <= maximumRelativeError); + assertTrue( + RMSNormalizedError <= maximumRelativeError, "The RMS relative error per bucket, " + RMSNormalizedError + + ", exceeds our tolerance of " + maximumRelativeError); } } diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java index cca662c5295e6..ff4357b5454e2 100644 --- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java +++ b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java @@ -18,8 +18,8 @@ package org.apache.hadoop.tools.rumen; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.apache.hadoop.tools.rumen.RandomSeedGenerator.getSeed; public class TestRandomSeedGenerator { @@ -28,13 +28,13 @@ public void testSeedGeneration() { long masterSeed1 = 42; long masterSeed2 = 43; - assertTrue("Deterministic seeding", - getSeed("stream1", masterSeed1) == getSeed("stream1", masterSeed1)); - assertTrue("Deterministic seeding", - getSeed("stream2", masterSeed2) == getSeed("stream2", masterSeed2)); - assertTrue("Different streams", - getSeed("stream1", masterSeed1) != getSeed("stream2", masterSeed1)); - assertTrue("Different master seeds", - getSeed("stream1", masterSeed1) != getSeed("stream1", masterSeed2)); + assertTrue(getSeed("stream1", masterSeed1) == getSeed("stream1", masterSeed1), + "Deterministic seeding"); + assertTrue(getSeed("stream2", masterSeed2) == getSeed("stream2", masterSeed2), + "Deterministic seeding"); + assertTrue(getSeed("stream1", masterSeed1) != getSeed("stream2", masterSeed1), + "Different streams"); + assertTrue(getSeed("stream1", masterSeed1) != getSeed("stream1", masterSeed2), + "Different master seeds"); } } From 2379524344c7e47489c292fa839fe28fb63c47e1 Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Tue, 1 Apr 2025 13:51:51 +0800 Subject: [PATCH 2/2] HADOOP-19439. Fix CheckStyle. --- .../org/apache/hadoop/tools/rumen/TestHistograms.java | 11 +++++------ .../tools/rumen/TestPiecewiseLinearInterpolation.java | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java index b5792a7b8cb76..621baeb181465 100644 --- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java +++ b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java @@ -108,12 +108,11 @@ private static LoggedDiscreteCDF histogramFileToCDF(Path path, FileSystem fs) List measurements = data.getData(); List typeProbeData = new HistogramRawTestData().getData(); - assertTrue( - - measurements.getClass() == typeProbeData.getClass(), "The data attribute of a jackson-reconstructed HistogramRawTestData " - + " should be a " + typeProbeData.getClass().getName() - + ", like a virgin HistogramRawTestData, but it's a " - + measurements.getClass().getName()); + assertTrue(measurements.getClass() == typeProbeData.getClass(), + "The data attribute of a jackson-reconstructed HistogramRawTestData " + + " should be a " + typeProbeData.getClass().getName() + + ", like a virgin HistogramRawTestData, but it's a " + + measurements.getClass().getName()); for (int j = 0; j < measurements.size(); ++j) { hist.enter(measurements.get(j)); diff --git a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java index 937244d840d89..1a6bdff4c3bb3 100644 --- a/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java +++ b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java @@ -115,8 +115,8 @@ public void testOneRun() { System.out.println("Cumulative error is " + RMSNormalizedError); - assertTrue( - RMSNormalizedError <= maximumRelativeError, "The RMS relative error per bucket, " + RMSNormalizedError + assertTrue(RMSNormalizedError <= maximumRelativeError, + "The RMS relative error per bucket, " + RMSNormalizedError + ", exceeds our tolerance of " + maximumRelativeError); }