Fix tests

Author: Frank Natividad

storage/src/activate_hmac_key.php

@@ -41,7 +41,7 @@ function activate_hmac_key($accessId, $projectId)
 
     $hmacKey->update('ACTIVE');
 
-    print("The HMAC key is now active.");
-    printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info()));
+    print("The HMAC key is now active." . PHP_EOL);
+    printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info(), true));
 }
 # [END storage_activate_hmac_key]

storage/src/create_hmac_key.php

@@ -39,8 +39,8 @@ function create_hmac_key($serviceAccountEmail, $projectId)
     // By default createHmacKey will use the projectId used by StorageClient().
     $hmacKeyCreated = $storage->createHmacKey($serviceAccountEmail, ['projectId' => $projectId]);
 
-    printf("The base64 encoded secret is: %s", $hmacKeyCreated->secret());
-    print("Do not miss that secret, there is no API to recover it.");
-    printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKeyCreated->hmacKey()->info()));
+    printf("The base64 encoded secret is: %s" . PHP_EOL, $hmacKeyCreated->secret());
+    print("Do not miss that secret, there is no API to recover it." . PHP_EOL);
+    printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKeyCreated->hmacKey()->info(), true));
 }
 # [END storage_create_hmac_key]

storage/src/deactivate_hmac_key.php

@@ -41,7 +41,7 @@ function deactivate_hmac_key($accessId, $projectId)
 
     $hmacKey->update('INACTIVE');
 
-    print("The HMAC key is now inactive.");
-    printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info()));
+    print("The HMAC key is now inactive." . PHP_EOL);
+    printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info(), true));
 }
 # [END storage_deactivate_hmac_key]

storage/src/delete_hmac_key.php

@@ -40,6 +40,6 @@ function delete_hmac_key($accessId, $projectId)
     $hmacKey = $storage->hmacKey($accessId, $projectId);
 
     $hmacKey->delete();
-    print("The key is deleted, though it may still appear in StorageClient.hmacKeys() results.");
+    print("The key is deleted, though it may still appear in StorageClient.hmacKeys() results." . PHP_EOL);
 }
 # [END storage_get_hmac_key]

storage/src/get_hmac_key.php

@@ -38,6 +38,6 @@ function get_hmac_key($accessId, $projectId)
     $storage = new StorageClient();
     $hmacKey = $storage->hmacKey($accessId, $projectId);
 
-    printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info()));
+    printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info(), true));
 }
 # [END storage_get_hmac_key]

storage/src/list_hmac_keys.php

@@ -39,7 +39,7 @@ function list_hmac_keys($projectId)
     $hmacKeys = $storage->hmacKeys(['projectId' => $projectId]);
 
     foreach ($hmacKeys as $hmacKey) {
-        printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info()));
+        printf("HMAC key Metadata: %s" . PHP_EOL, print_r($hmacKey->info(), true));
     }
 }
 # [END storage_list_hmac_keys]

storage/test/HmacCommandTest.php

@@ -49,6 +49,9 @@ public function setUp()
         // Create test key.
         $hmacKeyCreated = $this->storage->createHmacKey($this->hmacServiceAccount, ['projectId' => self::$projectId]);
         $this->accessId = $hmacKeyCreated->hmacKey()->accessId();
+        $this->setOutputCallback(function () {
+          // disable output
+        });
     }
 
     public function tearDown()
@@ -61,7 +64,9 @@ private function deleteAllHmacKeys($serviceAccountEmail)
     {
         $hmacKeys = $this->storage->hmacKeys(['serviceAccountEmail' => $serviceAccountEmail]);
         foreach ($hmacKeys as $hmacKey) {
-            $hmacKey->update('INACTIVE');
+            if ($hmacKey->info()['state'] == 'ACTIVE') {
+                $hmacKey->update('INACTIVE');
+            }
             $hmacKey->delete();
         }
     }
@@ -73,8 +78,7 @@ public function testHmacKeyList()
               'projectId' => self::$projectId
           ],
           ['interactive' => false]);
-        $outputString = "/HMAC key Metadata:/";
-        $this->expectOutputRegex($outputString);
+        $this->assertContains("HMAC key Metadata:", $this->getActualOutput());
     }
 
     /** @depends testHmacKeyList */
@@ -86,8 +90,7 @@ public function testHmacKeyCreate()
             'serviceAccountEmail' => $this->hmacServiceAccount
         ],
         ['interactive' => false]);
-        $outputString = "/The base64 encoded secret is:/";
-        $this->expectOutputRegex($outputString);
+        $this->assertContains("The base64 encoded secret is:", $this->getActualOutput());
     }
 
     /** @depends testHmacKeyCreate */
@@ -100,12 +103,11 @@ public function testHmacKeyGet()
             '--get' => true
         ],
         ['interactive' => false]);
-        $outputString = "/HMAC key Metadata:/";
-        $this->expectOutputRegex($outputString);
+        $this->assertContains("HMAC key Metadata:", $this->getActualOutput());
     }
 
     /** @depends testHmacKeyGet */
-    public function testHmacKeyDeactivate()
+    public function testHmacKeyDeactivateActivate()
     {
         $this->commandTesterManage->execute(
         [
@@ -114,25 +116,17 @@ public function testHmacKeyDeactivate()
             '--deactivate' => true
         ],
         ['interactive' => false]);
-        $outputString = "/The HMAC key is now inactive./";
-        $this->expectOutputRegex($outputString);
-    }
-
-    /** @depends testHmacKeyDeactivate */
-    public function testHmacKeyActivate()
-    {
+        $this->assertContains("The HMAC key is now inactive", $this->getActualOutput());
         $this->commandTesterManage->execute(
-        [
-            'projectId' => self::$projectId,
-            'accessId' => $this->accessId,
-            '--activate' => true
-        ],
-        ['interactive' => false]);
-        $outputString = "/The HMAC key is now active./";
-        $this->expectOutputRegex($outputString);
+          [
+              'projectId' => self::$projectId,
+              'accessId' => $this->accessId,
+              '--activate' => true
+          ],
+          ['interactive' => false]);
+        $this->assertContains("The HMAC key is now active", $this->getActualOutput());
     }
-
-    /** @depends testHmacKeyActivate */
+    /** @depends testHmacKeyDeactivateActivate */
     public function testHmacKeyDelete()
     {
         $this->commandTesterManage->execute(
@@ -149,7 +143,6 @@ public function testHmacKeyDelete()
             '--delete' => true
         ],
         ['interactive' => false]);
-        $outputString = "/The key is deleted, though it may still appear in StorageClient.hmacKeys() results./";
-        $this->expectOutputRegex($outputString);
+        $this->assertContains("The key is deleted,", $this->getActualOutput());
     }
 }