fix(spanner): fix test database initialization and teardown on persistent databases, and apply code review fixes for tests

cy-yun · cy-yun · commit 85326884bf48 · 2026-07-30T12:39:45.000-07:00
diff --git a/Spanner/tests/System/BackupTest.php b/Spanner/tests/System/BackupTest.php
@@ -196,7 +196,8 @@ public function testCreateBackupRequestFailed()
             } catch (FailedPreconditionException $e) {
                 break;
             } catch (\Google\Cloud\Core\Exception\ServiceException $ex) {
-                if ($i === 2 || !in_array($ex->getStatus(), ['UNAVAILABLE', 'DEADLINE_EXCEEDED'])) {
+                $allowed = [14 /* UNAVAILABLE */, 4 /* DEADLINE_EXCEEDED */];
+                if ($i === 2 || !in_array($ex->getCode(), $allowed)) {
                     throw $ex;
                 }
                 sleep(2);
@@ -251,8 +252,8 @@ public function testCancelBackupOperation()
         
         try {
             $op->cancel();
-        } catch (\Google\ApiCore\ApiException $e) {
-            if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {
+        } catch (\Google\Cloud\Core\Exception\ServiceException $e) {
+            if ($e->getCode() !== 4 /* DEADLINE_EXCEEDED */) {
                 throw $e;
             }
         }
@@ -724,8 +725,8 @@ private function pollWithExtendedTimeout($op)
                     'maxPollingDurationSeconds' => $timeout - time()
                 ]);
                 break;
-            } catch (\Google\ApiCore\ApiException $e) {
-                if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {
+            } catch (\Google\Cloud\Core\Exception\ServiceException $e) {
+                if ($e->getCode() !== 4 /* DEADLINE_EXCEEDED */) {
                     throw $e;
                 }
             }
diff --git a/Spanner/tests/System/BatchTest.php b/Spanner/tests/System/BatchTest.php
@@ -47,6 +47,7 @@ public static function setUpTestFixtures(): void
         if (self::$isSetup) {
             return;
         }
+        self::$database->delete(self::TABLE_NAME, new KeySet(['all' => true]));
         self::seedTable();
         self::$isSetup = true;
     }
