grpc: Add test to check if the service and client actually use the package option for the service name.

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

Author: Jozott00

grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/test/proto/GrpcProtoTest.kt

@@ -16,13 +16,13 @@ abstract class GrpcProtoTest {
 
     abstract fun RpcServer.registerServices()
 
-    protected fun runGrpcTest(test: suspend (GrpcClient) -> Unit, ) = runTest {
+    protected fun runGrpcTest(test: suspend (GrpcClient) -> Unit) = runTest {
         serverMutex.withLock {
-            val grpcClient = GrpcClient("localhost", 8080) {
+            val grpcClient = GrpcClient("localhost", PORT) {
                 usePlaintext()
             }
 
-            val grpcServer = GrpcServer(8080, builder = {
+            val grpcServer = GrpcServer(PORT, builder = {
                 registerServices()
             })
 
@@ -34,4 +34,8 @@ abstract class GrpcProtoTest {
             grpcClient.awaitTermination()
         }
     }
+
+    companion object {
+        const val PORT = 8080
+    }
 }

grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/test/proto/JavaPackageOptionTest.kt

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.rpc.grpc.test.proto
+
+import com.google.protobuf.kotlin.Empty
+import com.google.protobuf.kotlin.EmptyInternal
+import com.google.protobuf.kotlin.invoke
+import kotlinx.rpc.RpcServer
+import kotlinx.rpc.grpc.ManagedChannelBuilder
+import kotlinx.rpc.grpc.buildChannel
+import kotlinx.rpc.grpc.internal.MethodType
+import kotlinx.rpc.grpc.internal.methodDescriptor
+import kotlinx.rpc.grpc.internal.unaryRpc
+import kotlinx.rpc.grpc.test.withJavaPkg.TheService
+import kotlinx.rpc.registerService
+import kotlinx.rpc.withService
+import kotlin.test.Test
+
+class TheServiceImpl : TheService {
+    override suspend fun TheMethod(message: Empty): Empty {
+        return Empty {}
+    }
+}
+
+/**
+ * Tests proto service with java_package that differs from the `package` name.
+ * While the generated Kotlin sources should be generated in the java_package,
+ * the service name must use the `package` name.
+ */
+class JavaPackageOptionTest : GrpcProtoTest() {
+
+    /**
+     * Tests that the generated service descriptor uses the `package` name.
+     */
+    @Test
+    fun testJavaPackageOptionRaw() = runGrpcTest { _ ->
+        val channel = ManagedChannelBuilder("localhost", PORT)
+            .usePlaintext()
+            .buildChannel()
+
+        val descriptor = methodDescriptor(
+            fullMethodName = "protopackage.TheService/TheMethod",
+            requestCodec = EmptyInternal.CODEC,
+            responseCodec = EmptyInternal.CODEC,
+            type = MethodType.UNARY,
+            schemaDescriptor = Unit,
+            idempotent = true,
+            safe = true,
+            sampledToLocalTracing = true,
+        )
+
+        unaryRpc(channel.platformApi, descriptor, Empty {})
+
+        // just reach this without an error
+    }
+
+    /**
+     * Tests that the generated client uses the `package` name to call the service.
+     */
+    @Test
+    fun testJavaPackageOptionStub() = runGrpcTest { client ->
+        val service = client.withService<TheService>()
+        service.TheMethod(Empty {})
+
+        // just reach this without an error
+    }
+
+    override fun RpcServer.registerServices() {
+        registerService<TheService> { TheServiceImpl() }
+    }
+}

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

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+import "google/protobuf/empty.proto";
+
+// the package the service interface should be written to
+option java_package = "kotlinx.rpc.grpc.test.withJavaPkg";
+
+// the proto package used for the service's full name
+package protopackage;
+
+service TheService {
+  rpc TheMethod(google.protobuf.Empty) returns (google.protobuf.Empty) {};
+}