Skip to content

Commit 48df1d0

Browse files
strangelookingnerdstrangelookingnerd
committed
Migrate tests to JUnit5
* Migrate annotations and imports * Migrate assertions * Remove public visibility for test classes and methods * Minor code cleanup
1 parent 7784fd1 commit 48df1d0

140 files changed

Lines changed: 1671 additions & 1641 deletions

File tree

Some content is hidden

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

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<jacoco.version>0.8.5</jacoco.version>
125125
<jodatime.version>2.10.6</jodatime.version>
126126
<jsonpath.version>2.4.0</jsonpath.version>
127-
<junit5.version>5.6.1</junit5.version>
127+
<junit5.version>5.12.2</junit5.version>
128128
<mockito.version>3.5.10</mockito.version>
129129
<mockk.version>1.10.0</mockk.version>
130130
<external.platforms.scope>provided</external.platforms.scope>

‎wayang-api/wayang-api-scala-java/src/test/java/org/apache/wayang/api/JavaApiTest.java‎

Lines changed: 57 additions & 56 deletions
Large diffs are not rendered by default.

‎wayang-api/wayang-api-scala-java/src/test/scala/org/apache/wayang/api/ApiTest.scala‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import java.nio.file.{Files, Paths}
2424
import java.sql.{Connection, Statement}
2525
import java.util.function.Consumer
2626

27-
import org.junit.{Assert, Test}
2827
import org.apache.wayang.basic.WayangBasics
2928
import org.apache.wayang.core.api.{Configuration, WayangContext}
3029
import org.apache.wayang.core.function.FunctionDescriptor.ExtendedSerializablePredicate
@@ -35,6 +34,8 @@ import org.apache.wayang.java.operators.JavaMapOperator
3534
import org.apache.wayang.spark.Spark
3635
import org.apache.wayang.sqlite3.Sqlite3
3736
import org.apache.wayang.sqlite3.operators.Sqlite3TableSource
37+
import org.junit.jupiter.api.Assertions._
38+
import org.junit.jupiter.api.Test
3839

