refactor

Author: alkatrivedi

system-test/spanner.ts

@@ -296,6 +296,68 @@ describe('Spanner', () => {
     }
   });
 
+  describe('Autogenerated Admin Client', async () => {
+    const instanceAdminClient = spanner.getInstanceAdminClient();
+    const databaseAdminClient = spanner.getDatabaseAdminClient();
+
+    describe('Instances', () => {
+      it('should have created the instance', async () => {
+        assert(projectId);
+        try {
+          const [metadata] = await instanceAdminClient.getInstance({
+            name: instanceAdminClient.instancePath(projectId, instanceId),
+          });
+          assert.strictEqual(
+            metadata!.name,
+            instanceAdminClient.instancePath(projectId, instanceId)
+          );
+        } catch (err) {
+          if (!err) {
+            assert.ifError(err);
+          }
+        }
+      });
+
+      it('should list the instances', async () => {
+        assert(projectId);
+        const [instances] = await instanceAdminClient.listInstances({
+          parent: instanceAdminClient.projectPath(projectId),
+        });
+        assert(instances!.length > 0);
+      });
+    });
+
+    describe('Databases', () => {
+      async function createDatabase(database, dialect) {
+        assert(projectId);
+        const [metadata] = await databaseAdminClient.getDatabase({
+          name: databaseAdminClient.databasePath(
+            projectId,
+            instanceId,
+            database
+          ),
+        });
+        assert.strictEqual(
+          metadata!.name,
+          databaseAdminClient.databasePath(projectId, instanceId, database)
+        );
+        assert.strictEqual(metadata!.state, 'READY');
+        if (IS_EMULATOR_ENABLED) {
+          assert.strictEqual(
+            metadata!.databaseDialect,
+            'DATABASE_DIALECT_UNSPECIFIED'
+          );
+        } else {
+          assert.strictEqual(metadata!.databaseDialect, dialect);
+        }
+      }
+
+      it('GOOGLE_STANDARD_SQL should have created the database', async () => {
+        createDatabase(DATABASE, 'GOOGLE_STANDARD_SQL');
+      });
+    });
+  });
+
   describe('types', () => {
     const TABLE_NAME = 'TypeCheck';
     let googleSqlTable;
@@ -3319,14 +3381,6 @@ describe('Spanner', () => {
         postgreSqlDatabase2 = instance.database(postgreSqlDatabase2Id);
         RESOURCES_TO_CLEAN.push(postgreSqlDatabase2);
       }
-      // Initialize a database instance to restore to.
-      // const googleSqlRestoreDatabaseId = generateName('database');
-      // await creategSQLDatabase(googleSqlRestoreDatabaseId, null);
-      // googleSqlRestoreDatabase = instance.database(googleSqlRestoreDatabaseId);
-
-      // const postgreSqlRestoreDatabaseId = generateName('pg-db');
-      // await createPostgresDatabase(postgreSqlRestoreDatabaseId);
-      // postgreSqlRestoreDatabase = instance.database(postgreSqlRestoreDatabaseId);
 
       // Create backups.
       await createBackup(