fix: prevent reserved variable names in tests

Author: bshaffer

src/Generation/TestNameValueProducer.php

@@ -94,20 +94,21 @@ public function __construct($prod, $f, $forceValues)
             });
     }
 
-    public function perFieldRequest(MethodDetails $method): array
+    public function perFieldRequest(MethodDetails $method, array $reservedNames = []): array
     {
         // Handle test request value generation.
         $perField = static::filterFirstOneOf($method->allFields)
-            ->map(fn ($f) => new class($this, $method, $f) {
-                public function __construct($prod, $method, $f)
+            ->map(fn ($f) => new class($this, $method, $f, $reservedNames) {
+                public function __construct($prod, $method, $f, $reservedNames)
                 {
                     // This code is arranged in this way, as a name must not be generated
                     // if this field ends up not being used.
                     // Name generation is stateful.
                     // TODO: Consider refactoring this.
                     $this->field = $f;
                     $this->name = ($f->useResourceTestValue ? 'formatted_' : '') . $prod->name($f->name);
-                    $this->var = AST::var(Helpers::toCamelCase($this->name));
+                    $varPrefix = in_array($this->name, $reservedNames) ? 'request_' : '';
+                    $this->var = AST::var(Helpers::toCamelCase($varPrefix . $this->name));
                     $astAcc = Vector::new([]);
                     $prod->fieldInit($method, $f, $this->var, $this->name, null, $astAcc);
                     $this->initCode = $astAcc;

src/Generation/UnitTestsV2Generator.php

@@ -309,7 +309,7 @@ private function testExceptionalCaseNormal(MethodDetails $method): PhpMethod
         $client = AST::var(self::CLIENT_VARIABLE);
         $status = AST::var('status');
         $expectedExceptionMessage  = AST::var('expectedExceptionMessage ');
-        [$requestPerField, $requestCallArgs] = $prod->perFieldRequest($method);
+        [$requestPerField, $requestCallArgs] = $prod->perFieldRequest($method, ['status']);
         $ex = AST::var('ex');
         list($initializedFields, $requestAssignment) = $this->initializeRequest($requestPerField, $method->requestType);
         return AST::method($method->testExceptionMethodName)

tests/Unit/ProtoTests/GoldenUpdateMain.php

@@ -123,6 +123,11 @@ class GoldenUpdateMain
             'protoPath' => 'DiregapicPaginated/diregapic-paginated.proto',
             'transport' => 'rest',
             'migrationMode' => MigrationMode::MIGRATING
+        ],
+        21 => [
+            'name' => 'Keywords',
+            'protoPath' => 'Keywords/keywords.proto',
+            'migrationMode' => MigrationMode::NEW_SURFACE_ONLY,
         ]
     ];
 

tests/Unit/ProtoTests/Keywords/keywords.proto

@@ -6,6 +6,7 @@ option php_namespace = "Testing\\Keywords";
 
 import "google/api/annotations.proto";
 import "google/api/client.proto";
+import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 
 service Keywords {
@@ -39,6 +40,7 @@ message Request {
   string function = 1 [(google.api.resource_reference).type = "keywords.example.com/Resource"];
   int32 switch = 2;
   string request = 3; // Also check a field named the same as the enclosing message.
+  int32 status = 4 [(google.api.field_behavior) = REQUIRED]; // check words in tests
 }
 
 message Response{