Refactored tests (#769)

* Refactored tests * Use assertLessThanOrEqual or assertGreaterThanOrEqual * Use assertContains and assertNotContains when comparing string * Use assertStringEqualsFile when comparing file and string * Use assertInternalType when checking types * Use assertContains instead in_array * Use assertInstanceOf
googleapis · Dec 4, 2017 · 385e3ef · 385e3ef
1 parent 288c3da
commit 385e3ef
Show file tree

Hide file tree

Showing 50 changed files with 165 additions and 165 deletions.
diff --git a/tests/snippets/Core/Iam/PolicyBuilderTest.php b/tests/snippets/Core/Iam/PolicyBuilderTest.php
@@ -39,7 +39,7 @@ public function testClass()
         $snippet = $this->snippetFromClass(PolicyBuilder::class);
         $res = $snippet->invoke('result');
 
-        $this->assertTrue(is_array($res->returnVal()));
+        $this->assertInternalType('array', $res->returnVal());
     }
 
     public function testSetBindings()
@@ -97,6 +97,6 @@ public function testResult()
         $snippet->addLocal('builder', $this->pb);
 
         $res = $snippet->invoke('policy');
-        $this->assertTrue(is_array($res->returnVal()));
+        $this->assertInternalType('array', $res->returnVal());
     }
 }
diff --git a/tests/snippets/Datastore/DatastoreClientTest.php b/tests/snippets/Datastore/DatastoreClientTest.php
@@ -131,7 +131,7 @@ public function testKeys()
         $snippet->addLocal('datastore', $this->client);
 
         $res = $snippet->invoke('keys');
-        $this->assertTrue(is_array($res->returnVal()));
+        $this->assertInternalType('array', $res->returnVal());
         $this->assertEquals(10, count($res->returnVal()));
         $this->assertInstanceOf(Key::class, $res->returnVal()[0]);
         $this->assertEquals('Person', $res->returnVal()[0]->keyObject()['path'][0]['kind']);
@@ -144,7 +144,7 @@ public function testKeysWithAncestors()
 
         $res = $snippet->invoke('keys');
 
-        $this->assertTrue(is_array($res->returnVal()));
+        $this->assertInternalType('array', $res->returnVal());
         $this->assertEquals(3, count($res->returnVal()));
         $this->assertInstanceOf(Key::class, $res->returnVal()[0]);
 

diff --git a/tests/snippets/PubSub/MessageTest.php b/tests/snippets/PubSub/MessageTest.php
@@ -158,6 +158,6 @@ public function testInfo()
         $snippet->addLocal('message', $this->message);
 
         $res = $snippet->invoke('info');
-        $this->assertTrue(is_array($res->returnVal()));
+        $this->assertInternalType('array', $res->returnVal());
     }
 }
diff --git a/tests/snippets/Spanner/KeySetTest.php b/tests/snippets/Spanner/KeySetTest.php
@@ -99,7 +99,7 @@ public function testAddKey()
         $this->assertEmpty($this->keyset->keys());
 
         $res = $snippet->invoke();
-        $this->assertEquals(1, count($this->keyset->keys()));
+        $this->assertCount(1, $this->keyset->keys());
     }
 
     public function testSetKeys()
@@ -110,7 +110,7 @@ public function testSetKeys()
         $this->assertEmpty($this->keyset->keys());
 
         $res = $snippet->invoke();
-        $this->assertEquals(2, count($this->keyset->keys()));
+        $this->assertCount(2, $this->keyset->keys());
     }
 
     public function testMatchAll()

diff --git a/tests/snippets/Storage/StorageObjectTest.php b/tests/snippets/Storage/StorageObjectTest.php
@@ -388,9 +388,9 @@ public function testSignedUrl()
         $this->object->___setProperty('connection', $conn->reveal());
 
         $res = $snippet->invoke('url');
-        $this->assertTrue(strpos($res->returnVal(), 'https://storage.googleapis.com/my-bucket/my-object') !== false);
-        $this->assertTrue(strpos($res->returnVal(), 'Expires=') !== false);
-        $this->assertTrue(strpos($res->returnVal(), 'Signature=') !== false);
+        $this->assertContains('https://storage.googleapis.com/my-bucket/my-object', $res->returnVal());
+        $this->assertContains('Expires=', $res->returnVal());
+        $this->assertContains('Signature=', $res->returnVal());
     }
 
     public function testSignedUrlUpdate()
@@ -414,9 +414,9 @@ public function testSignedUrlUpdate()
         $this->object->___setProperty('connection', $conn->reveal());
 
         $res = $snippet->invoke('url');
