Skip to content

Migrate tests to JUnit5 #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zkaoudi merged 7 commits into from
Jun 3, 2025
Merged

Migrate tests to JUnit5 #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
48df1d0
Migrate tests to JUnit5
strangelookingnerd Apr 25, 2025
651440b
Fix Scala tests
strangelookingnerd Apr 26, 2025
a4dab0e
Merge branch 'main' into migrate_to_junit5
strangelookingnerd May 5, 2025
8a8ee7f
Merge branch 'main' into migrate_to_junit5
strangelookingnerd May 19, 2025
9498b4a
Fix integration tests
strangelookingnerd May 19, 2025
bb3cb2b
Merge branch 'main' into migrate_to_junit5
strangelookingnerd May 28, 2025
d26026a
Fix integration tests
strangelookingnerd Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<jacoco.version>0.8.9</jacoco.version>
<jodatime.version>2.10.6</jodatime.version>
<jsonpath.version>2.4.0</jsonpath.version>
<junit5.version>5.10.2</junit5.version>
<junit5.version>5.12.2</junit5.version>
<mockito.version>5.11.0</mockito.version>
<mockk.version>1.10.0</mockk.version>
<external.platforms.scope>provided</external.platforms.scope>
Expand Down
113 changes: 57 additions & 56 deletions wayang-api/wayang-api-scala-java/src/test/java/org/apache/wayang/api/JavaApiTest.java
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 27 additions & 26 deletions wayang-api/wayang-api-scala-java/src/test/scala/org/apache/wayang/api/ApiTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import java.nio.file.{Files, Paths}
import java.sql.{Connection, Statement}
import java.util.function.Consumer

import org.junit.{Assert, Test}
import org.apache.wayang.basic.WayangBasics
import org.apache.wayang.core.api.{Configuration, WayangContext}
import org.apache.wayang.core.function.FunctionDescriptor.ExtendedSerializablePredicate
Expand All @@ -35,6 +34,8 @@ import org.apache.wayang.java.operators.JavaMapOperator
import org.apache.wayang.spark.Spark
import org.apache.wayang.sqlite3.Sqlite3
import org.apache.wayang.sqlite3.operators.Sqlite3TableSource
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.Test

