fix system test

Author: bshaffer

Core/src/LongRunning/LongRunningGapicConnection.php

@@ -19,12 +19,13 @@
 
 use Google\ApiCore\OperationResponse;
 use Google\ApiCore\Serializer;
+use Google\Cloud\Core\RequestProcessorTrait;
 use Google\LongRunning\Operation;
 use Google\LongRunning\ListOperationsRequest;
 use Google\LongRunning\GetOperationRequest;
 use Google\LongRunning\CancelOperationRequest;
 use Google\LongRunning\DeleteOperationRequest;
-use Google\Cloud\Core\RequestProcessorTrait;
+use Google\Protobuf\Any;
 
 /**
  * Defines the calls required to manage Long Running Operations using a GAPIC
@@ -97,7 +98,12 @@ private function operationResponseToArray(OperationResponse $operationResponse)
         $metaType = $response['metadata']['typeUrl'];
 
         // unpack result Any type
-        $response['response'] = $this->handleResponse($operationResponse->getResult());
+        $result = $operationResponse->getResult();
+        if ($result instanceof Any) {
+            // For some reason we aren't doing this in GAX OperationResponse (but we should)
+            $result = $result->unpack();
+        }
+        $response['response'] = $this->handleResponse($result);
 
         // unpack error Any type
         $response['error'] = $this->handleResponse($operationResponse->getError());

Spanner/tests/System/AdminTest.php

@@ -17,9 +17,9 @@
 
 namespace Google\Cloud\Spanner\Tests\System;
 
-use Google\ApiCore\OperationResponse;
 use Google\Cloud\Core\Exception\FailedPreconditionException;
-use Google\Cloud\Spanner\Admin\Database\V1\DatabaseAdminClient;
+use Google\Cloud\Core\LongRunning\LongRunningOperation;
+use Google\Cloud\Spanner\Admin\Database\V1\Client\DatabaseAdminClient;
 use Google\Cloud\Spanner\Admin\Database\V1\DatabaseDialect;
 use Google\Cloud\Spanner\Admin\Instance\V1\InstanceAdminClient;
 use Google\Cloud\Spanner\Admin\Instance\V1\InstanceConfig\Type;
@@ -62,7 +62,7 @@ public function testInstance()
             'processingUnits' => $processingUnits,
         ]);
 
-        $this->assertInstanceOf(OperationResponse::class, $op);
+        $this->assertInstanceOf(LongRunningOperation::class, $op);
         $op->pollUntilComplete();
 
         $instance = $client->instance(self::INSTANCE_NAME);
@@ -97,9 +97,9 @@ public function testDatabase()
         $dbName = uniqid(self::TESTING_PREFIX);
         $op = $instance->createDatabase($dbName);
 
-        $this->assertInstanceOf(OperationResponse::class, $op);
+        $this->assertInstanceOf(LongRunningOperation::class, $op);
         $op->pollUntilComplete();
-        $db = $op->getResult();
+        $db = $op->result();
         $this->assertInstanceOf(Database::class, $db);
 
         self::$deletionQueue->add(function () use ($db) {
@@ -141,9 +141,9 @@ public function testDatabaseDropProtection()
         $dbName = uniqid(self::TESTING_PREFIX);
         $op = $instance->createDatabase($dbName);
 
-        $this->assertInstanceOf(OperationResponse::class, $op);
+        $this->assertInstanceOf(LongRunningOperation::class, $op);
         $op->pollUntilComplete();
-        $db = $op->getResult();
+        $db = $op->result();
         $this->assertInstanceOf(Database::class, $db);
 
         $info = $db->reload();
@@ -246,7 +246,7 @@ public function testCreateCustomerManagedInstanceConfiguration()
         $replicas[array_rand($replicas)]['defaultLeaderLocation'] = true;
         $op = $customConfiguration->create($baseConfig, $replicas);
 
-        $this->assertInstanceOf(OperationResponse::class, $op);
+        $this->assertInstanceOf(LongRunningOperation::class, $op);
         $op->pollUntilComplete();
 
         $this->assertTrue($customConfiguration->exists());
@@ -332,7 +332,7 @@ public function testPgDatabase()
             'databaseDialect' => DatabaseDialect::POSTGRESQL
         ]);
 
-        $this->assertInstanceOf(OperationResponse::class, $op);
+        $this->assertInstanceOf(LongRunningOperation::class, $op);
         $db = $op->pollUntilComplete();
         $this->assertInstanceOf(Database::class, $db);