Test Fixes (GoogleCloudPlatform#444)

Author: bshaffer

.travis.yml

@@ -24,7 +24,8 @@ matrix:
   include:
     - php: 5.6
       env: RUN_DEVSERVER_TESTS=true RUN_CS_FIXER=true
-    - php: 7.0
+    - php: 7.0.8
+    - php: 7.1
 
 env:
   global:

dlp/test/dlpTest.php

@@ -96,7 +96,7 @@ public function testListInfoTypes()
 
         // list info types by category
         $output = $this->runCommand('list-info-types', [
-            'category' => 'PII'
+            'category' => 'GOVERNMENT'
         ]);
 
         $this->assertContains('US_DEA_NUMBER', $output);

testing/run_test_suite.sh

@@ -46,7 +46,7 @@ do
     pushd ${DIR}
     if [ -f "composer.json" ]; then
         # install composer dependencies
-        composer install
+        composer install -q
     fi
     echo "running phpunit in ${DIR}"
     if [ -f "vendor/bin/phpunit" ]; then

video/test/quickstartTest.php

@@ -29,6 +29,6 @@ public function testQuickstart()
     {
         // Invoke quickstart.php
         include __DIR__ . '/../quickstart.php';
-        $this->expectOutputRegex('/Cat/');
+        $this->expectOutputRegex('/cat/');
     }
 }

video/test/videoTest.php

@@ -43,15 +43,15 @@ public function testAnalyzeFaces()
     public function testAnalyzeLabels()
     {
         $output = $this->runCommand('labels', ['uri' => self::$gcsUri]);
-        $this->assertContains('Cat', $output);
+        $this->assertContains('cat', $output);
     }
 
     public function testAnalyzeLabelsInFile()
     {
         $output = $this->runCommand('labels-in-file', [
             'file' => __DIR__ . '/data/cat_shortened.mp4'
         ]);
-        $this->assertContains('Cat', $output);
+        $this->assertContains('cat', $output);
     }
 
     public function testAnalyzeSafeSearch()

vision/test/quickstartTest.php

@@ -36,8 +36,7 @@ public function testQuickstart()
 
         // Make sure it looks correct
         $this->assertTrue(is_array($labels));
-        $this->assertEquals(5, count($labels));
-
+        $this->assertTrue(count($labels) > 0);
         $this->expectOutputRegex('/cat/');
     }
 }

vision/test/visionTest.php

@@ -271,7 +271,6 @@ public function testDetectWebCommand()
         $output = $this->runCommand('web', $path);
         $this->assertContains('Web Entities found:', $output);
         $this->assertContains('Palace of Fine Arts Theatre', $output);
-        $this->assertContains('Pier 39', $output);
     }
 
     public function testDetectWebCommandGcs()
@@ -283,7 +282,6 @@ public function testDetectWebCommandGcs()
         $output = $this->runCommand('web', $path);
         $this->assertContains('Web Entities found:', $output);
         $this->assertContains('Palace of Fine Arts Theatre', $output);
-        $this->assertContains('Pier 39', $output);
     }
 
     private function runCommand($commandName, $path, $output=null)