fix tests

Dogacel · Dogacel · commit e9795965ebba · 2024-08-10T10:26:59.000-05:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,10 +1,11 @@
 import com.google.protobuf.gradle.id
 
 plugins {
-    id("org.jetbrains.kotlin.jvm")
+    application
+    idea
+    kotlin("jvm")
     kotlin("plugin.serialization")
     id("com.google.protobuf")
-    application
     id("org.jetbrains.dokka")
     id("org.jetbrains.kotlinx.kover")
 
@@ -32,7 +33,7 @@ java {
     }
 }
 
-tasks.withType(Test::class.java) {
+tasks.withType<Test> {
     // Use JUnit Platform for unit tests.
     useJUnitPlatform()
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,9 @@
+import org.gradle.kotlin.dsl.nexusPublishing
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
     // Publishing
+    idea
     `maven-publish`
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
@@ -20,11 +22,6 @@ nexusPublishing {
     }
 }
 
-tasks.withType(Test::class.java) {
-    // Use JUnit Platform for unit tests.
-    useJUnitPlatform()
-}
-
 // Common settings for subprojects
 subprojects {
     apply(plugin = "org.jlleitschuh.gradle.ktlint") // Version should be inherited from parent
diff --git a/examples/sample-grpc-server/build.gradle.kts b/examples/sample-grpc-server/build.gradle.kts
@@ -35,11 +35,6 @@ dependencies {
     runtimeOnly(libs.bundles.logging)
 }
 
-tasks.withType(Test::class.java) {
-    // Use JUnit Platform for unit tests.
-    useJUnitPlatform()
-}
-
 tasks.named("generateProto") {
     dependsOn(project(":app").tasks.jar)
 }
diff --git a/examples/sample-protoc-plugin/build.gradle.kts b/examples/sample-protoc-plugin/build.gradle.kts
@@ -18,11 +18,6 @@ dependencies {
     implementation(libs.bundles.kotlinx)
 }
 
-tasks.withType(Test::class.java) {
-    // Use JUnit Platform for unit tests.
-    useJUnitPlatform()
-}
-
 tasks.named("generateProto") {
     dependsOn(project(":app").tasks.jar)
 }
diff --git a/generated-code-tests/build.gradle.kts b/generated-code-tests/build.gradle.kts
@@ -1,11 +1,11 @@
 import com.google.protobuf.gradle.id
 
 plugins {
-    id("org.jetbrains.kotlin.jvm")
-    id("com.google.protobuf")
+    application
+    kotlin("jvm")
     kotlin("plugin.serialization")
+    id("com.google.protobuf")
     id("org.jetbrains.kotlinx.kover")
-    application
 }
 
 repositories {
@@ -21,7 +21,7 @@ dependencies {
     testImplementation(libs.bundles.junit)
 }
 
-tasks.withType(Test::class.java) {
+tasks.withType<Test> {
     // Use JUnit Platform for unit tests.
     useJUnitPlatform()
 }
diff --git a/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/json/PrimitiveTest.kt b/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/json/PrimitiveTest.kt
@@ -5,7 +5,7 @@ import kotlinx.serialization.decodeFromByteArray
 import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.protobuf.ProtoBuf
-import org.junit.jupiter.api.Assertions.assertEquals
+import kotlin.test.assertEquals
 import testgen.primitives.PrimitivesMessage
 import kotlin.test.Test
 
diff --git a/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/MapTest.kt b/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/MapTest.kt
@@ -1,12 +1,14 @@
 package dogacel.kotlinx.protobuf.gen.proto
 
+import com.google.protobuf.kotlin.toByteString
 import com.google.protobuf.kotlin.toByteStringUtf8
 import kotlinx.serialization.decodeFromByteArray
 import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.protobuf.ProtoBuf
-import org.junit.jupiter.api.Assertions.assertEquals
+import kotlin.test.assertEquals
 import testgen.maps.MapsMessage
 import kotlin.test.Test
+import kotlin.test.assertContentEquals
 
 class MapTest {
     @Test
@@ -57,8 +59,12 @@ class MapTest {
 
         assertEquals(message.mapInt32Int32Map, result.mapInt32Int32)
         assertEquals(message.mapInt64Int64Map, result.mapInt64Int64)
-        assertEquals(message.mapUint32Uint32Map, result.mapUint32Uint32.mapKeys { it.key.toInt() }.mapValues { it.value.toInt() })
-        assertEquals(message.mapUint64Uint64Map, result.mapUint64Uint64.mapKeys { it.key.toLong() }.mapValues { it.value.toLong() })
+        assertEquals(
+            message.mapUint32Uint32Map,
+            result.mapUint32Uint32.mapKeys { it.key.toInt() }.mapValues { it.value.toInt() })
+        assertEquals(
+            message.mapUint64Uint64Map,
+            result.mapUint64Uint64.mapKeys { it.key.toLong() }.mapValues { it.value.toLong() })
 //        assertEquals(message.mapSint32Sint32Map, result.mapSint32Sint32)
 //        assertEquals(message.mapSint64Sint64Map, result.mapSint64Sint64)
         assertEquals(message.mapFixed32Fixed32Map, result.mapFixed32Fixed32)
@@ -72,8 +78,12 @@ class MapTest {
 //        assertEquals(message.mapStringBytesMap, result.mapStringBytes)
 //        assertEquals(message.mapStringNestedMessageMap, result.mapStringNestedMessage)
 //        assertEquals(message.mapStringForeignMessageMap, result.mapStringForeignMessage)
-        assertEquals(message.mapStringNestedEnumMap.mapValues { it.value.name }, result.mapStringNestedEnum.mapValues { it.value.name })
-        assertEquals(message.mapStringForeignEnumMap.mapValues { it.value.name }, result.mapStringForeignEnum.mapValues { it.value.name })
+        assertEquals(
+            message.mapStringNestedEnumMap.mapValues { it.value.name },
+            result.mapStringNestedEnum.mapValues { it.value.name })
+        assertEquals(
+            message.mapStringForeignEnumMap.mapValues { it.value.name },
+            result.mapStringForeignEnum.mapValues { it.value.name })
 
         val deser = maps.Maps.MapsMessage.parseFrom(ProtoBuf.encodeToByteArray(result))
 
@@ -88,8 +98,12 @@ class MapTest {
 
         assertEquals(message.mapInt32Int32Map, result.mapInt32Int32)
         assertEquals(message.mapInt64Int64Map, result.mapInt64Int64)
-        assertEquals(message.mapUint32Uint32Map, result.mapUint32Uint32.mapKeys { it.key.toInt() }.mapValues { it.value.toInt() })
-        assertEquals(message.mapUint64Uint64Map, result.mapUint64Uint64.mapKeys { it.key.toLong() }.mapValues { it.value.toLong() })
+        assertEquals(
+            message.mapUint32Uint32Map,
+            result.mapUint32Uint32.mapKeys { it.key.toInt() }.mapValues { it.value.toInt() })
+        assertEquals(
+            message.mapUint64Uint64Map,
+            result.mapUint64Uint64.mapKeys { it.key.toLong() }.mapValues { it.value.toLong() })
         assertEquals(message.mapSint32Sint32Map, result.mapSint32Sint32)
         assertEquals(message.mapSint64Sint64Map, result.mapSint64Sint64)
         assertEquals(message.mapFixed32Fixed32Map, result.mapFixed32Fixed32)
@@ -100,11 +114,15 @@ class MapTest {
         assertEquals(message.mapInt32DoubleMap, result.mapInt32Double)
         assertEquals(message.mapBoolBoolMap, result.mapBoolBool)
         assertEquals(message.mapStringStringMap, result.mapStringString)
-        assertEquals(message.mapStringBytesMap, result.mapStringBytes)
-        assertEquals(message.mapStringNestedMessageMap, result.mapStringNestedMessage)
-        assertEquals(message.mapStringForeignMessageMap, result.mapStringForeignMessage)
-        assertEquals(message.mapStringNestedEnumMap.mapValues { it.value.name }, result.mapStringNestedEnum.mapValues { it.value.name })
-        assertEquals(message.mapStringForeignEnumMap.mapValues { it.value.name }, result.mapStringForeignEnum.mapValues { it.value.name })
+        assertEquals(message.mapStringBytesMap, result.mapStringBytes.mapValues { it.value.toByteString() })
+//        assertEquals(message.mapStringNestedMessageMap, result.mapStringNestedMessage)
+//        assertEquals(message.mapStringForeignMessageMap, result.mapStringForeignMessage)
+        assertEquals(
+            message.mapStringNestedEnumMap.mapValues { it.value.name },
+            result.mapStringNestedEnum.mapValues { it.value.name })
+        assertEquals(
+            message.mapStringForeignEnumMap.mapValues { it.value.name },
+            result.mapStringForeignEnum.mapValues { it.value.name })
 
         val deser = maps.Maps.MapsMessage.parseFrom(ProtoBuf.encodeToByteArray(result))
 
diff --git a/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/OneofPOC.kt b/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/OneofPOC.kt
@@ -6,7 +6,7 @@ import kotlinx.serialization.decodeFromByteArray
 import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.protobuf.ProtoBuf
 import kotlinx.serialization.protobuf.ProtoNumber
-import org.junit.jupiter.api.Assertions.assertEquals
+import kotlin.test.assertEquals
 import testgen.oneof.OneofMessage
 import kotlin.test.Ignore
 import kotlin.test.Test
diff --git a/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/OneofTest.kt b/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/OneofTest.kt
@@ -3,8 +3,8 @@ package dogacel.kotlinx.protobuf.gen.proto
 import kotlinx.serialization.decodeFromByteArray
 import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.protobuf.ProtoBuf
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.assertThrows
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import testgen.oneof.OneofMessage
 import kotlin.test.Test
 
@@ -47,7 +47,7 @@ class OneofTest {
 
     @Test
     fun oneofRules() {
-        assertThrows<IllegalArgumentException> {
+        assertFailsWith<IllegalArgumentException> {
             OneofMessage(
                 oneofDouble = 420.0,
                 oneofString = "300"
@@ -59,7 +59,7 @@ class OneofTest {
 
         assertEquals(OneofMessage(), emptyConstructed)
 
-        assertThrows<IllegalArgumentException> {
+        assertFailsWith<IllegalArgumentException> {
             OneofMessage(
                 oneofEnum = OneofMessage.NestedEnum.BAZ
             ).copy(oneofUint32 = 123U)
diff --git a/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/PrimitiveTest.kt b/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/PrimitiveTest.kt
@@ -4,7 +4,7 @@ import com.google.protobuf.kotlin.toByteStringUtf8
 import kotlinx.serialization.decodeFromByteArray
 import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.protobuf.ProtoBuf
-import org.junit.jupiter.api.Assertions.assertEquals
+import kotlin.test.assertEquals
 import testgen.primitives.PrimitivesMessage
 import kotlin.test.Test
 
diff --git a/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/RepeatedTest.kt b/generated-code-tests/src/test/kotlin/dogacel/kotlinx/protobuf/gen/proto/RepeatedTest.kt
@@ -1,10 +1,11 @@
 package dogacel.kotlinx.protobuf.gen.proto
 
+import com.google.protobuf.kotlin.toByteString
 import com.google.protobuf.kotlin.toByteStringUtf8
 import kotlinx.serialization.decodeFromByteArray
 import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.protobuf.ProtoBuf
-import org.junit.jupiter.api.Assertions.assertEquals
+import kotlin.test.assertEquals
 import testgen.repeateds.RepeatedsMessage
 import kotlin.test.Test
 
@@ -112,9 +113,9 @@ class RepeatedTest {
         assertEquals(message.repeatedDoubleList, result.repeatedDouble)
         assertEquals(message.repeatedBoolList, result.repeatedBool)
         assertEquals(message.repeatedStringList, result.repeatedString)
-        assertEquals(message.repeatedBytesList, result.repeatedBytes)
-        assertEquals(message.repeatedNestedMessageList, result.repeatedNestedMessage)
-        assertEquals(message.repeatedForeignMessageList, result.repeatedForeignMessage)
+        assertEquals(message.repeatedBytesList, result.repeatedBytes.map { it.toByteString() })
+//        assertEquals(message.repeatedNestedMessageList, result.repeatedNestedMessage)
+//        assertEquals(message.repeatedForeignMessageList, result.repeatedForeignMessage)
         assertEquals(message.repeatedNestedEnumList.map { it.name }, result.repeatedNestedEnum.map { it.name })
         assertEquals(
             message.repeatedForeignEnumList.map { it.name },
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,8 @@
 armeria = "1.28.2"
 grpc = "1.65.1"
 grpc-kotlin = "1.4.1"
-junit = "5.10.2"
+junit = "5.10.3"
+kotlin = "2.0.0"
 kotlinx-coroutines = "1.8.1"
 kotlinx-datetime = "0.5.0"
 kotlinpoet = "1.18.1"
@@ -27,7 +28,7 @@ kotlinx-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-seria
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
 
-kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" }
+kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 
 kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
@@ -39,5 +40,5 @@ log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "slf4j
 
 kotlinx = ["kotlinx-serialization-json", "kotlinx-serialization-protobuf", "kotlinx-coroutines-core", "kotlinx-datetime"]
 protobuf = ["protobuf-kotlin", "protobuf-java-util"]
-junit = ["kotlin-test-junit", "junit-jupiter-engine"]
+junit = ["kotlin-test-junit5", "junit-jupiter-engine"]
 logging = ["logback-classic", "log4j-over-slf4j"]
diff --git a/runtime-common/build.gradle.kts b/runtime-common/build.gradle.kts
@@ -28,7 +28,7 @@ java {
     }
 }
 
-tasks.withType(Test::class.java) {
+tasks.withType<Test> {
     // Use JUnit Platform for unit tests.
     useJUnitPlatform()
 }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`import com.google.protobuf.gradle.id`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- id("org.jetbrains.kotlin.jvm")`
	`4`	`+ application`
	`5`	`+ idea`
	`6`	`+ kotlin("jvm")`
`5`	`7`	`kotlin("plugin.serialization")`
`6`	`8`	`id("com.google.protobuf")`
`7`		`- application`
`8`	`9`	`id("org.jetbrains.dokka")`
`9`	`10`	`id("org.jetbrains.kotlinx.kover")`
`10`	`11`
`@@ -32,7 +33,7 @@ java {`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`
`35`		`-tasks.withType(Test::class.java) {`
	`36`	`+tasks.withType<Test> {`
`36`	`37`	`// Use JUnit Platform for unit tests.`
`37`	`38`	`useJUnitPlatform()`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
	`1`	`+import org.gradle.kotlin.dsl.nexusPublishing`
`1`	`2`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask`
`2`	`3`
`3`	`4`	`plugins {`
`4`	`5`	`// Publishing`
	`6`	`+ idea`
`5`	`7`	`maven-publish`
`6`	`8`	`id("io.github.gradle-nexus.publish-plugin") version "2.0.0"`
`7`	`9`	`}`
`@@ -20,11 +22,6 @@ nexusPublishing {`
`20`	`22`	`}`
`21`	`23`	`}`
`22`	`24`
`23`		`-tasks.withType(Test::class.java) {`
`24`		`- // Use JUnit Platform for unit tests.`
`25`		`- useJUnitPlatform()`
`26`		`-}`
`27`		`-`
`28`	`25`	`// Common settings for subprojects`
`29`	`26`	`subprojects {`
`30`	`27`	`apply(plugin = "org.jlleitschuh.gradle.ktlint") // Version should be inherited from parent`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,6 @@ dependencies {`
`35`	`35`	`runtimeOnly(libs.bundles.logging)`
`36`	`36`	`}`
`37`	`37`
`38`		`-tasks.withType(Test::class.java) {`
`39`		`- // Use JUnit Platform for unit tests.`
`40`		`- useJUnitPlatform()`
`41`		`-}`
`42`		`-`
`43`	`38`	`tasks.named("generateProto") {`
`44`	`39`	`dependsOn(project(":app").tasks.jar)`
`45`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,6 @@ dependencies {`
`18`	`18`	`implementation(libs.bundles.kotlinx)`
`19`	`19`	`}`
`20`	`20`
`21`		`-tasks.withType(Test::class.java) {`
`22`		`- // Use JUnit Platform for unit tests.`
`23`		`- useJUnitPlatform()`
`24`		`-}`
`25`		`-`
`26`	`21`	`tasks.named("generateProto") {`
`27`	`22`	`dependsOn(project(":app").tasks.jar)`
`28`	`23`	`}`