@@ -99,7 +100,8 @@ public function testBatch()
                 $partitions = $snapshot->partitionQuery($query, ['parameters' => $parameters]);
                 break;
             } catch (\Google\Cloud\Core\Exception\ServiceException $ex) {
-                if ($i === 2 || !in_array($ex->getStatus(), ['UNAVAILABLE', 'DEADLINE_EXCEEDED'])) {
+                $allowed = [14 /* UNAVAILABLE */, 4 /* DEADLINE_EXCEEDED */];
+                if ($i === 2 || !in_array($ex->getCode(), $allowed)) {
                     throw $ex;
                 }
                 sleep(2);
diff --git a/Spanner/tests/System/LargeReadTest.php b/Spanner/tests/System/LargeReadTest.php
@@ -48,8 +48,7 @@ class LargeReadTest extends SystemTestCase
     public static function setUpTestFixtures(): void
     {
         self::setUpTestDatabase();
-
-        
+        self::$database->delete(self::TABLE_NAME, new KeySet(['all' => true]));
 
         $str = '';
         foreach (self::$data as $letter) {
diff --git a/Spanner/tests/System/PgBatchTest.php b/Spanner/tests/System/PgBatchTest.php
@@ -51,9 +51,7 @@ public static function setUpTestFixtures(): void
         }
         self::setUpTestDatabase();
 
-        
-
-        
+        self::$database->delete(self::TABLE_NAME, new \Google\Cloud\Spanner\KeySet(['all' => true]));
 
         self::seedTable();
         self::$hasSetupBatch = true;
@@ -130,7 +128,7 @@ private static function seedTable()
             ];
         }
 
-        self::$database->insertBatch(self::TABLE_NAME, $mutations, [
+        self::$database->insertOrUpdateBatch(self::TABLE_NAME, $mutations, [
             'timeoutMillis' => 50000
         ]);
     }
diff --git a/Spanner/tests/System/PgReadTest.php b/Spanner/tests/System/PgReadTest.php
@@ -46,15 +46,9 @@ public static function setUpTestFixtures(): void
     {
         self::setUpTestDatabase();
 
-        
-        
-
-        
-
-        
-
         $db = self::$database;
-        
+        $db->delete(self::READ_TABLE_NAME, new KeySet(['all' => true]));
+        $db->delete(self::RANGE_TABLE_NAME, new KeySet(['all' => true]));
 
         self::$dataset = self::generateDataset(20, true);
         $db->insertOrUpdateBatch(self::RANGE_TABLE_NAME, self::$dataset);
diff --git a/Spanner/tests/System/PgSystemTestCaseTrait.php b/Spanner/tests/System/PgSystemTestCaseTrait.php
@@ -51,6 +51,14 @@ protected static function setUpTestDatabase(): void
                 'databaseDialect' => DatabaseDialect::POSTGRESQL
             ]);
             $op->pollUntilComplete();
+        } else {
+            TestDatabaseManager::$pgHasSetUp = true;
+            TestDatabaseManager::$client = self::$client;
+            TestDatabaseManager::$instance = self::$instance;
+            TestDatabaseManager::$pgDatabase = self::$database;
+            TestDatabaseManager::$pgDbName = self::$dbName;
+            self::$hasSetUp = true;
+            return;
         }
 
         self::$database->updateDdlBatch(
diff --git a/Spanner/tests/System/ReadTest.php b/Spanner/tests/System/ReadTest.php
@@ -50,17 +50,9 @@ public static function setUpTestFixtures(): void
     {
         self::setUpTestDatabase();
 
-        
-        
-
-        
-
-        
-
-        
-
         $db = self::$database;
-        
+        $db->delete(self::READ_TABLE_NAME, new KeySet(['all' => true]));
+        $db->delete(self::RANGE_TABLE_NAME, new KeySet(['all' => true]));
 
         self::$dataset = self::generateDataset(20, true);
         $db->insertOrUpdateBatch(self::RANGE_TABLE_NAME, self::$dataset);
diff --git a/Spanner/tests/System/SnapshotTest.php b/Spanner/tests/System/SnapshotTest.php
@@ -238,13 +238,13 @@ public function testOrderByInSnapshot()
     {
         $db = self::$database;
 
-        $db->insertBatch(self::TABLE_NAME, [
+        $db->insertOrUpdateBatch(self::TABLE_NAME, [
             [
-                'id' => rand(1, 346464),
+                'id' => self::randId(),
                 'number' => 1
             ],
             [
-                'id' => rand(1, 346464),
+                'id' => self::randId(),
                 'number' => 2
             ]
         ]);
diff --git a/Spanner/tests/System/SystemTestCaseTrait.php b/Spanner/tests/System/SystemTestCaseTrait.php
@@ -119,6 +119,14 @@ private static function setUpTestDatabase(): void
         if (!self::$database->exists()) {
             $op = self::$instance->createDatabase(self::$dbName);
             $op->pollUntilComplete();
+        } else {
+            TestDatabaseManager::$sqlHasSetUp = true;
+            TestDatabaseManager::$client = self::$client;
+            TestDatabaseManager::$instance = self::$instance;
+            TestDatabaseManager::$sqlDatabase = self::$database;
+            TestDatabaseManager::$sqlDbName = self::$dbName;
+            self::$hasSetUp = true;
+            return;
         }
 
         $op = self::$database->updateDdlBatch(

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,8 @@ public function testCreateBackupRequestFailed()`
`196`	`196`	`} catch (FailedPreconditionException $e) {`
`197`	`197`	`break;`
`198`	`198`	`} catch (\Google\Cloud\Core\Exception\ServiceException $ex) {`
`199`		`- if ($i === 2 \|\| !in_array($ex->getStatus(), ['UNAVAILABLE', 'DEADLINE_EXCEEDED'])) {`
	`199`	`+ $allowed = [14 /* UNAVAILABLE /, 4 / DEADLINE_EXCEEDED */];`
	`200`	`+ if ($i === 2 \|\| !in_array($ex->getCode(), $allowed)) {`
`200`	`201`	`throw $ex;`
`201`	`202`	`}`
`202`	`203`	`sleep(2);`
`@@ -251,8 +252,8 @@ public function testCancelBackupOperation()`
`251`	`252`
`252`	`253`	`try {`
`253`	`254`	`$op->cancel();`
`254`		`- } catch (\Google\ApiCore\ApiException $e) {`
`255`		`- if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {`
	`255`	`+ } catch (\Google\Cloud\Core\Exception\ServiceException $e) {`
	`256`	`+ if ($e->getCode() !== 4 /* DEADLINE_EXCEEDED */) {`
`256`	`257`	`throw $e;`
`257`	`258`	`}`
`258`	`259`	`}`
`@@ -724,8 +725,8 @@ private function pollWithExtendedTimeout($op)`
`724`	`725`	`'maxPollingDurationSeconds' => $timeout - time()`
`725`	`726`	`]);`
`726`	`727`	`break;`
`727`		`- } catch (\Google\ApiCore\ApiException $e) {`
`728`		`- if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {`
	`728`	`+ } catch (\Google\Cloud\Core\Exception\ServiceException $e) {`
	`729`	`+ if ($e->getCode() !== 4 /* DEADLINE_EXCEEDED */) {`
`729`	`730`	`throw $e;`
`730`	`731`	`}`
`731`	`732`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public static function setUpTestFixtures(): void`
`47`	`47`	`if (self::$isSetup) {`
`48`	`48`	`return;`
`49`	`49`	`}`
	`50`	`+ self::$database->delete(self::TABLE_NAME, new KeySet(['all' => true]));`
`50`	`51`	`self::seedTable();`
`51`	`52`	`self::$isSetup = true;`
`52`	`53`	`}`
`@@ -99,7 +100,8 @@ public function testBatch()`
`99`	`100`	`$partitions = $snapshot->partitionQuery($query, ['parameters' => $parameters]);`
`100`	`101`	`break;`
`101`	`102`	`} catch (\Google\Cloud\Core\Exception\ServiceException $ex) {`
`102`		`- if ($i === 2 \|\| !in_array($ex->getStatus(), ['UNAVAILABLE', 'DEADLINE_EXCEEDED'])) {`
	`103`	`+ $allowed = [14 /* UNAVAILABLE /, 4 / DEADLINE_EXCEEDED */];`
	`104`	`+ if ($i === 2 \|\| !in_array($ex->getCode(), $allowed)) {`
`103`	`105`	`throw $ex;`
`104`	`106`	`}`
`105`	`107`	`sleep(2);`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ class LargeReadTest extends SystemTestCase`
`48`	`48`	`public static function setUpTestFixtures(): void`
`49`	`49`	`{`
`50`	`50`	`self::setUpTestDatabase();`
`51`		`-`
`52`		`-`
	`51`	`+ self::$database->delete(self::TABLE_NAME, new KeySet(['all' => true]));`
`53`	`52`
`54`	`53`	`$str = '';`
`55`	`54`	`foreach (self::$data as $letter) {`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,7 @@ public static function setUpTestFixtures(): void`
`51`	`51`	`}`
`52`	`52`	`self::setUpTestDatabase();`
`53`	`53`
`54`		`-`
`55`		`-`
`56`		`-`
	`54`	`+ self::$database->delete(self::TABLE_NAME, new \Google\Cloud\Spanner\KeySet(['all' => true]));`
`57`	`55`
`58`	`56`	`self::seedTable();`
`59`	`57`	`self::$hasSetupBatch = true;`
`@@ -130,7 +128,7 @@ private static function seedTable()`
`130`	`128`	`];`
`131`	`129`	`}`
`132`	`130`
`133`		`- self::$database->insertBatch(self::TABLE_NAME, $mutations, [`
	`131`	`+ self::$database->insertOrUpdateBatch(self::TABLE_NAME, $mutations, [`
`134`	`132`	`'timeoutMillis' => 50000`
`135`	`133`	`]);`
`136`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,13 +238,13 @@ public function testOrderByInSnapshot()`
`238`	`238`	`{`
`239`	`239`	`$db = self::$database;`
`240`	`240`
`241`		`- $db->insertBatch(self::TABLE_NAME, [`
	`241`	`+ $db->insertOrUpdateBatch(self::TABLE_NAME, [`
`242`	`242`	`[`
`243`		`- 'id' => rand(1, 346464),`
	`243`	`+ 'id' => self::randId(),`
`244`	`244`	`'number' => 1`
`245`	`245`	`],`
`246`	`246`	`[`
`247`		`- 'id' => rand(1, 346464),`
	`247`	`+ 'id' => self::randId(),`
`248`	`248`	`'number' => 2`
`249`	`249`	`]`
`250`	`250`	`]);`