WIP

Core/tests/Snippet/Iam/IamManagerTest.php

@@ -36,7 +36,7 @@ class IamManagerTest extends SnippetTestCase
     private $policyData;
     private $resource;
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $iam;
 

Core/tests/Snippet/LongRunning/LongRunningOperationManagerTest.php

@@ -45,7 +45,7 @@ class LongRunningOperationManagerTest extends SnippetTestCase
     const NAME = 'operations/foo';
     const TYPE = 'test-type';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $operation;
     private $callables;
@@ -87,8 +87,7 @@ public function setUp(): void
             $this->callables,
             $this->lroResponseMappers,
             DatabaseAdminClient::class,
-            self::NAME,
-        ], ['requestHandler', 'serializer']);
+            self::NAME,        );
     }
 
     public function testName()

Spanner/src/V1/README.md

@@ -5,7 +5,7 @@
 ```php
 require 'vendor/autoload.php';
 
-use Google\Cloud\Spanner\V1\SpannerClient;
+use Google\Cloud\Spanner\V1\Client\SpannerClient;
 
 $spannerClient = new SpannerClient();
 try {

Spanner/tests/Snippet/ArrayTypeTest.php

@@ -28,7 +28,6 @@
 use Google\Cloud\Spanner\Session\Session;
 use Google\Cloud\Spanner\Session\SessionPoolInterface;
 use Google\Cloud\Spanner\StructType;
-use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
 use Google\Cloud\Spanner\V1\Client\SpannerClient;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -40,7 +39,6 @@
 class ArrayTypeTest extends SnippetTestCase
 {
     use GrpcTestTrait;
-    use OperationRefreshTrait;
     use ProphecyTrait;
 
     const PROJECT = 'my-awesome-project';

Spanner/tests/Snippet/BackupTest.php

@@ -44,7 +44,7 @@ class BackupTest extends SnippetTestCase
     const DATABASE = 'my-database';
     const BACKUP = 'my-backup';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $backup;
     private $client;
@@ -56,28 +56,25 @@ public function setUp(): void
         $this->checkAndSkipGrpcTests();
 
         $this->serializer = new Serializer();
-        $this->client = TestHelpers::stub(
-            SpannerClient::class,
+        $this->client = new SpannerClient(
             [['projectId' => 'my-project']],
             ['requestHandler', 'serializer']
         );
-        $this->client->___setProperty('requestHandler', $this->requestHandler->reveal());
-        $this->client->___setProperty('serializer', $this->serializer);
         $this->expireTime = new \DateTime("+ 7 hours");
-        $this->instance = TestHelpers::stub(Instance::class, [
+        $this->instance = new Instance(
             $this->requestHandler->reveal(),
             $this->serializer,
             self::PROJECT,
             self::INSTANCE
-        ], ['requestHandler', 'serializer']);
+        );
 
-        $this->backup = TestHelpers::stub(Backup::class, [
+        $this->backup = new Backup(
             $this->requestHandler->reveal(),
             $this->serializer,
             $this->instance,
             self::PROJECT,
-            self::BACKUP,
-        ], ['instance', 'requestHandler', 'serializer']);
+            self::BACKUP
+        );
     }
 
     public function testClass()

Spanner/tests/Snippet/Batch/BatchClientTest.php

@@ -17,6 +17,7 @@
 
 namespace Google\Cloud\Spanner\Tests\Snippet\Batch;
 
+use Google\ApiCore\Serializer;
 use Google\Cloud\Core\RequestHandler;
 use Google\Cloud\Core\Testing\GrpcTestTrait;
 use Google\Cloud\Core\Testing\Snippet\SnippetTestCase;
@@ -29,7 +30,6 @@
 use Google\Cloud\Spanner\Batch\QueryPartition;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Operation;
-use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Google\Cloud\Spanner\V1\Client\SpannerClient;
 use Prophecy\Argument;
@@ -41,13 +41,12 @@
 class BatchClientTest extends SnippetTestCase
 {
     use GrpcTestTrait;
-    use OperationRefreshTrait;
 
     const DATABASE = 'projects/my-awesome-project/instances/my-instance/databases/my-database';
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
     const TRANSACTION = 'transaction-id';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $client;
 
@@ -56,10 +55,10 @@ public function setUp(): void
         $this->checkAndSkipGrpcTests();
 
         $this->serializer = new Serializer();
-        $this->client = TestHelpers::stub(BatchClient::class, [
+        $this->client = new BatchClient(
             new Operation($this->requestHandler->reveal(), $this->serializer, false),
             self::DATABASE
-        ], ['operation']);
+        );
     }
 
     public function testClass()

Spanner/tests/Snippet/Batch/BatchSnapshotTest.php

@@ -28,7 +28,6 @@
 use Google\Cloud\Spanner\Operation;
 use Google\Cloud\Spanner\Result;
 use Google\Cloud\Spanner\Session\Session;
-use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Google\Cloud\Spanner\V1\Client\SpannerClient;
 use Prophecy\Argument;
@@ -41,14 +40,13 @@
 class BatchSnapshotTest extends SnippetTestCase
 {
     use GrpcTestTrait;
-    use OperationRefreshTrait;
     use ProphecyTrait;
 
     const DATABASE = 'projects/my-awesome-project/instances/my-instance/databases/my-database';
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
     const TRANSACTION = 'transaction-id';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $session;
     private $time;

Spanner/tests/Snippet/Batch/QueryPartitionTest.php

@@ -40,7 +40,7 @@ class QueryPartitionTest extends SnippetTestCase
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
     const TRANSACTION = 'transaction-id';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $className = QueryPartition::class;
     private $sql = 'SELECT 1=1';

Spanner/tests/Snippet/Batch/ReadPartitionTest.php

@@ -43,7 +43,7 @@ class ReadPartitionTest extends SnippetTestCase
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
     const TRANSACTION = 'transaction-id';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $className = ReadPartition::class;
     private $time;

Spanner/tests/Snippet/BatchDmlResultTest.php

@@ -39,7 +39,7 @@ class BatchDmlResultTest extends SnippetTestCase
     use ProphecyTrait;
     use TimeTrait;
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $result;
 

Spanner/tests/Snippet/CommitTimestampTest.php

@@ -36,7 +36,7 @@ class CommitTimestampTest extends SnippetTestCase
 
     const SESSION = 'projects/my-awesome-project/instances/my-instance/databases/my-database/sessions/session-id';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
 
     public function setUp(): void
@@ -49,8 +49,7 @@ public function testClass()
     {
         $id = 'abc';
 
-        $client = TestHelpers::stub(
-            SpannerClient::class,
+        $client = new SpannerClient(
             [['projectId' => 'my-project']],
             ['requestHandler', 'serializer']
         );

Spanner/tests/Snippet/DatabaseTest.php

@@ -33,7 +33,6 @@
 use Google\Cloud\Spanner\Session\Session;
 use Google\Cloud\Spanner\Session\SessionPoolInterface;
 use Google\Cloud\Spanner\Snapshot;
-use Google\Cloud\Spanner\Tests\OperationRefreshTrait;
 use Google\Cloud\Spanner\Tests\ResultGeneratorTrait;
 use Google\Cloud\Spanner\Timestamp;
 use Google\Cloud\Spanner\Transaction;
@@ -48,7 +47,6 @@
 class DatabaseTest extends SnippetTestCase
 {
     use GrpcTestTrait;
-    use OperationRefreshTrait;
     use ProphecyTrait;
     use ResultGeneratorTrait;
 
@@ -58,7 +56,7 @@ class DatabaseTest extends SnippetTestCase
     const TRANSACTION = 'my-transaction';
     const BACKUP = 'my-backup';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $database;
     private $instance;
@@ -85,12 +83,11 @@ public function setUp(): void
         $sessionPool->clear()->willReturn(null);
 
         $this->serializer = new Serializer();
-        $this->instance = TestHelpers::stub(Instance::class, [
+        $this->instance = new Instance(
             $this->requestHandler->reveal(),
             $this->serializer,
             self::PROJECT,
-            self::INSTANCE
-        ], ['requestHandler', 'serializer']);
+            self::INSTANCE        );
 
         $this->database = TestHelpers::stub(Database::class, [
             $this->requestHandler->reveal(),
@@ -167,9 +164,7 @@ public function testBackups()
         );
 
         $this->instance->___setProperty('requestHandler', $this->requestHandler->reveal());
-        $this->instance->___setProperty('serializer', $this->serializer);
-
-        $res = $snippet->invoke('backups');
+                $res = $snippet->invoke('backups');
 
         $this->assertInstanceOf(ItemIterator::class, $res->returnVal());
         $this->assertContainsOnlyInstancesOf(Backup::class, $res->returnVal());

Spanner/tests/Snippet/InstanceConfigurationTest.php

@@ -38,7 +38,7 @@ class InstanceConfigurationTest extends SnippetTestCase
     const PROJECT = 'my-awesome-project';
     const CONFIG = 'regional-europe-west';
 
-    private $requestHandler;
+    private $spannerClient;
     private $serializer;
     private $config;
 
@@ -52,8 +52,7 @@ public function setUp(): void
             $this->serializer,
             self::PROJECT,
             self::CONFIG,
-            [],
-        ], ['requestHandler', 'serializer']);
+            [],        );
     }
 
     public function testClass()