Fixing BigQuery and Logging tests (GoogleCloudPlatform#157)

Also updated coverage configs

Author: Takashi Matsuo

bigquery/api/phpunit.xml.dist

@@ -26,6 +26,7 @@
     <filter>
         <whitelist>
             <file>bigquery.php</file>
+	    <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
 </phpunit>

bigquery/api/src/QueryCommand.php

@@ -66,7 +66,7 @@ protected function configure()
                 'run the query syncronously'
             )
             ->addOption(
-                'standardSql',
+                'standard-sql',
                 null,
                 InputOption::VALUE_NONE,
                 'run the query using standard SQL instead of legacy SQL syntax'
@@ -96,12 +96,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 run_query(
                     $projectId,
                     $query,
-                    !$input->getOption('standardSql'));
+                    !$input->getOption('standard-sql'));
             } else {
                 run_query_as_job(
                     $projectId,
                     $query,
-                    !$input->getOption('standardSql'));
+                    !$input->getOption('standard-sql'));
             }
         } catch (BadRequestException $e) {
             $response = $e->getServiceException()->getResponse();

bigquery/api/test/QueryCommandTest.php

@@ -130,7 +130,8 @@ public function testQueryStandardSql()
               'query' => $query,
               '--project' => $projectId,
               '--sync',
-              '--standardSql'],
+              '--standard-sql' => true
+            ],
             ['interactive' => false]
         );
 
@@ -186,7 +187,11 @@ public function testQueryAsJobStandardSql()
         $application->add(new QueryCommand());
         $commandTester = new CommandTester($application->get('query'));
         $commandTester->execute(
-            ['query' => $query, '--project' => $projectId, '--standardSql'],
+            [
+                'query' => $query,
+                '--project' => $projectId,
+                '--standard-sql' => true
+            ],
             ['interactive' => false]
         );
 

logging/phpunit.xml.dist

@@ -16,7 +16,7 @@
 -->
 <phpunit bootstrap="test/bootstrap.php">
     <testsuites>
-        <testsuite name="Google Stackdriver Logging Cloud library Tests">
+        <testsuite name="Stackdriver Logging Cloud library Tests">
             <directory>test</directory>
         </testsuite>
     </testsuites>
@@ -25,7 +25,7 @@
     </logging>
     <filter>
         <whitelist>
-            <dir>src</dir>
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
 </phpunit>

logging/src/BaseCommand.php

@@ -20,6 +20,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * A base class for commands which needs project id.
@@ -50,7 +51,7 @@ protected function addCommonOptions()
         );
     }
 
-    protected function interact(InputInterface $input)
+    protected function interact(InputInterface $input, OutputInterface $output)
     {
         if (empty($input->getOption("project"))) {
             throw new \Exception("Project ID not specified");

testing/run_test_suite.sh

@@ -20,8 +20,8 @@ if [ "${RUN_CS_FIXER}" = "true" ]; then
     ${HOME}/php-cs-fixer fix --dry-run --diff
 fi
 
-# loop through all directories containing "phpunit.xml" and run them
-find * -name phpunit.xml -not -path '*/vendor/*' -exec dirname {} \; | while read DIR
+# loop through all directories containing "phpunit.xml*" and run them
+find * -name 'phpunit.xml*' -not -path '*/vendor/*' -exec dirname {} \; | while read DIR
 do
     pushd ${DIR}
     if [ -f "composer.json" ]; then