-        $this->assertTrue(strpos($res->returnVal(), 'https://storage.googleapis.com/my-bucket/my-object') !== false);
-        $this->assertTrue(strpos($res->returnVal(), 'Expires=') !== false);
-        $this->assertTrue(strpos($res->returnVal(), 'Signature=') !== false);
+        $this->assertContains('https://storage.googleapis.com/my-bucket/my-object', $res->returnVal());
+        $this->assertContains('Expires=', $res->returnVal());
+        $this->assertContains('Signature=', $res->returnVal());
     }
 
     public function testSignedUploadUrl()
@@ -440,9 +440,9 @@ public function testSignedUploadUrl()
         $this->object->___setProperty('connection', $conn->reveal());
 
         $res = $snippet->invoke('url');
-        $this->assertTrue(strpos($res->returnVal(), 'https://storage.googleapis.com/my-bucket/my-object') !== false);
-        $this->assertTrue(strpos($res->returnVal(), 'Expires=') !== false);
-        $this->assertTrue(strpos($res->returnVal(), 'Signature=') !== false);
+        $this->assertContains('https://storage.googleapis.com/my-bucket/my-object', $res->returnVal());
+        $this->assertContains('Expires=', $res->returnVal());
+        $this->assertContains('Signature=', $res->returnVal());
     }
 
     public function testBeginSignedUploadSession()

diff --git a/tests/snippets/Vision/AnnotationTest.php b/tests/snippets/Vision/AnnotationTest.php
@@ -198,6 +198,6 @@ public function testError()
         ]));
 
         $res = $snippet->invoke('error');
-        $this->assertTrue(is_array($res->returnVal()));
+        $this->assertInternalType('array', $res->returnVal());
     }
 }
diff --git a/tests/system/Datastore/AllocateKeyTest.php b/tests/system/Datastore/AllocateKeyTest.php
@@ -29,7 +29,7 @@ public function testAllocateId()
         $key = self::$client->key($kind);
         $path = self::$client->allocateId($key)->path()[0];
 
-        $this->assertTrue(is_numeric($path['id']));
+        $this->assertInternalType('numeric', $path['id']);
         $this->assertEquals($kind, $path['kind']);
     }
 
@@ -41,7 +41,7 @@ public function testAllocateIds()
 
         foreach ($allocatedKeys as $key) {
             $path = $key->path()[0];
-            $this->assertTrue(is_numeric($path['id']));
+            $this->assertInternalType('numeric', $path['id']);
             $this->assertEquals($kind, $path['kind']);
         }
     }

diff --git a/tests/system/ServiceWhitelist/WhitelistTest.php b/tests/system/ServiceWhitelist/WhitelistTest.php
@@ -150,6 +150,6 @@ private function checkException(callable $call)
 
         $this->assertTrue($thrown);
         $this->assertInstanceOf(NotFoundException::class, $ex);
-        $this->assertTrue(strpos($ex->getMessage(), self::MESSAGE) !== false);
+        $this->assertContains(self::MESSAGE, $ex->getMessage());
     }
 }
diff --git a/tests/system/Spanner/ReadTest.php b/tests/system/Spanner/ReadTest.php
@@ -84,8 +84,8 @@ public function testRangeReadSingleKeyOpen()
 
         $res = $db->read(self::$rangeTableName, $keyset, array_keys(self::$dataset[0]));
         $rows = iterator_to_array($res->rows());
-        $this->assertFalse(in_array(self::$dataset[0], $rows));
-        $this->assertFalse(in_array(self::$dataset[10], $rows));
+        $this->assertNotContains(self::$dataset[0], $rows);
+        $this->assertNotContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -106,8 +106,8 @@ public function testRangeReadSingleKeyClosed()
 
         $res = $db->read(self::$rangeTableName, $keyset, array_keys(self::$dataset[0]));
         $rows = iterator_to_array($res->rows());
-        $this->assertTrue(in_array(self::$dataset[0], $rows));
-        $this->assertTrue(in_array(self::$dataset[10], $rows));
+        $this->assertContains(self::$dataset[0], $rows);
+        $this->assertContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -127,8 +127,8 @@ public function testRangeReadSingleKeyOpenClosed()
 
         $res = $db->read(self::$rangeTableName, $keyset, array_keys(self::$dataset[0]));
         $rows = iterator_to_array($res->rows());
-        $this->assertFalse(in_array(self::$dataset[0], $rows));
-        $this->assertTrue(in_array(self::$dataset[10], $rows));
+        $this->assertNotContains(self::$dataset[0], $rows);
+        $this->assertContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -148,8 +148,8 @@ public function testRangeReadSingleKeyClosedOpen()
 
         $res = $db->read(self::$rangeTableName, $keyset, array_keys(self::$dataset[0]));
         $rows = iterator_to_array($res->rows());
