Fixes a few tests

Author: Takashi Matsuo

appengine/flexible/metadata/test/DeployTest.php

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-namespace Google\Cloud\Samples\AppEngine\Datastore;
+namespace Google\Cloud\Samples\AppEngine\Metadata;
 
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
 
@@ -24,27 +24,23 @@ class DeployTest extends \PHPUnit_Framework_TestCase
 
     public function testIndex()
     {
-        $client = $this->createClient();
+        $resp = $this->client->get('/');
 
-        $crawler = $client->request('GET', '/');
-
-        $this->assertTrue($client->getResponse()->isOk());
-        $this->assertRegExp(
-            '/External IP: .*/',
-            $client->getResponse()->getBody()
-        );
+        $this->assertEquals(
+            '200',
+            $resp->getStatusCode(),
+            'Top page status code should be 200');
+        $this->assertRegExp('/External IP: .*/', (string) $resp->getBody());
     }
 
     public function testCurl()
     {
-        $client = $this->createClient();
-
-        $crawler = $client->request('GET', '/curl');
+        $resp = $this->client->get('/curl');
 
-        $this->assertTrue($client->getResponse()->isOk());
-        $this->assertRegExp(
-            '/External IP: .*/',
-            $client->getResponse()->getBody()
-        );
+        $this->assertEquals(
+            '200',
+            $resp->getStatusCode(),
+            '/curl status code should be 200');
+        $this->assertRegExp('/External IP: .*/', (string) $resp->getBody());
     }
 }

datastore/tutorial/test/FunctionsTest.php

@@ -89,17 +89,17 @@ public function testListTasks()
             $result = list_tasks(self::$datastore);
             $found = 0;
             foreach ($result as $task) {
-                $this->assertEquals('buy milk', $task['description']);
-                $this->assertInstanceOf(
-                    \DateTimeInterface::class,
-                    $task['created']
-                );
-                $this->assertEquals(false, $task['done']);
-                $this->assertEquals('buy milk', $task['description']);
-                $this->assertArrayHasKey('id', $task->key()->pathEnd());
-                $found += 1;
+                if ($task['description'] === 'buy milk') {
+                    $this->assertInstanceOf(
+                        \DateTimeInterface::class,
+                        $task['created']
+                    );
+                    $this->assertEquals(false, $task['done']);
+                    $this->assertArrayHasKey('id', $task->key()->pathEnd());
+                    $found += 1;
+                }
             }
-            $this->assertEquals(1, $found);
+            $this->assertEquals(1, $found, 'It should list a new task.');
         });
     }
 

kms/api/test/KeyCommandTest.php

@@ -32,9 +32,11 @@ public function setUp()
         if (!$projectId = getenv('GOOGLE_PROJECT_ID')) {
             return $this->markTestSkipped('Set the GOOGLE_PROJECT_ID environment variable');
         }
-
+        if (!$ring = getenv('GOOGLE_KMS_KEYRING')) {
+            return $this->markTestSkipped('Set the GOOGLE_KMS_KEYRING environment variable');
+        }
         $this->projectId = $projectId;
-        $this->ring = getenv('GOOGLE_KMS_KEYRING');
+        $this->ring = $ring;
         $application = new Application();
         $application->add(new KeyCommand());
         $this->commandTester = new CommandTester($application->get('key'));