This is an automated email from the ASF dual-hosted git repository. srowen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new 0562cac [SPARK-38673][TESTS] Replace Java assert with Junit API in Java UTs 0562cac is described below commit 0562cacafe8e402683de2898cec65b9327983f84 Author: yangjie01 <yangji...@baidu.com> AuthorDate: Mon Mar 28 18:21:38 2022 -0500 [SPARK-38673][TESTS] Replace Java assert with Junit API in Java UTs ### What changes were proposed in this pull request? There are some Java UTs use java `assert` for assertion, and these assertions will strongly depend on JVM start with `-ea` mode, so this pr replace them with Junit API. ### Why are the changes needed? Use Junit API in Java UTs. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA Closes #35987 from LuciferYang/SPARK-38673. Authored-by: yangjie01 <yangji...@baidu.com> Signed-off-by: Sean Owen <sro...@gmail.com> --- .../spark/util/kvstore/InMemoryStoreSuite.java | 8 ++++---- .../client/TransportClientFactorySuite.java | 7 ++----- .../apache/spark/unsafe/array/ByteArraySuite.java | 8 ++++---- .../spark/resource/JavaResourceProfileSuite.java | 6 +++--- .../unsafe/map/AbstractBytesToBytesMapSuite.java | 22 +++++++++++----------- .../unsafe/sort/UnsafeExternalSorterSuite.java | 4 ++-- .../sql/streaming/JavaGroupStateTimeoutSuite.java | 10 ++++++---- 7 files changed, 32 insertions(+), 33 deletions(-) diff --git a/common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryStoreSuite.java b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryStoreSuite.java index 35656fb..198b6e8 100644 --- a/common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryStoreSuite.java +++ b/common/kvstore/src/test/java/org/apache/spark/util/kvstore/InMemoryStoreSuite.java @@ -159,25 +159,25 @@ public class InMemoryStoreSuite { assertEquals(9, store.count(ArrayKeyIndexType.class)); // Try removing non-existing keys - assert(!store.removeAllByIndexValues( + assertFalse(store.removeAllByIndexValues( ArrayKeyIndexType.class, KVIndex.NATURAL_INDEX_NAME, ImmutableSet.of(new int[] {10, 10, 10}, new int[] { 3, 3, 3 }))); assertEquals(9, store.count(ArrayKeyIndexType.class)); - assert(store.removeAllByIndexValues( + assertTrue(store.removeAllByIndexValues( ArrayKeyIndexType.class, KVIndex.NATURAL_INDEX_NAME, ImmutableSet.of(new int[] {0, 0, 0}, new int[] { 2, 2, 2 }))); assertEquals(7, store.count(ArrayKeyIndexType.class)); - assert(store.removeAllByIndexValues( + assertTrue(store.removeAllByIndexValues( ArrayKeyIndexType.class, "id", ImmutableSet.of(new String [] { "things" }))); assertEquals(4, store.count(ArrayKeyIndexType.class)); - assert(store.removeAllByIndexValues( + assertTrue(store.removeAllByIndexValues( ArrayKeyIndexType.class, "id", ImmutableSet.of(new String [] { "more things" }))); diff --git a/common/network-common/src/test/java/org/apache/spark/network/client/TransportClientFactorySuite.java b/common/network-common/src/test/java/org/apache/spark/network/client/TransportClientFactorySuite.java index 277ff85..c542f31 100644 --- a/common/network-common/src/test/java/org/apache/spark/network/client/TransportClientFactorySuite.java +++ b/common/network-common/src/test/java/org/apache/spark/network/client/TransportClientFactorySuite.java @@ -231,11 +231,8 @@ public class TransportClientFactorySuite { TransportServer server = context.createServer(); int unreachablePort = server.getPort(); server.close(); - try { - factory.createClient(TestUtils.getLocalHost(), unreachablePort, true); - } catch (Exception e) { - assert(e instanceof IOException); - } + Assert.assertThrows(IOException.class, + () -> factory.createClient(TestUtils.getLocalHost(), unreachablePort, true)); Assert.assertThrows("fail this connection directly", IOException.class, () -> factory.createClient(TestUtils.getLocalHost(), unreachablePort, true)); } diff --git a/common/unsafe/src/test/java/org/apache/spark/unsafe/array/ByteArraySuite.java b/common/unsafe/src/test/java/org/apache/spark/unsafe/array/ByteArraySuite.java index 67de435..71cd824 100644 --- a/common/unsafe/src/test/java/org/apache/spark/unsafe/array/ByteArraySuite.java +++ b/common/unsafe/src/test/java/org/apache/spark/unsafe/array/ByteArraySuite.java @@ -53,18 +53,18 @@ public class ByteArraySuite { public void testCompareBinary() { byte[] x1 = new byte[0]; byte[] y1 = new byte[]{(byte) 1, (byte) 2, (byte) 3}; - assert(ByteArray.compareBinary(x1, y1) < 0); + Assert.assertTrue(ByteArray.compareBinary(x1, y1) < 0); byte[] x2 = new byte[]{(byte) 200, (byte) 100}; byte[] y2 = new byte[]{(byte) 100, (byte) 100}; - assert(ByteArray.compareBinary(x2, y2) > 0); + Assert.assertTrue(ByteArray.compareBinary(x2, y2) > 0); byte[] x3 = new byte[]{(byte) 100, (byte) 200, (byte) 12}; byte[] y3 = new byte[]{(byte) 100, (byte) 200}; - assert(ByteArray.compareBinary(x3, y3) > 0); + Assert.assertTrue(ByteArray.compareBinary(x3, y3) > 0); byte[] x4 = new byte[]{(byte) 100, (byte) 200}; byte[] y4 = new byte[]{(byte) 100, (byte) 200}; - assert(ByteArray.compareBinary(x4, y4) == 0); + Assert.assertEquals(0, ByteArray.compareBinary(x4, y4)); } } diff --git a/core/src/test/java/org/apache/spark/resource/JavaResourceProfileSuite.java b/core/src/test/java/org/apache/spark/resource/JavaResourceProfileSuite.java index bb413c0..1dca1dc 100644 --- a/core/src/test/java/org/apache/spark/resource/JavaResourceProfileSuite.java +++ b/core/src/test/java/org/apache/spark/resource/JavaResourceProfileSuite.java @@ -43,13 +43,13 @@ public class JavaResourceProfileSuite { assertEquals(rprof.executorResources().size(), 2); Map<String, ExecutorResourceRequest> eresources = rprof.executorResourcesJMap(); - assert(eresources.containsKey(GpuResource)); + assertTrue(eresources.containsKey(GpuResource)); ExecutorResourceRequest gpuReq = eresources.get(GpuResource); assertEquals(gpuReq.amount(), 2); assertEquals(gpuReq.discoveryScript(), "myscript"); assertEquals(gpuReq.vendor(), ""); - assert(eresources.containsKey(FPGAResource)); + assertTrue(eresources.containsKey(FPGAResource)); ExecutorResourceRequest fpgaReq = eresources.get(FPGAResource); assertEquals(fpgaReq.amount(), 3); assertEquals(fpgaReq.discoveryScript(), "myfpgascript"); @@ -57,7 +57,7 @@ public class JavaResourceProfileSuite { assertEquals(rprof.taskResources().size(), 1); Map<String, TaskResourceRequest> tresources = rprof.taskResourcesJMap(); - assert(tresources.containsKey(GpuResource)); + assertTrue(tresources.containsKey(GpuResource)); TaskResourceRequest taskReq = tresources.get(GpuResource); assertEquals(taskReq.amount(), 1.0, 0); assertEquals(taskReq.resourceName(), GpuResource); diff --git a/core/src/test/java/org/apache/spark/unsafe/map/AbstractBytesToBytesMapSuite.java b/core/src/test/java/org/apache/spark/unsafe/map/AbstractBytesToBytesMapSuite.java index 277c8ff..a9c81c5 100644 --- a/core/src/test/java/org/apache/spark/unsafe/map/AbstractBytesToBytesMapSuite.java +++ b/core/src/test/java/org/apache/spark/unsafe/map/AbstractBytesToBytesMapSuite.java @@ -583,33 +583,33 @@ public abstract class AbstractBytesToBytesMapSuite { map.lookup(arr, Platform.LONG_ARRAY_OFFSET, 8) .append(arr, Platform.LONG_ARRAY_OFFSET, 8, arr, Platform.LONG_ARRAY_OFFSET, 8); } - assert map.numKeys() == 1024; - assert map.numValues() == 1024; + assertEquals(1024, map.numKeys()); + assertEquals(1024, map.numValues()); for (i = 0; i < 1024; i++) { final long[] arr = new long[]{i}; map.lookup(arr, Platform.LONG_ARRAY_OFFSET, 8) .append(arr, Platform.LONG_ARRAY_OFFSET, 8, arr, Platform.LONG_ARRAY_OFFSET, 8); } - assert map.numKeys() == 1024; - assert map.numValues() == 2048; + assertEquals(1024, map.numKeys()); + assertEquals(2048, map.numValues()); for (i = 0; i < 1024; i++) { final long[] arr = new long[]{i}; final BytesToBytesMap.Location loc = map.lookup(arr, Platform.LONG_ARRAY_OFFSET, 8); - assert loc.isDefined(); - assert loc.nextValue(); - assert !loc.nextValue(); + assertTrue(loc.isDefined()); + assertTrue(loc.nextValue()); + assertFalse(loc.nextValue()); } BytesToBytesMap.MapIterator iter = map.iterator(); for (i = 0; i < 2048; i++) { - assert iter.hasNext(); + assertTrue(iter.hasNext()); final BytesToBytesMap.Location loc = iter.next(); - assert loc.isDefined(); + assertTrue(loc.isDefined()); } BytesToBytesMap.MapIteratorWithKeyIndex iterWithKeyIndex = map.iteratorWithKeyIndex(); for (i = 0; i < 2048; i++) { - assert iterWithKeyIndex.hasNext(); + assertTrue(iterWithKeyIndex.hasNext()); final BytesToBytesMap.Location loc = iterWithKeyIndex.next(); - assert loc.isDefined() && loc.getKeyIndex() >= 0; + assertTrue(loc.isDefined() && loc.getKeyIndex() >= 0); } } finally { map.free(); diff --git a/core/src/test/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorterSuite.java b/core/src/test/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorterSuite.java index 04316a6..1f59629 100644 --- a/core/src/test/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorterSuite.java +++ b/core/src/test/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorterSuite.java @@ -602,9 +602,9 @@ public class UnsafeExternalSorterSuite { private void verifyIntIterator(UnsafeSorterIterator iter, int start, int end) throws IOException { for (int i = start; i < end; i++) { - assert (iter.hasNext()); + assertTrue(iter.hasNext()); iter.loadNext(); - assert (Platform.getInt(iter.getBaseObject(), iter.getBaseOffset()) == i); + assertEquals(Platform.getInt(iter.getBaseObject(), iter.getBaseOffset()), i); } } } diff --git a/sql/catalyst/src/test/java/org/apache/spark/sql/streaming/JavaGroupStateTimeoutSuite.java b/sql/catalyst/src/test/java/org/apache/spark/sql/streaming/JavaGroupStateTimeoutSuite.java index 2e8f2e3..8570acc 100644 --- a/sql/catalyst/src/test/java/org/apache/spark/sql/streaming/JavaGroupStateTimeoutSuite.java +++ b/sql/catalyst/src/test/java/org/apache/spark/sql/streaming/JavaGroupStateTimeoutSuite.java @@ -17,17 +17,19 @@ package org.apache.spark.sql.streaming; +import org.junit.Assert; +import org.junit.Test; + import org.apache.spark.sql.catalyst.plans.logical.EventTimeTimeout$; import org.apache.spark.sql.catalyst.plans.logical.NoTimeout$; import org.apache.spark.sql.catalyst.plans.logical.ProcessingTimeTimeout$; -import org.junit.Test; public class JavaGroupStateTimeoutSuite { @Test public void testTimeouts() { - assert (GroupStateTimeout.ProcessingTimeTimeout() == ProcessingTimeTimeout$.MODULE$); - assert (GroupStateTimeout.EventTimeTimeout() == EventTimeTimeout$.MODULE$); - assert (GroupStateTimeout.NoTimeout() == NoTimeout$.MODULE$); + Assert.assertSame(GroupStateTimeout.ProcessingTimeTimeout(), ProcessingTimeTimeout$.MODULE$); + Assert.assertSame(GroupStateTimeout.EventTimeTimeout(), EventTimeTimeout$.MODULE$); + Assert.assertSame(GroupStateTimeout.NoTimeout(), NoTimeout$.MODULE$); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org