grpc-pb: Add test for enum in oneOf

Signed-off-by: Johannes Zottele <[email protected]>

Author: Jozott00

grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/pb/ProtosTest.kt

@@ -141,26 +141,40 @@ class ProtosTest {
 
     @Test
     fun testOneOf() {
-        val msg1 = OneOfMsg {
-            field = OneOfMsg.Field.Sint(23)
+        run {
+            val msg = OneOfMsg {
+                field = OneOfMsg.Field.Sint(23)
+            }
+            val decoded = encodeDecode(msg, OneOfMsgInternal.CODEC)
+            assertEquals(OneOfMsg.Field.Sint(23), decoded.field)
+        }
+
+        run {
+            val msg = OneOfMsg {
+                field = OneOfMsg.Field.Fixed(21u)
+            }
+            val decoded = encodeDecode(msg, OneOfMsgInternal.CODEC)
+            assertEquals(OneOfMsg.Field.Fixed(21u), decoded.field)
         }
-        val decoded1 = encodeDecode(msg1, OneOfMsgInternal.CODEC)
-        assertEquals(OneOfMsg.Field.Sint(23), decoded1.field)
 
-        val msg2 = OneOfMsg {
-            field = OneOfMsg.Field.Fixed(21u)
+        run {
+            val msg = OneOfMsg {
+                field = OneOfMsg.Field.Other(Other { arg2 = "test" })
+            }
+            val decoded = encodeDecode(msg, OneOfMsgInternal.CODEC)
+            assertIs<OneOfMsg.Field.Other>(decoded.field)
+            assertNull((decoded.field as OneOfMsg.Field.Other).value.arg1)
+            assertEquals("test", (decoded.field as OneOfMsg.Field.Other).value.arg2)
+            assertNull((decoded.field as OneOfMsg.Field.Other).value.arg3)
         }
-        val decoded2 = encodeDecode(msg2, OneOfMsgInternal.CODEC)
-        assertEquals(OneOfMsg.Field.Fixed(21u), decoded2.field)
 
-        val msg3 = OneOfMsg {
-            field = OneOfMsg.Field.Other(Other { arg2 = "test" })
+        run {
+            val msg = OneOfMsg {
+                field = OneOfMsg.Field.Enum(MyEnum.ONE_SECOND)
+            }
+            val decoded = encodeDecode(msg, OneOfMsgInternal.CODEC)
+            assertEquals(MyEnum.ONE, (decoded.field as OneOfMsg.Field.Enum).value)
         }
-        val decoded3 = encodeDecode(msg3, OneOfMsgInternal.CODEC)
-        assertIs<OneOfMsg.Field.Other>(decoded3.field)
-        assertNull((decoded3.field as OneOfMsg.Field.Other).value.arg1)
-        assertEquals("test", (decoded3.field as OneOfMsg.Field.Other).value.arg2)
-        assertNull((decoded3.field as OneOfMsg.Field.Other).value.arg3)
     }
 
     @Test

grpc/grpc-core/src/commonTest/proto/oneof.proto

@@ -1,9 +1,11 @@
 import "sub_message.proto";
+import "enum.proto";
 
 message OneOfMsg {
   oneof field {
     int32 sint = 2;
     fixed64 fixed = 3;
     test.submsg.Other other = 4;
+    kotlinx.rpc.grpc.test.MyEnum enum = 5;
   }
 }

protoc-gen/src/main/kotlin/kotlinx/rpc/protobuf/ModelToKotlinCommonGenerator.kt

@@ -220,8 +220,6 @@ class ModelToKotlinCommonGenerator(
 
     private fun CodeGenerator.generateCodecObject(declaration: MessageDeclaration) {
         val msgFqName = declaration.name.safeFullName()
-        val downCastErrorStr =
-            "\${value::class.simpleName} implements ${msgFqName}, which is prohibited."
         val sourceFqName = "kotlinx.io.Source"
         val bufferFqName = "kotlinx.io.Buffer"
         scope("val CODEC = object : kotlinx.rpc.grpc.internal.MessageCodec<$msgFqName>") {