fix: fix tests using wrong Pub/Sub func name (GoogleCloudPlatform#7186)

Ace Nassri · averikitsch · web-flow · commit e5c1d3a34353 · 2022-06-16T11:25:03.000-07:00
* fix: fix tests using wrong Pub/Sub func name

* Rename Kotlin sample, for consistency w/ other langs

* Bash typo

* Update build_cloud_functions.sh

Co-authored-by: Averi Kitsch &lt;akitsch@google.com&gt;
diff --git a/.kokoro/tests/build_cloud_functions.sh b/.kokoro/tests/build_cloud_functions.sh
@@ -42,6 +42,17 @@ export FUNCTIONS_GCS_FN_NAME="gcs-${SUFFIX}"
 # Set identity token (required for functions without --allow-unauthenticated)
 export FUNCTIONS_IDENTITY_TOKEN=$(gcloud auth print-identity-token)
 
+# Identify function language
+# (Currently only applicable for Pub/Sub functions)
+export LANGUAGE="" # Java = empty string
+if [[ "$file" == *"scala"* ]]; then
+  export LANGUAGE="Scala"
+elif [[ "$file" == *"groovy"* ]]; then
+  export LANGUAGE="Groovy"
+elif [[ "$file" == *"kotlin"* ]]; then
+  export LANGUAGE="Kotlin"
+fi
+
 # Deploy functions
 set -x
 
@@ -57,7 +68,7 @@ elif [[ "$file" == *"hello-pubsub"* ]]; then
   gcloud functions deploy $FUNCTIONS_PUBSUB_FN_NAME \
     --region $FUNCTIONS_REGION \
     --runtime $FUNCTIONS_JAVA_RUNTIME \
-    --entry-point "functions.HelloPubSub" \
+    --entry-point "functions.${LANGUAGE}HelloPubSub" \
     --trigger-topic $FUNCTIONS_SYSTEM_TEST_TOPIC
 elif [[ "$file" == *"hello-gcs"* ]]; then
   echo "Deploying function HelloGcs to: ${FUNCTIONS_GCS_FN_NAME}"
diff --git a/functions/helloworld/kotlin-hello-pubsub/src/main/kotlin/functions/KotlinHelloBackground.kt b/functions/helloworld/kotlin-hello-pubsub/src/main/kotlin/functions/KotlinHelloBackground.kt
@@ -24,7 +24,7 @@ import java.util.Base64
 import java.util.logging.Logger
 
 
-class HelloPubSub : BackgroundFunction<Message> {
+class KotlinHelloPubSub : BackgroundFunction<Message> {
     override fun accept(message: Message, context: Context) {
         // name's default value is "world"
         var name = "world"
@@ -38,7 +38,7 @@ class HelloPubSub : BackgroundFunction<Message> {
     }
 
     companion object {
-        private val LOGGER = Logger.getLogger(HelloPubSub::class.java.name)
+        private val LOGGER = Logger.getLogger(KotlinHelloPubSub::class.java.name)
     }
 }
 // [END functions_helloworld_pubsub]
diff --git a/functions/helloworld/kotlin-hello-pubsub/src/test/java/functions/KotlinHelloPubSubTest.java b/functions/helloworld/kotlin-hello-pubsub/src/test/java/functions/KotlinHelloPubSubTest.java
@@ -33,7 +33,7 @@
 @RunWith(JUnit4.class)
 public class KotlinHelloPubSubTest {
   private static final Logger logger = Logger.getLogger(
-      HelloPubSub.class.getName());
+      KotlinHelloPubSub.class.getName());
   private static final TestLogHandler LOG_HANDLER = new TestLogHandler();
 
   @BeforeClass
@@ -52,15 +52,15 @@ public void functionsHelloworldPubSubKotlin_shouldPrintName() throws Exception {
     pubSubMessage.setData(Base64.getEncoder().encodeToString(
         "John".getBytes(StandardCharsets.UTF_8)));
 
-    new HelloPubSub().accept(pubSubMessage, new MockContext());
+    new KotlinHelloPubSub().accept(pubSubMessage, new MockContext());
 
     String message = LOG_HANDLER.getStoredLogRecords().get(0).getMessage();
     assertThat("Hello John!").isEqualTo(message);
   }
 
   @Test
   public void functionsHelloworldPubSubKotlin_shouldPrintHelloWorld() throws Exception {
-    new HelloPubSub().accept(new Message(), new MockContext());
+    new KotlinHelloPubSub().accept(new Message(), new MockContext());
 
     String message = LOG_HANDLER.getStoredLogRecords().get(0).getMessage();
     assertThat("Hello world!").isEqualTo(message);

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import java.util.Base64`
`24`	`24`	`import java.util.logging.Logger`
`25`	`25`
`26`	`26`
`27`		`-class HelloPubSub : BackgroundFunction<Message> {`
	`27`	`+class KotlinHelloPubSub : BackgroundFunction<Message> {`
`28`	`28`	`override fun accept(message: Message, context: Context) {`
`29`	`29`	`// name's default value is "world"`
`30`	`30`	`var name = "world"`
`@@ -38,7 +38,7 @@ class HelloPubSub : BackgroundFunction<Message> {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`companion object {`
`41`		`- private val LOGGER = Logger.getLogger(HelloPubSub::class.java.name)`
	`41`	`+ private val LOGGER = Logger.getLogger(KotlinHelloPubSub::class.java.name)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`// [END functions_helloworld_pubsub]`