chore(functions): Revise test coverage for CI utility updates (GoogleCloudPlatform#1215)

Author: grayside

functions/concepts_filesystem/test/DeployTest.php

@@ -37,7 +37,7 @@ class DeployTest extends TestCase
     use CloudFunctionDeploymentTrait;
     use TestCasesTrait;
 
-    private static $name = 'listFiles';
+    private static $entryPoint = 'listFiles';
 
     /**
       * @dataProvider cases

functions/concepts_filesystem/test/SystemTest.php

@@ -31,7 +31,7 @@ class SystemTest extends TestCase
     use CloudFunctionLocalTestTrait;
     use TestCasesTrait;
 
-    private static $name = 'listFiles';
+    private static $entryPoint = 'listFiles';
 
     /**
       * @dataProvider cases

functions/concepts_filesystem/test/UnitTest.php

@@ -30,7 +30,7 @@ class UnitTest extends TestCase
 {
     use TestCasesTrait;
 
-    private static $name = 'listFiles';
+    private static $entryPoint = 'listFiles';
 
     public static function setUpBeforeClass(): void
     {
@@ -43,7 +43,7 @@ public static function setUpBeforeClass(): void
     public function testFunction($file): void
     {
         $request = new ServerRequest('GET', '/');
-        $response = $this->runFunction(self::$name, [$request]);
+        $response = $this->runFunction(self::$entryPoint, [$request]);
         $this->assertContains($file, $response);
     }
 

functions/concepts_requests/test/DeployTest.php

@@ -37,7 +37,18 @@ class DeployTest extends TestCase
     use CloudFunctionDeploymentTrait;
     use TestCasesTrait;
 
-    private static $name = 'makeRequest';
+    private static $entryPoint = 'makeRequest';
+
+    /**
+     * Deploy the Function.
+     *
+     * Overrides CloudFunctionLocalTestTrait::doDeploy().
+     */
+    private static function doDeploy()
+    {
+        $case = reset(self::cases());
+        self::$fn->run([$case['varName'] => $case['varValue']]);
+    }
 
     /**
       * @dataProvider cases

functions/concepts_requests/test/SystemTest.php

@@ -31,7 +31,7 @@ class SystemTest extends TestCase
     use CloudFunctionLocalTestTrait;
     use TestCasesTrait;
 
-    private static $name = 'makeRequest';
+    private static $entryPoint = 'makeRequest';
 
     /**
       * @dataProvider cases

functions/concepts_requests/test/UnitTest.php

@@ -31,7 +31,7 @@ class UnitTest extends TestCase
 {
     use TestCasesTrait;
 
-    private static $name = 'makeRequest';
+    private static $entryPoint = 'makeRequest';
 
     public static function setUpBeforeClass(): void
     {
@@ -44,7 +44,7 @@ public static function setUpBeforeClass(): void
     public function testFunction($statusCode): void
     {
         $request = new ServerRequest('GET', '');
-        $output = $this->runFunction(self::$name, [$request]);
+        $output = $this->runFunction(self::$entryPoint, [$request]);
         $this->assertEquals(
             $statusCode,
             $output->getStatusCode()

functions/env_vars/test/DeployTest.php

@@ -37,7 +37,20 @@ class DeployTest extends TestCase
     use CloudFunctionDeploymentTrait;
     use TestCasesTrait;
 
-    private static $name = 'envVar';
+    private static $entryPoint = 'envVar';
+
+    /**
+     * Deploy the Function.
+     *
+     * Overrides CloudFunctionDeploymentTrait::doDeploy().
+     */
+    private static function doDeploy()
+    {
+        // Use the first test case as the source of the deployed environment variable.
+        $cases = self::cases();
+        $env = sprintf("%s=%s", $cases[0]['varName'], $cases[0]['varValue']);
+        self::$fn->deploy(['--update-env-vars' => $env]);
+    }
 
     /**
       * @dataProvider cases

functions/env_vars/test/SystemTest.php

@@ -31,7 +31,20 @@ class SystemTest extends TestCase
     use CloudFunctionLocalTestTrait;
     use TestCasesTrait;
 
-    private static $name = 'envVar';
+    private static $entryPoint = 'envVar';
+
+    /**
+     * Run the PHP server locally for the defined function.
+     *
+     * Overrides CloudFunctionLocalTestTrait::doRun().
+     */
+    private static function doRun()
+    {
+        // Use the first test case as the source of the deployed environment variable.
+        $cases = self::cases();
+        $case = reset($cases);
+        self::$fn->run([$case['varName'] => $case['varValue']]);
+    }
 
     /**
       * @dataProvider cases
@@ -41,9 +54,6 @@ public function testFunction(
         $varName,
         $varValue
     ): void {
-        // Check the target env variable
-        $this->requireEnv($varName);
-
         // Send a request to the function.
         $resp = $this->client->get('/');
 

functions/env_vars/test/TestCasesTrait.php

@@ -22,6 +22,7 @@ trait TestCasesTrait
 {
     public static function cases(): array
     {
+        // WARNING: DeployTest and SystemTest are only deployed with the first test case.
         return [
             [
                 'statusCode' => 200,

functions/env_vars/test/UnitTest.php

@@ -30,13 +30,11 @@ class UnitTest extends TestCase
 {
     use TestCasesTrait;
 
-    private static $name = 'envVar';
+    private static $entryPoint = 'envVar';
 
     public static function setUpBeforeClass(): void
     {
         require_once __DIR__ . '/../index.php';
-
-        putenv("FOO=bar");
     }
 
     /**
@@ -47,8 +45,9 @@ public function testFunction(
         $varName,
         $varValue
     ): void {
+        putenv("$varName=$varValue");
         $request = new ServerRequest('GET', '/');
-        $output = $this->runFunction(self::$name, [$request]);
+        $output = $this->runFunction(self::$entryPoint, [$request]);
         $this->assertContains($varValue, $output);
     }