-        $this->assertTrue(in_array(self::$dataset[0], $rows));
-        $this->assertFalse(in_array(self::$dataset[10], $rows));
+        $this->assertContains(self::$dataset[0], $rows);
+        $this->assertNotContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -168,8 +168,8 @@ public function testRangeReadPartialKeyOpen()
 
         $res = $db->read(self::$rangeTableName, $keyset, array_keys(self::$dataset[0]));
         $rows = iterator_to_array($res->rows());
-        $this->assertFalse(in_array(self::$dataset[0], $rows));
-        $this->assertFalse(in_array(self::$dataset[10], $rows));
+        $this->assertNotContains(self::$dataset[0], $rows);
+        $this->assertNotContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -190,8 +190,8 @@ public function testRangeReadPartialKeyClosed()
 
         $res = $db->read(self::$rangeTableName, $keyset, array_keys(self::$dataset[0]));
         $rows = iterator_to_array($res->rows());
-        $this->assertTrue(in_array(self::$dataset[0], $rows));
-        $this->assertTrue(in_array(self::$dataset[10], $rows));
+        $this->assertContains(self::$dataset[0], $rows);
+        $this->assertContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -212,8 +212,8 @@ public function testRangeReadIndexSingleKeyOpen()
             'index' => $this->getIndexName(self::$rangeTableName, 'complex')
         ]);
         $rows = iterator_to_array($res->rows());
-        $this->assertFalse(in_array(self::$dataset[0], $rows));
-        $this->assertFalse(in_array(self::$dataset[10], $rows));
+        $this->assertNotContains(self::$dataset[0], $rows);
+        $this->assertNotContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -236,8 +236,8 @@ public function testRangeReadIndexSingleKeyClosed()
             'index' => $this->getIndexName(self::$rangeTableName, 'complex')
         ]);
         $rows = iterator_to_array($res->rows());
-        $this->assertTrue(in_array(self::$dataset[0], $rows));
-        $this->assertTrue(in_array(self::$dataset[10], $rows));
+        $this->assertContains(self::$dataset[0], $rows);
+        $this->assertContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -259,8 +259,8 @@ public function testRangeReadIndexSingleKeyOpenClosed()
             'index' => $this->getIndexName(self::$rangeTableName, 'complex')
         ]);
         $rows = iterator_to_array($res->rows());
-        $this->assertFalse(in_array(self::$dataset[0], $rows));
-        $this->assertTrue(in_array(self::$dataset[10], $rows));
+        $this->assertNotContains(self::$dataset[0], $rows);
+        $this->assertContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -282,8 +282,8 @@ public function testRangeReadIndexSingleKeyClosedOpen()
             'index' => $this->getIndexName(self::$rangeTableName, 'complex')
         ]);
         $rows = iterator_to_array($res->rows());
-        $this->assertTrue(in_array(self::$dataset[0], $rows));
-        $this->assertFalse(in_array(self::$dataset[10], $rows));
+        $this->assertContains(self::$dataset[0], $rows);
+        $this->assertNotContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -304,8 +304,8 @@ public function testRangeReadIndexPartialKeyOpen()
             'index' => $this->getIndexName(self::$rangeTableName, 'complex')
         ]);
         $rows = iterator_to_array($res->rows());
-        $this->assertFalse(in_array(self::$dataset[0], $rows));
-        $this->assertFalse(in_array(self::$dataset[10], $rows));
+        $this->assertNotContains(self::$dataset[0], $rows);
+        $this->assertNotContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -328,8 +328,8 @@ public function testRangeReadIndexPartialKeyClosed()
             'index' => $this->getIndexName(self::$rangeTableName, 'complex')
         ]);
         $rows = iterator_to_array($res->rows());
