fix tests

googleapis · Dec 20, 2024 · 8597744 · 8597744
1 parent 632b748
commit 8597744
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/Core/tests/Unit/GrpcRequestWrapperTest.php b/Core/tests/Unit/GrpcRequestWrapperTest.php
@@ -297,7 +297,6 @@ public function testExceptionMetadata()
                 new FieldViolation([
                     'field' => 'foo',
                     'description' => 'bar',
-                    'reason' => 'REASON'
                 ])
             ]
         ]);
@@ -325,13 +324,15 @@ public function testExceptionMetadata()
 
             $this->assertFalse(true, 'Exception not thrown!');
         } catch (ServiceException $ex) {
-            $this->assertEquals(
-                json_decode($metadata->serializeToJsonString(), true),
-                $ex->getMetadata()[0]
-            );
-
+            $metadata = $ex->getMetadata();
             // Assert only whitelisted types are included.
-            $this->assertCount(1, $ex->getMetadata());
+            $this->assertCount(1, $metadata);
+
+            $this->assertArrayHasKey('fieldViolations', $metadata[0]);
+            $this->assertCount(1, $metadata[0]['fieldViolations']);
+            $fieldViolation = $metadata[0]['fieldViolations'][0];
+            $this->assertEquals('foo', $fieldViolation['field']);
+            $this->assertEquals('bar', $fieldViolation['description']);
         }
     }
 }
diff --git a/Core/tests/Unit/RequestHandlerTest.php b/Core/tests/Unit/RequestHandlerTest.php
@@ -120,7 +120,7 @@ public function responseProvider()
     {
         $expectedMessage = ['successful' => 'request'];
         $message = new Http();
-        
+
         $pagedMessage = $this->prophesize(PagedListResponse::class);
         $page = $this->prophesize(Page::class);
         $page->getResponseObject()->willReturn($message);
@@ -292,7 +292,6 @@ public function testExceptionMetadata()
                 new FieldViolation([
                     'field' => 'foo',
                     'description' => 'bar',
-                    'reason' => 'REASON',
                 ])
             ]
         ]);
@@ -332,13 +331,15 @@ public function testExceptionMetadata()
 
             $this->assertFalse(true, 'Exception not thrown!');
         } catch (ServiceException $ex) {
-            $this->assertEquals(
-                json_decode($metadata->serializeToJsonString(), true),
-                $ex->getMetadata()[0]
-            );
-
+            $metadata = $ex->getMetadata();
             // Assert only whitelisted types are included.
-            $this->assertCount(1, $ex->getMetadata());
+            $this->assertCount(1, $metadata);
+
+            $this->assertArrayHasKey('fieldViolations', $metadata[0]);
+            $this->assertCount(1, $metadata[0]['fieldViolations']);
+            $fieldViolation = $metadata[0]['fieldViolations'][0];
+            $this->assertEquals('foo', $fieldViolation['field']);
+            $this->assertEquals('bar', $fieldViolation['description']);
         }
     }
 }