3940
/**
4041
* Tests the Wayang API.
@@ -57,7 +58,7 @@ class ApiTest {
5758

5859
// Check the outcome.
5960
val expectedOutputValues = inputValues.map(_ + 2)
60-
Assert.assertArrayEquals(expectedOutputValues, outputValues.toArray)
61+
assertArrayEquals(expectedOutputValues, outputValues.toArray)
6162
}
6263

6364
@Test
@@ -87,7 +88,7 @@ class ApiTest {
8788

8889
// Check the outcome.
8990
val expectedOutputValues = inputValues.map(_ + 2)
90-
Assert.assertArrayEquals(expectedOutputValues, outputValues.toArray)
91+
assertArrayEquals(expectedOutputValues, outputValues.toArray)
9192
}
9293

9394
@Test
@@ -113,7 +114,7 @@ class ApiTest {
113114

114115
// Check the outcome.
115116
val expectedOutputValues = inputValues.map(_ + 2)
116-
Assert.assertArrayEquals(expectedOutputValues, outputValues.toArray)
117+
assertArrayEquals(expectedOutputValues, outputValues.toArray)
117118
}
118119

119120
@Test
@@ -135,7 +136,7 @@ class ApiTest {
135136

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

138-
Assert.assertEquals(expectedWordCounts, wordCounts)
139+
assertEquals(expectedWordCounts, wordCounts)
139140
}
140141

141142
@Test
@@ -157,7 +158,7 @@ class ApiTest {
157158

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

160-
Assert.assertEquals(expectedWordCounts, wordCounts)
161+
assertEquals(expectedWordCounts, wordCounts)
161162
}
162163

163164
@Test
@@ -175,8 +176,8 @@ class ApiTest {
175176
.collect()
176177

177178
// Check the result.
178-
Assert.assertEquals(10, sample.size)
179-
Assert.assertEquals(10, sample.toSet.size)
179+
assertEquals(10, sample.size)
180+
assertEquals(10, sample.toSet.size)
180181
}
181182

182183
@Test
@@ -199,7 +200,7 @@ class ApiTest {
199200
.collect().toSet
200201

201202
val expectedValues = Set(1, 2, 3, 6, 12, 24, 48, 96, 192)
202-
Assert.assertEquals(expectedValues, values)
203+
assertEquals(expectedValues, values)
203204
}
204205

205206
@Test
@@ -222,7 +223,7 @@ class ApiTest {
222223

223224
// initial: 1,2 -> 1st: 2,3 -> 2nd: 6,7 => 3rd: 42,43
224225
val expectedValues = Set(42, 43)
225-
Assert.assertEquals(expectedValues, values)
226+
assertEquals(expectedValues, values)
226227
}
227228

228229
@Test
@@ -256,7 +257,7 @@ class ApiTest {
256257
.collect().toSet
257258

258259
val expectedValues = Set("Hello", "World")
259-
Assert.assertEquals(expectedValues, values)
260+
assertEquals(expectedValues, values)
260261
}
261262

262263
@Test
@@ -280,7 +281,7 @@ class ApiTest {
280281
.collect()
281282

282283
val expectedValues = Set(5, 6)
283-
Assert.assertEquals(expectedValues, result.toSet)
284+
assertEquals(expectedValues, result.toSet)
284285
}
285286

286287
@Test
@@ -304,7 +305,7 @@ class ApiTest {
304305
.collect()
305306

306307
val expectedValues = Set(5)
307-
Assert.assertEquals(expectedValues, result.toSet)
308+
assertEquals(expectedValues, result.toSet)
308309
}
309310

310311
@Test
@@ -324,7 +325,7 @@ class ApiTest {
324325
.collect()
325326

326327
val expectedValues = Set(("Apple juice", 10), ("Tap water", 0), ("Orange juice", 10))
327-
Assert.assertEquals(expectedValues, result.toSet)
328+
assertEquals(expectedValues, result.toSet)
328329
}
329330

330331
@Test
@@ -343,7 +344,7 @@ class ApiTest {
343344
.collect()
344345

345346
val expectedValues = Set(("Apple juice", 10), ("Tap water", 0), ("Orange juice", 10))
346-
Assert.assertEquals(expectedValues, result.toSet)
347+
assertEquals(expectedValues, result.toSet)
347348
}
348349

349350

@@ -369,7 +370,7 @@ class ApiTest {
369370
(Set(("Cola", 5)), Set()),
370371
(Set(("Juice", 10)), Set(("Apple juice", "Juice"), ("Orange juice", "Juice")))
371372
)
372-
Assert.assertEquals(expectedValues, actualValues)
373+
assertEquals(expectedValues, actualValues)
373374
}
374375

375376
@Test
@@ -388,7 +389,7 @@ class ApiTest {
388389
.collect()
389390

390391
val expectedValues = Set(2, 3, 4, 5, 7, 8, 9)
391-
Assert.assertEquals(expectedValues, result.toSet)
392+
assertEquals(expectedValues, result.toSet)
392393
}
393394

394395

@@ -406,7 +407,7 @@ class ApiTest {
406407
.collect()
407408

408409
val expectedValues = Array(1, 2, 3, 4, 5)
409-
Assert.assertArrayEquals(expectedValues, result.toArray)
410+
assertArrayEquals(expectedValues, result.toArray)
410411
}
411412

412413

@@ -430,9 +431,9 @@ class ApiTest {
430431

431432
print(pageRanks)
432433
// Let's not check absolute numbers but only the relative ordering.
433-
Assert.assertTrue(pageRanks(1) > pageRanks(0))
434-
Assert.assertTrue(pageRanks(0) > pageRanks(2))
435-
Assert.assertTrue(pageRanks(2) > pageRanks(3))
434+
assertTrue(pageRanks(1) > pageRanks(0))
435+
assertTrue(pageRanks(0) > pageRanks(2))
436+
assertTrue(pageRanks(2) > pageRanks(3))
436437
}
437438

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

455-
Assert.assertEquals(Set(("odd", 2), ("even", 5)), typeCounts.toSet)
456+
assertEquals(Set(("odd", 2), ("even", 5)), typeCounts.toSet)
456457
}
457458

458459
@Test
@@ -474,7 +475,7 @@ class ApiTest {
474475
.collect()
475476

476477
val expectedValues = Set((42, 100))
477-
Assert.assertEquals(expectedValues, result.toSet)
478+
assertEquals(expectedValues, result.toSet)
478479
}
479480

480481
@Test
@@ -497,7 +498,7 @@ class ApiTest {
497498
})
498499

499500
val expectedLines = inputValues.map(v => f"${v % .2f}").toSet
500-
Assert.assertEquals(expectedLines, lines)
501+
assertEquals(expectedLines, lines)
501502
}
502503

503504
@Test
@@ -535,7 +536,7 @@ class ApiTest {
535536
.toSet
536537

537538
val expectedValues = Set("John", "Evelyn")
538-
Assert.assertEquals(expectedValues, result)
539+
assertEquals(expectedValues, result)
539540
}
540541

541542
@Test
@@ -573,6 +574,6 @@ class ApiTest {
573574
.toSet
574575

575576
val expectedValues = Set("John", "Evelyn")
576-
Assert.assertEquals(expectedValues, result)
577+
assertEquals(expectedValues, result)
577578
}
578579
}

‎wayang-api/wayang-api-scala-java/src/test/scala/org/apache/wayang/api/serialization/OperatorSerializationTests.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.apache.wayang.postgres.Postgres
2626
import org.apache.wayang.postgres.operators.PostgresTableSource
2727
import org.apache.wayang.sqlite3.Sqlite3
2828
import org.apache.wayang.sqlite3.operators.Sqlite3TableSource
29-
import org.junit.Test
29+
import org.junit.jupiter.api.Test
3030

3131
import java.io.{File, PrintWriter}
3232
import java.sql.{Connection, Statement}

‎wayang-api/wayang-api-scala-java/src/test/scala/org/apache/wayang/api/serialization/OtherSerializationTests.scala‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import org.apache.wayang.core.platform.Platform
2828
import org.apache.wayang.core.util.ReflectionUtils
2929
import org.apache.wayang.java.Java
3030
import org.apache.wayang.spark.Spark
31-
import org.junit.{Assert, Test}
31+
import org.junit.jupiter.api.Assertions._
32+
import org.junit.jupiter.api.Test
3233

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

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

5152
val serializedMultiContext = SerializationUtils.serialize(multiContext)
5253
val deserializedMultiContext = SerializationUtils.deserialize[MultiContext](serializedMultiContext)
53-
Assert.assertEquals(deserializedMultiContext.getConfiguration.getStringProperty("spark.master"), "random_master_url_1")
54-
Assert.assertEquals(deserializedMultiContext.getConfiguration.getStringProperty("spark.app.name"), "random_app_name_2")
55-
Assert.assertEquals(deserializedMultiContext.getSink.get.asInstanceOf[MultiContext.TextFileSink].url, "file:///tmp/out11")
56-
Assert.assertArrayEquals(multiContext.getConfiguration.getPlatformProvider.provideAll().toArray, deserializedMultiContext.getConfiguration.getPlatformProvider.provideAll().toArray)
54+
assertEquals(deserializedMultiContext.getConfiguration.getStringProperty("spark.master"), "random_master_url_1")
55+
assertEquals(deserializedMultiContext.getConfiguration.getStringProperty("spark.app.name"), "random_app_name_2")
56+
assertEquals(deserializedMultiContext.getSink.get.asInstanceOf[MultiContext.TextFileSink].url, "file:///tmp/out11")
57+
assertArrayEquals(multiContext.getConfiguration.getPlatformProvider.provideAll().toArray, deserializedMultiContext.getConfiguration.getPlatformProvider.provideAll().toArray)
5758
} catch {
5859
case t: Throwable =>
5960
t.printStackTrace()
@@ -78,15 +79,15 @@ class OtherSerializationTests extends SerializationTestBase {
7879
val deserialized = SerializationUtils.deserializeFromString[PlanBuilder](serialized)
7980
// SerializationTestBase.log(SerializationUtils.serializeAsString(deserialized), testName.getMethodName + ".log.json")
8081

81-
Assert.assertEquals(
82+
assertEquals(
8283
planBuilder.udfJars,
8384
deserialized.udfJars
8485
)
85-
Assert.assertEquals(
86+
assertEquals(
8687
deserialized.wayangContext.asInstanceOf[MultiContext].getConfiguration.getStringProperty("spark.master"),
8788
"master1"
8889
)
89-
Assert.assertEquals(
90+
assertEquals(
9091
deserialized.wayangContext.asInstanceOf[MultiContext].getSink.get.asInstanceOf[MultiContext.TextFileSink].url,
9192
"file:///tmp/out11"
9293
)
@@ -118,23 +119,23 @@ class OtherSerializationTests extends SerializationTestBase {
118119
val deserialized = SerializationUtils.deserializeFromString[MultiContextPlanBuilder](serialized)
119120
// SerializationTestBase.log(SerializationUtils.serializeAsString(deserialized), testName.getMethodName + ".log.json")
120121

121-
Assert.assertEquals(
122+
assertEquals(
122123
multiContextPlanBuilder.udfJars,
123124
deserialized.udfJars
124125
)
125-
Assert.assertEquals(
126+
assertEquals(
126127
multiContextPlanBuilder.multiContexts(0).getConfiguration.getStringProperty("spark.master"),
127128
"master1"
128129
)
129-
Assert.assertEquals(
130+
assertEquals(
130131
multiContextPlanBuilder.multiContexts(1).getConfiguration.getStringProperty("spark.master"),
131132
"master2"
132133
)
133-
Assert.assertEquals(
134+
assertEquals(
134135
multiContextPlanBuilder.multiContexts(0).getSink.get.asInstanceOf[MultiContext.TextFileSink].url,
135136
"file:///tmp/out11"
136137
)
137-
Assert.assertEquals(
138+
assertEquals(
138139
multiContextPlanBuilder.multiContexts(1).getSink.get.asInstanceOf[MultiContext.ObjectFileSink].url,
139140
"file:///tmp/out12"
140141
)
@@ -226,7 +227,7 @@ class OtherSerializationTests extends SerializationTestBase {
226227
try {
227228
val serialized = SerializationUtils.serialize(Java.platform())
228229
val deserialized = SerializationUtils.deserialize[Platform](serialized)
229-
Assert.assertEquals(deserialized.getClass.getName, Java.platform().getClass.getName)
230+
assertEquals(deserialized.getClass.getName, Java.platform().getClass.getName)
230231
} catch {
231232
case t: Throwable =>
232233
t.printStackTrace()
@@ -250,10 +251,10 @@ class OtherSerializationTests extends SerializationTestBase {
250251
try {
251252
val serialized = SerializationUtils.serializeAsString(dataQuanta.operator)
252253
val deserialized = SerializationUtils.deserializeFromString[Operator](serialized)
253-
Assert.assertEquals(deserialized.getTargetPlatforms.size(), 2)
254+
assertEquals(deserialized.getTargetPlatforms.size(), 2)
254255
val deserializedPlatformNames = deserialized.getTargetPlatforms.toArray.map(p => p.getClass.getName)
255-
Assert.assertTrue(deserializedPlatformNames.contains(Spark.platform().getClass.getName))
256-
Assert.assertTrue(deserializedPlatformNames.contains(Java.platform().getClass.getName))
256+
assertTrue(deserializedPlatformNames.contains(Spark.platform().getClass.getName))
257+
assertTrue(deserializedPlatformNames.contains(Java.platform().getClass.getName))
257258
} catch {
258259
case t: Throwable =>
259260
t.printStackTrace()
@@ -282,8 +283,8 @@ class OtherSerializationTests extends SerializationTestBase {
282283
try {
283284
val serialized = SerializationUtils.serializeAsString(dataQuanta.operator)
284285
val deserialized = SerializationUtils.deserializeFromString[Operator](serialized)
285-
Assert.assertEquals(deserialized.getTargetPlatforms.size(), 1)
286-
Assert.assertEquals(deserialized.getTargetPlatforms.toArray.toList(0).getClass.getName, Spark.platform().getClass.getName)
286+
assertEquals(deserialized.getTargetPlatforms.size(), 1)
287+
assertEquals(deserialized.getTargetPlatforms.toArray.toList(0).getClass.getName, Spark.platform().getClass.getName)
287288
} catch {
288289
case t: Throwable =>
289290
t.printStackTrace()
@@ -326,8 +327,8 @@ class OtherSerializationTests extends SerializationTestBase {
326327
.getFunctionDescriptor
327328
.getLoadProfileEstimator.get().asInstanceOf[NestableLoadProfileEstimator]
328329

329-
Assert.assertEquals(originalLoadProfileEstimator.getConfigurationKeys, deserializedLoadProfileEstimator.getConfigurationKeys)
330-
Assert.assertEquals(originalLoadProfileEstimator.getTemplateKeys, deserializedLoadProfileEstimator.getTemplateKeys)
330+
assertEquals(originalLoadProfileEstimator.getConfigurationKeys, deserializedLoadProfileEstimator.getConfigurationKeys)
331+
assertEquals(originalLoadProfileEstimator.getTemplateKeys, deserializedLoadProfileEstimator.getTemplateKeys)
331332

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

0 commit comments

Comments
 (0)