/**
* Tests the Wayang API.
Expand All @@ -57,7 +58,7 @@ class ApiTest {

// Check the outcome.
val expectedOutputValues = inputValues.map(_ + 2)
Assert.assertArrayEquals(expectedOutputValues, outputValues.toArray)
assertArrayEquals(expectedOutputValues, outputValues.toArray)
}

@Test
Expand Down Expand Up @@ -87,7 +88,7 @@ class ApiTest {

// Check the outcome.
val expectedOutputValues = inputValues.map(_ + 2)
Assert.assertArrayEquals(expectedOutputValues, outputValues.toArray)
assertArrayEquals(expectedOutputValues, outputValues.toArray)
}

@Test
Expand All @@ -113,7 +114,7 @@ class ApiTest {

// Check the outcome.
val expectedOutputValues = inputValues.map(_ + 2)
Assert.assertArrayEquals(expectedOutputValues, outputValues.toArray)
assertArrayEquals(expectedOutputValues, outputValues.toArray)
}

@Test
Expand All @@ -135,7 +136,7 @@ class ApiTest {

val expectedWordCounts = Set(("big", 3), ("is", 2), ("data", 3))

Assert.assertEquals(expectedWordCounts, wordCounts)
assertEquals(expectedWordCounts, wordCounts)
}

@Test
Expand All @@ -157,7 +158,7 @@ class ApiTest {

val expectedWordCounts = Set(("big", 3), ("is", 2), ("data", 3))

Assert.assertEquals(expectedWordCounts, wordCounts)
assertEquals(expectedWordCounts, wordCounts)
}

@Test
Expand All @@ -175,8 +176,8 @@ class ApiTest {
.collect()

// Check the result.
Assert.assertEquals(10, sample.size)
Assert.assertEquals(10, sample.toSet.size)
assertEquals(10, sample.size)
assertEquals(10, sample.toSet.size)
}

@Test
Expand All @@ -199,7 +200,7 @@ class ApiTest {
.collect().toSet

val expectedValues = Set(1, 2, 3, 6, 12, 24, 48, 96, 192)
Assert.assertEquals(expectedValues, values)
assertEquals(expectedValues, values)
}

@Test
Expand All @@ -222,7 +223,7 @@ class ApiTest {

// initial: 1,2 -> 1st: 2,3 -> 2nd: 6,7 => 3rd: 42,43
val expectedValues = Set(42, 43)
Assert.assertEquals(expectedValues, values)
assertEquals(expectedValues, values)
}

@Test
Expand Down Expand Up @@ -256,7 +257,7 @@ class ApiTest {
.collect().toSet

val expectedValues = Set("Hello", "World")
Assert.assertEquals(expectedValues, values)
assertEquals(expectedValues, values)
}

@Test
Expand All @@ -280,7 +281,7 @@ class ApiTest {
.collect()

val expectedValues = Set(5, 6)
Assert.assertEquals(expectedValues, result.toSet)
assertEquals(expectedValues, result.toSet)
}

@Test
Expand All @@ -304,7 +305,7 @@ class ApiTest {
.collect()

val expectedValues = Set(5)
Assert.assertEquals(expectedValues, result.toSet)
assertEquals(expectedValues, result.toSet)
}

@Test
Expand All @@ -324,7 +325,7 @@ class ApiTest {
.collect()

val expectedValues = Set(("Apple juice", 10), ("Tap water", 0), ("Orange juice", 10))
Assert.assertEquals(expectedValues, result.toSet)
assertEquals(expectedValues, result.toSet)
}

@Test
Expand All @@ -343,7 +344,7 @@ class ApiTest {
.collect()

val expectedValues = Set(("Apple juice", 10), ("Tap water", 0), ("Orange juice", 10))
Assert.assertEquals(expectedValues, result.toSet)
assertEquals(expectedValues, result.toSet)
}


Expand All @@ -369,7 +370,7 @@ class ApiTest {
(Set(("Cola", 5)), Set()),
(Set(("Juice", 10)), Set(("Apple juice", "Juice"), ("Orange juice", "Juice")))
)
Assert.assertEquals(expectedValues, actualValues)
assertEquals(expectedValues, actualValues)
}

@Test
Expand All @@ -388,7 +389,7 @@ class ApiTest {
.collect()

val expectedValues = Set(2, 3, 4, 5, 7, 8, 9)
Assert.assertEquals(expectedValues, result.toSet)
assertEquals(expectedValues, result.toSet)
}


Expand All @@ -406,7 +407,7 @@ class ApiTest {
.collect()

val expectedValues = Array(1, 2, 3, 4, 5)
Assert.assertArrayEquals(expectedValues, result.toArray)
assertArrayEquals(expectedValues, result.toArray)
}


Expand All @@ -430,9 +431,9 @@ class ApiTest {

print(pageRanks)
// Let's not check absolute numbers but only the relative ordering.
Assert.assertTrue(pageRanks(1) > pageRanks(0))
Assert.assertTrue(pageRanks(0) > pageRanks(2))
Assert.assertTrue(pageRanks(2) > pageRanks(3))
assertTrue(pageRanks(1) > pageRanks(0))
assertTrue(pageRanks(0) > pageRanks(2))
assertTrue(pageRanks(2) > pageRanks(3))
}

@Test
Expand All @@ -452,7 +453,7 @@ class ApiTest {
.reduceByKey(_._1, { case ((kind1, count1), (kind2, count2)) => (kind1, count1 + count2) })
.collect()

Assert.assertEquals(Set(("odd", 2), ("even", 5)), typeCounts.toSet)
assertEquals(Set(("odd", 2), ("even", 5)), typeCounts.toSet)
}

@Test
Expand All @@ -474,7 +475,7 @@ class ApiTest {
.collect()

val expectedValues = Set((42, 100))
Assert.assertEquals(expectedValues, result.toSet)
assertEquals(expectedValues, result.toSet)
}

@Test
Expand All @@ -497,7 +498,7 @@ class ApiTest {
})

val expectedLines = inputValues.map(v => f"${v % .2f}").toSet
Assert.assertEquals(expectedLines, lines)
assertEquals(expectedLines, lines)
}

@Test
Expand Down Expand Up @@ -535,7 +536,7 @@ class ApiTest {
.toSet

val expectedValues = Set("John", "Evelyn")
Assert.assertEquals(expectedValues, result)
assertEquals(expectedValues, result)
}

@Test
Expand Down Expand Up @@ -573,6 +574,6 @@ class ApiTest {
.toSet

val expectedValues = Set("John", "Evelyn")
Assert.assertEquals(expectedValues, result)
assertEquals(expectedValues, result)
}
}
2 changes: 1 addition & 1 deletion ...-java/src/test/scala/org/apache/wayang/api/serialization/OperatorSerializationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.apache.wayang.postgres.Postgres
import org.apache.wayang.postgres.operators.PostgresTableSource
import org.apache.wayang.sqlite3.Sqlite3
import org.apache.wayang.sqlite3.operators.Sqlite3TableSource
import org.junit.Test
import org.junit.jupiter.api.Test

import java.io.{File, PrintWriter}
import java.sql.{Connection, Statement}
Expand Down
59 changes: 30 additions & 29 deletions ...ala-java/src/test/scala/org/apache/wayang/api/serialization/OtherSerializationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import org.apache.wayang.core.platform.Platform
import org.apache.wayang.core.util.ReflectionUtils
import org.apache.wayang.java.Java
import org.apache.wayang.spark.Spark
import org.junit.{Assert, Test}
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.Test

import java.nio.file.{Files, Paths}

Expand All @@ -45,15 +46,15 @@ class OtherSerializationTests extends SerializationTestBase {
try {
val serializedConfiguration = SerializationUtils.serialize(configuration)
val deserializedConfiguration = SerializationUtils.deserialize[Configuration](serializedConfiguration)
Assert.assertEquals(deserializedConfiguration.getStringProperty("spark.master"), "random_master_url_1")
Assert.assertEquals(deserializedConfiguration.getStringProperty("spark.app.name"), "random_app_name_2")
assertEquals(deserializedConfiguration.getStringProperty("spark.master"), "random_master_url_1")
assertEquals(deserializedConfiguration.getStringProperty("spark.app.name"), "random_app_name_2")

val serializedMultiContext = SerializationUtils.serialize(multiContext)
val deserializedMultiContext = SerializationUtils.deserialize[MultiContext](serializedMultiContext)
Assert.assertEquals(deserializedMultiContext.getConfiguration.getStringProperty("spark.master"), "random_master_url_1")
Assert.assertEquals(deserializedMultiContext.getConfiguration.getStringProperty("spark.app.name"), "random_app_name_2")
Assert.assertEquals(deserializedMultiContext.getSink.get.asInstanceOf[MultiContext.TextFileSink].url, "file:///tmp/out11")
Assert.assertArrayEquals(multiContext.getConfiguration.getPlatformProvider.provideAll().toArray, deserializedMultiContext.getConfiguration.getPlatformProvider.provideAll().toArray)
assertEquals(deserializedMultiContext.getConfiguration.getStringProperty("spark.master"), "random_master_url_1")
assertEquals(deserializedMultiContext.getConfiguration.getStringProperty("spark.app.name"), "random_app_name_2")
assertEquals(deserializedMultiContext.getSink.get.asInstanceOf[MultiContext.TextFileSink].url, "file:///tmp/out11")
assertArrayEquals(multiContext.getConfiguration.getPlatformProvider.provideAll().toArray, deserializedMultiContext.getConfiguration.getPlatformProvider.provideAll().toArray)
} catch {
case t: Throwable =>
t.printStackTrace()
Expand All @@ -76,19 +77,19 @@ class OtherSerializationTests extends SerializationTestBase {
try {
val serialized = SerializationUtils.serializeAsString(planBuilder)
val deserialized = SerializationUtils.deserializeFromString[PlanBuilder](serialized)
// SerializationTestBase.log(SerializationUtils.serializeAsString(deserialized), testName.getMethodName + ".log.json")
// SerializationTestBase.log(SerializationUtils.serializeAsString(deserialized), testName + ".log.json")

Assert.assertEquals(
assertEquals(
planBuilder.udfJars,
deserialized.udfJars
)
Assert.assertEquals(
deserialized.wayangContext.asInstanceOf[MultiContext].getConfiguration.getStringProperty("spark.master"),
"master1"
assertEquals(
"master1",
deserialized.wayangContext.asInstanceOf[MultiContext].getConfiguration.getStringProperty("spark.master")
)
Assert.assertEquals(
assertEquals(
"file:///tmp/out11",
deserialized.wayangContext.asInstanceOf[MultiContext].getSink.get.asInstanceOf[MultiContext.TextFileSink].url,
"file:///tmp/out11"
)
}
catch {
Expand Down Expand Up @@ -116,25 +117,25 @@ class OtherSerializationTests extends SerializationTestBase {
try {
val serialized = SerializationUtils.serializeAsString(multiContextPlanBuilder)
val deserialized = SerializationUtils.deserializeFromString[MultiContextPlanBuilder](serialized)
// SerializationTestBase.log(SerializationUtils.serializeAsString(deserialized), testName.getMethodName + ".log.json")
// SerializationTestBase.log(SerializationUtils.serializeAsString(deserialized), testName + ".log.json")

Assert.assertEquals(
assertEquals(
multiContextPlanBuilder.udfJars,
deserialized.udfJars
)
Assert.assertEquals(
assertEquals(
multiContextPlanBuilder.multiContexts(0).getConfiguration.getStringProperty("spark.master"),
"master1"
)
Assert.assertEquals(
assertEquals(
multiContextPlanBuilder.multiContexts(1).getConfiguration.getStringProperty("spark.master"),
"master2"
)
Assert.assertEquals(
assertEquals(
multiContextPlanBuilder.multiContexts(0).getSink.get.asInstanceOf[MultiContext.TextFileSink].url,
"file:///tmp/out11"
)
Assert.assertEquals(
assertEquals(
multiContextPlanBuilder.multiContexts(1).getSink.get.asInstanceOf[MultiContext.ObjectFileSink].url,
"file:///tmp/out12"
)
Expand Down Expand Up @@ -169,7 +170,7 @@ class OtherSerializationTests extends SerializationTestBase {
val operator = TempFileUtils.readFromTempFileFromString[Operator](tempfile)

// Attach an output sink to deserialized plan
val tempFileOut = s"/tmp/${testName.getMethodName}.out"
val tempFileOut = s"/tmp/$testName.out"
val sink = new TextFileSink[AnyRef](s"file://$tempFileOut", classOf[AnyRef])
operator.connectTo(0, sink, 0)

Expand Down Expand Up @@ -226,7 +227,7 @@ class OtherSerializationTests extends SerializationTestBase {
try {
val serialized = SerializationUtils.serialize(Java.platform())
val deserialized = SerializationUtils.deserialize[Platform](serialized)
Assert.assertEquals(deserialized.getClass.getName, Java.platform().getClass.getName)
assertEquals(deserialized.getClass.getName, Java.platform().getClass.getName)
} catch {
case t: Throwable =>
t.printStackTrace()
Expand All @@ -250,10 +251,10 @@ class OtherSerializationTests extends SerializationTestBase {
try {
val serialized = SerializationUtils.serializeAsString(dataQuanta.operator)
val deserialized = SerializationUtils.deserializeFromString[Operator](serialized)
Assert.assertEquals(deserialized.getTargetPlatforms.size(), 2)
assertEquals(deserialized.getTargetPlatforms.size(), 2)
val deserializedPlatformNames = deserialized.getTargetPlatforms.toArray.map(p => p.getClass.getName)
Assert.assertTrue(deserializedPlatformNames.contains(Spark.platform().getClass.getName))
Assert.assertTrue(deserializedPlatformNames.contains(Java.platform().getClass.getName))
assertTrue(deserializedPlatformNames.contains(Spark.platform().getClass.getName))
assertTrue(deserializedPlatformNames.contains(Java.platform().getClass.getName))
} catch {
case t: Throwable =>
t.printStackTrace()
Expand Down Expand Up @@ -282,8 +283,8 @@ class OtherSerializationTests extends SerializationTestBase {
try {
val serialized = SerializationUtils.serializeAsString(dataQuanta.operator)
val deserialized = SerializationUtils.deserializeFromString[Operator](serialized)
Assert.assertEquals(deserialized.getTargetPlatforms.size(), 1)
Assert.assertEquals(deserialized.getTargetPlatforms.toArray.toList(0).getClass.getName, Spark.platform().getClass.getName)
assertEquals(deserialized.getTargetPlatforms.size(), 1)
assertEquals(deserialized.getTargetPlatforms.toArray.toList(0).getClass.getName, Spark.platform().getClass.getName)
} catch {
case t: Throwable =>
t.printStackTrace()
Expand Down Expand Up @@ -326,8 +327,8 @@ class OtherSerializationTests extends SerializationTestBase {
.getFunctionDescriptor
.getLoadProfileEstimator.get().asInstanceOf[NestableLoadProfileEstimator]

Assert.assertEquals(originalLoadProfileEstimator.getConfigurationKeys, deserializedLoadProfileEstimator.getConfigurationKeys)
Assert.assertEquals(originalLoadProfileEstimator.getTemplateKeys, deserializedLoadProfileEstimator.getTemplateKeys)
assertEquals(originalLoadProfileEstimator.getConfigurationKeys, deserializedLoadProfileEstimator.getConfigurationKeys)
assertEquals(originalLoadProfileEstimator.getTemplateKeys, deserializedLoadProfileEstimator.getTemplateKeys)

/*// Print the contents of configuration keys array for both the originalLoadProfileEstimator and the deserializedLoadProfileEstimator
println("originalLoadProfileEstimator.getConfigurationKeys: " + originalLoadProfileEstimator.getConfigurationKeys.mkString(","))
Expand Down
Loading
Loading