remove unnecessary refactor

Author: bshaffer

Spanner/tests/System/BatchTest.php

@@ -31,8 +31,8 @@
  */
 class BatchTest extends SystemTestCase
 {
-    use DatabaseRoleTrait;
     use SystemTestCaseTrait;
+    use DatabaseRoleTrait;
 
     private static $tableName;
     private static $isSetup = false;
@@ -59,22 +59,22 @@ public static function setUpTestFixtures(): void
 
         if (self::$database->info()['databaseDialect'] == DatabaseDialect::GOOGLE_STANDARD_SQL) {
             $statements = [
-                sprintf('CREATE ROLE %s', self::DATABASE_ROLE),
-                sprintf('CREATE ROLE %s', self::RESTRICTIVE_DATABASE_ROLE),
+                sprintf('CREATE ROLE %s', self::$dbRole),
+                sprintf('CREATE ROLE %s', self::$restrictiveDbRole),
             ];
 
             if (!self::isEmulatorUsed()) {
                 $statements[] = sprintf(
                     'GRANT SELECT(id) ON TABLE %s TO ROLE %s',
                     self::$tableName,
-                    self::RESTRICTIVE_DATABASE_ROLE
+                    self::$restrictiveDbRole
                 );
             }
 
             $statements[] = sprintf(
                 'GRANT SELECT ON TABLE %s TO ROLE %s',
                 self::$tableName,
-                self::DATABASE_ROLE
+                self::$dbRole
             );
 
             self::$database->updateDdlBatch($statements)->pollUntilComplete();

Spanner/tests/System/DatabaseRoleTrait.php

@@ -24,14 +24,17 @@
  */
 trait DatabaseRoleTrait
 {
+    private static $restrictiveDbRole = 'restrictiveReaderRole';
+    private static $dbRole = 'readerRole';
+
     abstract public static function setUpBeforeClass();
 
     public function dbProvider()
     {
         self::setUpTestFixtures();
         return [
-            [self::RESTRICTIVE_DATABASE_ROLE, 'PERMISSION_DENIED'],
-            [self::DATABASE_ROLE, null]
+            [self::$restrictiveDbRole, 'PERMISSION_DENIED'],
+            [self::$dbRole, null]
         ];
     }
 

Spanner/tests/System/PgBatchTest.php

@@ -30,8 +30,8 @@
  */
 class PgBatchTest extends SystemTestCase
 {
-    use DatabaseRoleTrait;
     use PgSystemTestCaseTrait;
+    use DatabaseRoleTrait;
 
     private static $tableName;
     private static $hasSetupBatch = false;
@@ -63,20 +63,20 @@ public static function setUpTestFixtures(): void
 
         if (self::$database->info()['databaseDialect'] == DatabaseDialect::POSTGRESQL) {
             $statements = [
-                sprintf('CREATE ROLE %s', self::DATABASE_ROLE),
-                sprintf('CREATE ROLE %s', self::RESTRICTIVE_DATABASE_ROLE),
+                sprintf('CREATE ROLE %s', self::$dbRole),
+                sprintf('CREATE ROLE %s', self::$restrictiveDbRole),
             ];
 
             if (!self::isEmulatorUsed()) {
                 $statements[] = sprintf(
                     'GRANT SELECT(id) ON TABLE %s TO %s',
                     self::$tableName,
-                    self::RESTRICTIVE_DATABASE_ROLE
+                    self::$restrictiveDbRole
                 );
                 $statements[] = sprintf(
                     'GRANT SELECT ON TABLE %s TO %s',
                     self::$tableName,
-                    self::DATABASE_ROLE
+                    self::$dbRole
                 );
             }