move from MockBuilder to Prophecty

googleapis · Dec 10, 2024 · c0ae5df · c0ae5df
1 parent 05c4aa9
commit c0ae5df
Show file tree

Hide file tree

Showing 60 changed files with 403 additions and 521 deletions.
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
     "autoload-dev": {
         "psr-4": {
             "Google\\ApiCore\\Dev\\": "dev/src",
-            "Google\\ApiCore\\": "tests",
+            "Google\\ApiCore\\Tests\\": "tests",
             "GPBMetadata\\Google\\": "metadata/Google"
         }
     },

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" colors="true">
   <php>
-    <env name="GOOGLE_APPLICATION_CREDENTIALS" value="tests/Tests/Unit/testdata/json-key-file.json"/>
+    <env name="GOOGLE_APPLICATION_CREDENTIALS" value="tests/Unit/testdata/json-key-file.json"/>
   </php>
   <coverage>
     <include>
@@ -10,7 +10,7 @@
   </coverage>
   <testsuites>
     <testsuite name="unit">
-      <directory>tests/Tests/Unit</directory>
+      <directory>tests/Unit</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/tests/Tests/Unit/AgentHeaderTest.php → tests/Unit/AgentHeaderTest.php b/tests/Tests/Unit/AgentHeaderTest.php → tests/Unit/AgentHeaderTest.php
diff --git a/tests/Tests/Unit/ApiExceptionTest.php → tests/Unit/ApiExceptionTest.php b/tests/Tests/Unit/ApiExceptionTest.php → tests/Unit/ApiExceptionTest.php
diff --git a/tests/Tests/Unit/ApiStatusTest.php → tests/Unit/ApiStatusTest.php b/tests/Tests/Unit/ApiStatusTest.php → tests/Unit/ApiStatusTest.php
diff --git a/tests/Tests/Unit/ArrayTraitTest.php → tests/Unit/ArrayTraitTest.php b/tests/Tests/Unit/ArrayTraitTest.php → tests/Unit/ArrayTraitTest.php
diff --git a/tests/Tests/Unit/BidiStreamTest.php → tests/Unit/BidiStreamTest.php b/tests/Tests/Unit/BidiStreamTest.php → tests/Unit/BidiStreamTest.php
diff --git a/tests/Tests/Unit/ClientOptionsTraitTest.php → tests/Unit/ClientOptionsTraitTest.php b/tests/Tests/Unit/ClientOptionsTraitTest.php → tests/Unit/ClientOptionsTraitTest.php
diff --git a/tests/Tests/Unit/ClientStreamTest.php → tests/Unit/ClientStreamTest.php b/tests/Tests/Unit/ClientStreamTest.php → tests/Unit/ClientStreamTest.php
diff --git a/tests/Tests/Unit/CredentialsWrapperTest.php → tests/Unit/CredentialsWrapperTest.php b/tests/Tests/Unit/CredentialsWrapperTest.php → tests/Unit/CredentialsWrapperTest.php
diff --git a/tests/Tests/Unit/FixedSizeCollectionTest.php → tests/Unit/FixedSizeCollectionTest.php b/tests/Tests/Unit/FixedSizeCollectionTest.php → tests/Unit/FixedSizeCollectionTest.php
@@ -40,10 +40,12 @@
 use InvalidArgumentException;
 use LengthException;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 class FixedSizeCollectionTest extends TestCase
 {
     use TestTrait;
+    use ProphecyTrait;
 
     private function createPage($responseSequence)
     {
@@ -174,29 +176,26 @@ public function testApiReturningMoreElementsThanPageSize()
     public function testEmptyCollectionThrowsException()
     {
         $collectionSize = 0;
-        $page = $this->getMockBuilder(Page::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $page = $this->prophesize(Page::class);
 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('collectionSize must be > 0.');
 
-        new FixedSizeCollection($page, $collectionSize);
+        new FixedSizeCollection($page->reveal(), $collectionSize);
     }
 
     public function testInvalidPageCount()
     {
         $collectionSize = 1;
-        $page = $this->getMockBuilder(Page::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $page->expects($this->exactly(2))
-            ->method('getPageElementCount')
-            ->will($this->returnValue(2));
+        $page = $this->prophesize(Page::class);
+
+        $page->getPageElementCount()
+            ->shouldBeCalledTimes(2)
+            ->willReturn(2);
 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('collectionSize must be greater than or equal to the number of elements in initialPage');
 
-        new FixedSizeCollection($page, $collectionSize);
+        new FixedSizeCollection($page->reveal(), $collectionSize);
     }
 }