use traits instead of base classes

bshaffer · bshaffer · commit 60060ccb509c · 2025-10-21T19:50:42.000Z
diff --git a/.github/workflows/emulator-system-tests-spanner.yaml b/.github/workflows/emulator-system-tests-spanner.yaml
@@ -41,7 +41,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.4'
           ini-values: grpc.enable_fork_support=1
           tools: pecl
           extensions: bcmath, grpc, pcntl
diff --git a/Spanner/tests/System/AdminTest.php b/Spanner/tests/System/AdminTest.php
@@ -19,6 +19,7 @@
 
 use Google\Cloud\Core\Exception\FailedPreconditionException;
 use Google\Cloud\Core\LongRunning\LongRunningOperation;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Admin\Database\V1\Client\DatabaseAdminClient;
 use Google\Cloud\Spanner\Admin\Database\V1\DatabaseDialect;
 use Google\Cloud\Spanner\Admin\Instance\V1\Client\InstanceAdminClient;
@@ -31,8 +32,10 @@
  * @group spanner
  * @group admin
  */
-class AdminTest extends SpannerTestCase
+class AdminTest extends SystemTestCase
 {
+    use SystemTestCaseTrait;
+
     /**
      * @beforeClass
      */
diff --git a/Spanner/tests/System/BackupTest.php b/Spanner/tests/System/BackupTest.php
@@ -20,6 +20,7 @@
 use Google\Cloud\Core\Exception\BadRequestException;
 use Google\Cloud\Core\Exception\ConflictException;
 use Google\Cloud\Core\LongRunning\LongRunningOperation;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Admin\Database\V1\Client\DatabaseAdminClient;
 use Google\Cloud\Spanner\Admin\Database\V1\CreateBackupEncryptionConfig;
 use Google\Cloud\Spanner\Admin\Database\V1\EncryptionInfo\Type;
@@ -30,8 +31,10 @@
 /**
  * @group spanner
  */
-class BackupTest extends SpannerTestCase
+class BackupTest extends SystemTestCase
 {
+    use SystemTestCaseTrait;
+
     const BACKUP_PREFIX = 'spanner_backup_';
 
     protected static $backupId1;
diff --git a/Spanner/tests/System/BatchTest.php b/Spanner/tests/System/BatchTest.php
@@ -18,6 +18,7 @@
 namespace Google\Cloud\Spanner\Tests\System;
 
 use Google\Cloud\Core\Exception\ServiceException;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Admin\Database\V1\DatabaseDialect;
 use Google\Cloud\Spanner\Batch\BatchClient;
 use Google\Cloud\Spanner\Batch\BatchSnapshot;
@@ -28,8 +29,9 @@
  * @group spanner
  * @group spanner-batch
  */
-class BatchTest extends SpannerTestCase
+class BatchTest extends SystemTestCase
 {
+    use SystemTestCaseTrait;
     use DatabaseRoleTrait;
 
     private static $tableName;
diff --git a/Spanner/tests/System/BatchWriteTest.php b/Spanner/tests/System/BatchWriteTest.php
@@ -18,12 +18,15 @@
 namespace Google\Cloud\Spanner\Tests\System;
 
 use Google\Rpc\Code;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 
 /**
  * @group spanner
  */
-class BatchWriteTest extends SpannerTestCase
+class BatchWriteTest extends SystemTestCase
 {
+    use SystemTestCaseTrait;
+
     const TABLE_NAME = 'BatchWrites';
     /**
      * @beforeClass
diff --git a/Spanner/tests/System/DatabaseRoleTrait.php b/Spanner/tests/System/DatabaseRoleTrait.php
@@ -46,7 +46,7 @@ public function insertDbProvider()
                 self::getDbWithRestrictiveRole(),
                 [
                     'id' => rand(1, 346464),
-                    'name' => uniqid(SpannerTestCase::TESTING_PREFIX),
+                    'name' => uniqid(self::TESTING_PREFIX),
                     'birthday' => new Date(new \DateTime('2000-01-01'))
                 ],
                 'PERMISSION_DENIED'
@@ -55,7 +55,7 @@ public function insertDbProvider()
                 self::getDbWithRestrictiveRole(),
                 [
                     'id' => rand(1, 346464),
-                    'name' => uniqid(SpannerTestCase::TESTING_PREFIX)
+                    'name' => uniqid(self::TESTING_PREFIX)
                 ],
                 null
             ]
diff --git a/Spanner/tests/System/GeneratedAdminEmulatorTest.php b/Spanner/tests/System/GeneratedAdminEmulatorTest.php
@@ -17,6 +17,7 @@
 
 namespace Google\Cloud\Spanner\Tests\System;
 
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Admin\Database\V1\Client\DatabaseAdminClient;
 use Google\Cloud\Spanner\Admin\Database\V1\CreateDatabaseRequest;
 use Google\Cloud\Spanner\Admin\Database\V1\GetDatabaseRequest;
@@ -28,8 +29,10 @@
 /**
  * @group spanner
  */
-class GeneratedAdminEmulatorTest extends SpannerTestCase
+class GeneratedAdminEmulatorTest extends SystemTestCase
 {
+    use SystemTestCaseTrait;
+
     private static $projectId;
 
     /**
diff --git a/Spanner/tests/System/LargeReadTest.php b/Spanner/tests/System/LargeReadTest.php
@@ -17,15 +17,18 @@
 
 namespace Google\Cloud\Spanner\Tests\System;
 
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Bytes;
 use Google\Cloud\Spanner\KeySet;
 
 /**
  * @group spanner
  * @group spanner-large-read
  */
-class LargeReadTest extends SpannerTestCase
+class LargeReadTest extends SystemTestCase
 {
+    use SystemTestCaseTrait;
+
     private static $tableName;
     private static $row = [];
 
diff --git a/Spanner/tests/System/OperationsTest.php b/Spanner/tests/System/OperationsTest.php
@@ -17,16 +17,18 @@
 
 namespace Google\Cloud\Spanner\Tests\System;
 
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Core\Exception\ServiceException;
 use Google\Cloud\Spanner\Date;
 use Google\Cloud\Spanner\Timestamp;
 
 /**
  * @group spanner
  */
-class OperationsTest extends SpannerTestCase
+class OperationsTest extends SystemTestCase
 {
     use DatabaseRoleTrait;
+    use SystemTestCaseTrait;
 
     private static $id1;
     private static $id2;
diff --git a/Spanner/tests/System/PartitionedDmlTest.php b/Spanner/tests/System/PartitionedDmlTest.php
@@ -17,12 +17,16 @@
 
 namespace Google\Cloud\Spanner\Tests\System;
 
+use Google\Cloud\Core\Testing\System\SystemTestCase;
+
 /**
  * @group spanner
  * @group spanner-pdml
  */
-class PartitionedDmlTest extends SpannerTestCase
+class PartitionedDmlTest extends SystemTestCase
 {
+    use SystemTestCaseTrait;
+
     const PDML_TABLE = 'partitionedDml';
 
     /**
diff --git a/Spanner/tests/System/PgBatchTest.php b/Spanner/tests/System/PgBatchTest.php
@@ -18,6 +18,7 @@
 namespace Google\Cloud\Spanner\Tests\System;
 
 use Google\Cloud\Core\Exception\ServiceException;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Admin\Database\V1\DatabaseDialect;
 use Google\Cloud\Spanner\Batch\BatchClient;
 use Google\Cloud\Spanner\Batch\BatchSnapshot;
@@ -27,8 +28,9 @@
  * @group spanner-batch
  * @group spanner-postgres
  */
-class PgBatchTest extends SpannerPgTestCase
+class PgBatchTest extends SystemTestCase
 {
+    use PgSystemTestCaseTrait;
     use DatabaseRoleTrait;
 
     private static $tableName;
diff --git a/Spanner/tests/System/PgBatchWriteTest.php b/Spanner/tests/System/PgBatchWriteTest.php
@@ -17,14 +17,17 @@
 
 namespace Google\Cloud\Spanner\Tests\System;
 
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Rpc\Code;
 
 /**
  * @group spanner
  * @group spanner-postgres
  */
-class PgBatchWriteTest extends SpannerPgTestCase
+class PgBatchWriteTest extends SystemTestCase
 {
+    use PgSystemTestCaseTrait;
+
     const TABLE_NAME = 'BatchWrites';
     /**
      * @beforeClass
diff --git a/Spanner/tests/System/PgOperationsTest.php b/Spanner/tests/System/PgOperationsTest.php
@@ -18,16 +18,18 @@
 namespace Google\Cloud\Spanner\Tests\System;
 
 use Google\Cloud\Core\Exception\ServiceException;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Date;
 
 /**
  * @group spanner
  * @group spanner-operations
  * @group spanner-postgres
  */
-class PgOperationsTest extends SpannerPgTestCase
+class PgOperationsTest extends SystemTestCase
 {
     use DatabaseRoleTrait;
+    use PgSystemTestCaseTrait;
 
     private static $row = [];
 
diff --git a/Spanner/tests/System/PgPartitionedDmlTest.php b/Spanner/tests/System/PgPartitionedDmlTest.php
@@ -17,13 +17,17 @@
 
 namespace Google\Cloud\Spanner\Tests\System;
 
+use Google\Cloud\Core\Testing\System\SystemTestCase;
+
 /**
  * @group spanner
  * @group spanner-pdml
  * @group spanner-postgres
  */
-class PgPartitionedDmlTest extends SpannerPgTestCase
+class PgPartitionedDmlTest extends SystemTestCase
 {
+    use PgSystemTestCaseTrait;
+
     const PDML_TABLE = 'partitionedDml';
 
     /**
diff --git a/Spanner/tests/System/PgQueryTest.php b/Spanner/tests/System/PgQueryTest.php
@@ -19,6 +19,7 @@
 
 use Google\Cloud\Core\Exception\BadRequestException;
 use Google\Cloud\Core\Int64;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\ArrayType;
 use Google\Cloud\Spanner\Bytes;
 use Google\Cloud\Spanner\Database;
@@ -35,8 +36,10 @@
  * @group spanner-query
  * @group spanner-postgres
  */
-class PgQueryTest extends SpannerPgTestCase
+class PgQueryTest extends SystemTestCase
 {
+    use PgSystemTestCaseTrait;
+
     const TABLE_NAME = 'test';
 
     public static $timestampVal;
diff --git a/Spanner/tests/System/PgReadTest.php b/Spanner/tests/System/PgReadTest.php
@@ -19,6 +19,7 @@
 
 use Google\Cloud\Core\Exception\DeadlineExceededException;
 use Google\Cloud\Core\Exception\NotFoundException;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\KeyRange;
 use Google\Cloud\Spanner\KeySet;
 
@@ -27,8 +28,10 @@
  * @group spanner-read
  * @group spanner-postgres
  */
-class PgReadTest extends SpannerPgTestCase
+class PgReadTest extends SystemTestCase
 {
+    use PgSystemTestCaseTrait;
+
     private static $readTableName;
     private static $rangeTableName;
     private static $indexes = [];
diff --git a/Spanner/tests/System/PgSystemTestCaseTrait.php b/Spanner/tests/System/PgSystemTestCaseTrait.php
@@ -17,14 +17,13 @@
 
 namespace Google\Cloud\Spanner\Tests\System;
 
-use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Admin\Database\V1\DatabaseDialect;
 
 /**
  * @group spanner
  * @group spanner-postgres
  */
-abstract class SpannerPgTestCase extends SystemTestCase
+trait PgSystemTestCaseTrait
 {
     use SystemTestCaseTrait;
 
@@ -52,7 +51,6 @@ protected static function setUpTestDatabase(): void
         });
 
         self::$database = $db;
-        self::$database2 = self::getDatabaseInstance(self::$dbName);
 
         $db->updateDdlBatch(
             [
diff --git a/Spanner/tests/System/PgTransactionTest.php b/Spanner/tests/System/PgTransactionTest.php
@@ -18,6 +18,7 @@
 namespace Google\Cloud\Spanner\Tests\System;
 
 use Google\Cloud\Core\Exception\ServiceException;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\Date;
 use Google\Cloud\Spanner\KeySet;
 use Google\Cloud\Spanner\Timestamp;
@@ -28,9 +29,10 @@
  * @group spanner-transaction
  * @group spanner-postgres
  */
-class PgTransactionTest extends SpannerPgTestCase
+class PgTransactionTest extends SystemTestCase
 {
     use DatabaseRoleTrait;
+    use PgSystemTestCaseTrait;
 
     private static $row = [];
 
diff --git a/Spanner/tests/System/PgWriteTest.php b/Spanner/tests/System/PgWriteTest.php
@@ -20,6 +20,7 @@
 use Google\Cloud\Core\Exception\BadRequestException;
 use Google\Cloud\Core\Exception\FailedPreconditionException;
 use Google\Cloud\Core\Exception\NotFoundException;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Core\TimeTrait;
 use Google\Cloud\Spanner\Bytes;
 use Google\Cloud\Spanner\CommitTimestamp;
@@ -35,8 +36,9 @@
  * @group spanner-write
  * @group spanner-postgres
  */
-class PgWriteTest extends SpannerPgTestCase
+class PgWriteTest extends SystemTestCase
 {
+    use PgSystemTestCaseTrait;
     use TimeTrait;
 
     const TABLE_NAME = 'Writes';
diff --git a/Spanner/tests/System/QueryTest.php b/Spanner/tests/System/QueryTest.php
@@ -19,6 +19,7 @@
 
 use Google\Cloud\Core\Exception\BadRequestException;
 use Google\Cloud\Core\Int64;
+use Google\Cloud\Core\Testing\System\SystemTestCase;
 use Google\Cloud\Spanner\ArrayType;
 use Google\Cloud\Spanner\Bytes;
 use Google\Cloud\Spanner\Database;
@@ -35,8 +36,10 @@
  * @group spanner
  * @group spanner-query
  */
-class QueryTest extends SpannerTestCase
+class QueryTest extends SystemTestCase
 {
+    use SystemTestCaseTrait;
+
     /**
      * @beforeClass
      */
diff --git a/Spanner/tests/System/ReadTest.php b/Spanner/tests/System/ReadTest.php
diff --git a/Spanner/tests/System/SnapshotTest.php b/Spanner/tests/System/SnapshotTest.php
diff --git a/Spanner/tests/System/SpannerTestCase.php b/Spanner/tests/System/SpannerTestCase.php
diff --git a/Spanner/tests/System/SystemTestCaseTrait.php b/Spanner/tests/System/SystemTestCaseTrait.php
diff --git a/Spanner/tests/System/TransactionTest.php b/Spanner/tests/System/TransactionTest.php
diff --git a/Spanner/tests/System/UniverseDomainTest.php b/Spanner/tests/System/UniverseDomainTest.php
diff --git a/Spanner/tests/System/WriteTest.php b/Spanner/tests/System/WriteTest.php
diff --git a/Spanner/tests/System/pcntl/AbortedErrorCausesRetry.php b/Spanner/tests/System/pcntl/AbortedErrorCausesRetry.php
diff --git a/Spanner/tests/System/pcntl/ConcurrentTransactionsIncrementValueWithExecute.php b/Spanner/tests/System/pcntl/ConcurrentTransactionsIncrementValueWithExecute.php
diff --git a/Spanner/tests/System/pcntl/ConcurrentTransactionsIncrementValueWithRead.php b/Spanner/tests/System/pcntl/ConcurrentTransactionsIncrementValueWithRead.php

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function insertDbProvider()`
`46`	`46`	`self::getDbWithRestrictiveRole(),`
`47`	`47`	`[`
`48`	`48`	`'id' => rand(1, 346464),`
`49`		`- 'name' => uniqid(SpannerTestCase::TESTING_PREFIX),`
	`49`	`+ 'name' => uniqid(self::TESTING_PREFIX),`
`50`	`50`	`'birthday' => new Date(new \DateTime('2000-01-01'))`
`51`	`51`	`],`
`52`	`52`	`'PERMISSION_DENIED'`
`@@ -55,7 +55,7 @@ public function insertDbProvider()`
`55`	`55`	`self::getDbWithRestrictiveRole(),`
`56`	`56`	`[`
`57`	`57`	`'id' => rand(1, 346464),`
`58`		`- 'name' => uniqid(SpannerTestCase::TESTING_PREFIX)`
	`58`	`+ 'name' => uniqid(self::TESTING_PREFIX)`
`59`	`59`	`],`
`60`	`60`	`null`
`61`	`61`	`]`