Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion dlp/test/dlpTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion testing/run_test_suite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion video/test/quickstartTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ public function testQuickstart()
{
// Invoke quickstart.php
include __DIR__ . '/../quickstart.php';
$this->expectOutputRegex('/Cat/');
$this->expectOutputRegex('/cat/');
}
}
4 changes: 2 additions & 2 deletions video/test/videoTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 1 addition & 2 deletions vision/test/quickstartTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/');
}
}
2 changes: 0 additions & 2 deletions vision/test/visionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
Expand Down