-        $this->assertTrue(in_array(self::$dataset[0], $rows));
-        $this->assertTrue(in_array(self::$dataset[10], $rows));
+        $this->assertContains(self::$dataset[0], $rows);
+        $this->assertContains(self::$dataset[10], $rows);
     }
 
     /**
@@ -398,8 +398,8 @@ public function testReadPoint()
         $res = $db->read(self::$readTableName, $keyset, array_keys($dataset[0]));
         $rows = $res->rows();
         foreach ($rows as $index => $row) {
-            $this->assertTrue(in_array($row, $dataset));
-            $this->assertTrue(in_array($row, $points));
+            $this->assertContains($row, $dataset);
+            $this->assertContains($row, $points);
         }
     }
 
@@ -428,8 +428,8 @@ public function testReadPointOverIndex()
         ]);
         $rows = $res->rows();
         foreach ($rows as $index => $row) {
-            $this->assertTrue(in_array($row, $dataset));
-            $this->assertTrue(in_array($row, $points));
+            $this->assertContains($row, $dataset);
+            $this->assertContains($row, $points);
         }
     }
 

diff --git a/tests/system/Spanner/TransactionTest.php b/tests/system/Spanner/TransactionTest.php
@@ -107,7 +107,7 @@ public function testConcurrentTransactionsIncrementValueWithRead()
         ])->rows()->current();
 
         $this->assertEquals(2, $row['number']);
-        $this->assertTrue($iterations > 2);
+        $this->assertGreaterThan(2, $iterations);
     }
 
     /**
@@ -194,7 +194,7 @@ public function testConcurrentTransactionsIncrementValueWithExecute()
         ])->rows()->current();
 
         $this->assertEquals(2, $row['number']);
-        $this->assertTrue($iterations > 2);
+        $this->assertGreaterThan(2, $iterations);
     }
 
     public function testStrongRead()

diff --git a/tests/system/Storage/ManageObjectsTest.php b/tests/system/Storage/ManageObjectsTest.php
@@ -141,7 +141,7 @@ public function testDownloadsAsString()
     {
         $content = self::$object->downloadAsString();
 
-        $this->assertTrue(is_string($content));
+        $this->assertInternalType('string', $content);
     }
 
     public function testDownloadsAsStream()

diff --git a/tests/system/Storage/StreamWrapper/DirectoryTest.php b/tests/system/Storage/StreamWrapper/DirectoryTest.php
@@ -37,15 +37,15 @@ public function testMkDir()
     {
         $dir = self::generateUrl('test_directory');
         $this->assertTrue(mkdir($dir));
-        $this->assertTrue(file_exists($dir . '/'));
+        $this->assertFileExists($dir . '/');
         $this->assertTrue(is_dir($dir . '/'));
     }
 
     public function testRmDir()
     {
         $dir = self::generateUrl('test_directory/');
         $this->assertTrue(rmdir($dir));
-        $this->assertFalse(file_exists($dir . '/'));
+        $this->assertFileNotExists($dir . '/');
     }
 
     public function testMkDirCreatesBucket()

diff --git a/tests/system/Storage/StreamWrapper/ImageTest.php b/tests/system/Storage/StreamWrapper/ImageTest.php
@@ -65,7 +65,7 @@ public function testGetImageSizeWithInfo($image, $width, $height)
         $size = getimagesize($url, $info);
         $this->assertEquals($width, $size[0]);
         $this->assertEquals($height, $size[1]);
-        $this->assertTrue(count(array_keys($info)) > 1);
+        $this->assertGreaterThan(1, array_keys($info));
     }
 
     public function imageProvider()

diff --git a/tests/system/Storage/StreamWrapper/ReadTest.php b/tests/system/Storage/StreamWrapper/ReadTest.php
@@ -40,7 +40,7 @@ public function testFread()
 
     public function testFileGetContents()
     {
-        $this->assertEquals('somedata', file_get_contents($this->file));
+        $this->assertStringEqualsFile($this->file, 'somedata');
     }
 
     public function testGetLines()

diff --git a/tests/system/Storage/StreamWrapper/RenameTest.php b/tests/system/Storage/StreamWrapper/RenameTest.php
@@ -39,7 +39,7 @@ public function testRenameFile()
         $oldFile = self::generateUrl(self::TEST_FILE);
         $newFile = self::generateUrl(self::NEW_TEST_FILE);
         $this->assertTrue(rename($oldFile, $newFile));
-        $this->assertTrue(file_exists($newFile));
+        $this->assertFileExists($newFile);
     }
 
     public function testRenameDirectory()
@@ -48,7 +48,7 @@ public function testRenameDirectory()
         $newFolder = self::generateUrl('new_folder');
         $newFile = $newFolder . '/bar.txt';
         $this->assertTrue(rename($oldFolder, $newFolder));
-        $this->assertTrue(file_exists($newFile));
+        $this->assertFileExists($newFile);
     }
 
 }
diff --git a/tests/system/Storage/StreamWrapper/UrlStatTest.php b/tests/system/Storage/StreamWrapper/UrlStatTest.php
@@ -74,8 +74,8 @@ public function testIsReadable()
 
     public function testFileExists()
     {
-        $this->assertTrue(file_exists(self::$dirUrl));
-        $this->assertTrue(file_exists(self::$fileUrl));
+        $this->assertFileExists(self::$dirUrl);
+        $this->assertFileExists(self::$fileUrl);
     }
 
     public function testIsLink()