Standardize all tests to use one phpunit and google/cloud-tools (Goog…

…leCloudPlatform#918)
bselcuk · Jun 17, 2019 · 33654dc · 33654dc
1 parent 73439cc
commit 33654dc
Show file tree

Hide file tree

Showing 317 changed files with 612 additions and 1,869 deletions.
diff --git a/.kokoro/docker/php73/Dockerfile b/.kokoro/docker/php73/Dockerfile
@@ -32,10 +32,7 @@ RUN apt-get update && \
             zip \
             zlib1g-dev
 
-RUN wget -nv -O phpunit.phar https://phar.phpunit.de/phpunit-7.phar && \
-    chmod +x phpunit.phar && \
-    mv phpunit.phar /usr/local/bin/phpunit && \
-    ln -s /usr/lib/libc-client.a /usr/lib/x86_64-linux-gnu/libc-client.a && \
+RUN ln -s /usr/lib/libc-client.a /usr/lib/x86_64-linux-gnu/libc-client.a && \
     mkdir ${PHP_DIR} ${PHP_SRC_DIR} && \
     cd ${PHP_SRC_DIR} && \
     wget http://us1.php.net/get/php-7.3.0.tar.bz2/from/this/mirror \
@@ -110,7 +107,7 @@ RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz \
         --command-completion false
 
 # Make composer and gcloud bins available via the PATH variable
-ENV PATH="$PATH:/opt/composer/vendor/bin:/root/google-cloud-sdk/bin"
+ENV PATH="$PATH:/root/google-cloud-sdk/bin:/root/.composer/vendor/bin"
 
 # Configure Google Cloud SDK
 RUN gcloud config set app/promote_by_default false && \

diff --git a/.kokoro/system_tests.sh b/.kokoro/system_tests.sh
@@ -55,5 +55,8 @@ if [ "${RUN_CS_CHECK}" = "true" ]; then
   bash testing/run_cs_check.sh
 fi
 
+# Install global test dependencies
+bash testing/composer.sh
+
 # Run tests
 bash testing/run_test_suite.sh
diff --git a/appengine/flexible/analytics/composer.json b/appengine/flexible/analytics/composer.json
@@ -4,8 +4,5 @@
         "twig/twig": "^1.24",
         "guzzlehttp/guzzle": "^6.3",
         "symfony/css-selector": "^3.1"
-    },
-    "require-dev": {
-        "google/cloud-tools": "^0.6"
     }
 }
diff --git a/appengine/flexible/analytics/phpunit.xml.dist b/appengine/flexible/analytics/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php" colors="true">
+<phpunit bootstrap="../../../testing/bootstrap.php" colors="true">
     <php>
         <env name="GA_TRACKING_ID" value="UA-78971600-1"/>
     </php>

diff --git a/appengine/flexible/analytics/test/DeployTest.php b/appengine/flexible/analytics/test/DeployTest.php
@@ -17,8 +17,9 @@
 namespace Google\Cloud\Samples\AppEngine\Analytics;
 
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
+use PHPUnit\Framework\TestCase;
 
-class DeployTest extends \PHPUnit_Framework_TestCase
+class DeployTest extends TestCase
 {
     use AppEngineDeploymentTrait;
 

diff --git a/appengine/flexible/analytics/test/bootstrap.php b/appengine/flexible/analytics/test/bootstrap.php
diff --git a/appengine/flexible/cloudsql-mysql/composer.json b/appengine/flexible/cloudsql-mysql/composer.json
@@ -4,7 +4,6 @@
         "google/apiclient": "^2.0"
     },
     "require-dev": {
-        "google/cloud-tools": "^0.6",
         "paragonie/random_compat": "^2.0"
     }
 }
diff --git a/appengine/flexible/cloudsql-mysql/phpunit.xml.dist b/appengine/flexible/cloudsql-mysql/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
+<phpunit bootstrap="../../../testing/bootstrap.php" colors="true">
     <testsuites>
         <testsuite>
             <directory>test</directory>

diff --git a/appengine/flexible/cloudsql-mysql/test/DeployTest.php b/appengine/flexible/cloudsql-mysql/test/DeployTest.php
@@ -18,9 +18,10 @@
 
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
 use Google\Cloud\TestUtils\FileUtil;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Yaml\Yaml;
 
-class DeployTest extends \PHPUnit_Framework_TestCase
+class DeployTest extends TestCase
 {
     use AppEngineDeploymentTrait;
 

diff --git a/appengine/flexible/cloudsql-mysql/test/bootstrap.php b/appengine/flexible/cloudsql-mysql/test/bootstrap.php
diff --git a/appengine/flexible/cloudsql-postgres/composer.json b/appengine/flexible/cloudsql-postgres/composer.json
@@ -4,7 +4,6 @@
         "google/apiclient": "^2.0"
     },
     "require-dev": {
-        "google/cloud-tools": "^0.6",
         "paragonie/random_compat": "^2.0"
     }
 }
diff --git a/appengine/flexible/cloudsql-postgres/phpunit.xml.dist b/appengine/flexible/cloudsql-postgres/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
+<phpunit bootstrap="../../../testing/bootstrap.php" colors="true">
     <testsuites>
         <testsuite>
             <directory>test</directory>

diff --git a/appengine/flexible/cloudsql-postgres/test/DeployTest.php b/appengine/flexible/cloudsql-postgres/test/DeployTest.php
@@ -18,9 +18,10 @@
 
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
 use Google\Cloud\TestUtils\FileUtil;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Yaml\Yaml;
 
-class DeployTest extends \PHPUnit_Framework_TestCase
+class DeployTest extends TestCase
 {
     use AppEngineDeploymentTrait;
 

diff --git a/appengine/flexible/cloudsql-postgres/test/bootstrap.php b/appengine/flexible/cloudsql-postgres/test/bootstrap.php
diff --git a/appengine/flexible/datastore/composer.json b/appengine/flexible/datastore/composer.json
@@ -4,7 +4,6 @@
         "google/cloud-datastore": "^1.0"
     },
     "require-dev": {
-        "guzzlehttp/guzzle": "^6.3",
-        "google/cloud-tools": "^0.6"
+        "guzzlehttp/guzzle": "^6.3"
     }
 }
diff --git a/appengine/flexible/datastore/phpunit.xml.dist b/appengine/flexible/datastore/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php" colors="true">
+<phpunit bootstrap="../../../testing/bootstrap.php" colors="true">
     <testsuites>
         <testsuite>
             <directory>test</directory>

diff --git a/appengine/flexible/datastore/test/bootstrap.php b/appengine/flexible/datastore/test/bootstrap.php
diff --git a/appengine/flexible/drupal8/composer.json b/appengine/flexible/drupal8/composer.json
@@ -4,7 +4,6 @@
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^6.3",
-        "google/cloud-tools": "^0.6",
         "monolog/monolog": "^1.19",
         "symfony/console": " ^2.7",
         "symfony/process": "^3.0",

diff --git a/appengine/flexible/drupal8/phpunit.xml.dist b/appengine/flexible/drupal8/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="../../../testing/bootstrap.php">
     <testsuites>
         <testsuite name="Drupal deployment test">
             <directory>test</directory>

diff --git a/appengine/flexible/drupal8/test/bootstrap.php b/appengine/flexible/drupal8/test/bootstrap.php
diff --git a/appengine/flexible/laravel/composer.json b/appengine/flexible/laravel/composer.json
@@ -4,7 +4,6 @@
         "symfony\/process": "~2.8|~3.0",
         "monolog\/monolog": "^1.19",
         "guzzlehttp\/guzzle": "^6.2",
-        "google/cloud-tools": "^0.6",
         "paragonie/random_compat": " ^2.0"
     }
 }
diff --git a/appengine/flexible/laravel/phpunit.xml.dist b/appengine/flexible/laravel/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="../../../testing/bootstrap.php">
     <testsuites>
         <testsuite name="Laravel deployment test">
             <directory>test</directory>

diff --git a/appengine/flexible/laravel/test/bootstrap.php b/appengine/flexible/laravel/test/bootstrap.php
diff --git a/appengine/flexible/logging/composer.json b/appengine/flexible/logging/composer.json
@@ -6,7 +6,6 @@
         "twig/twig": "^1.29"
     },
     "require-dev": {
-        "google/cloud-tools": "^0.6",
         "guzzlehttp/guzzle": "^6.3",
         "symfony/browser-kit": "^3.2"
     }

diff --git a/appengine/flexible/logging/phpunit.xml.dist b/appengine/flexible/logging/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="../../../testing/bootstrap.php">
     <testsuites>
         <testsuite name="AppEngine Flex logging test">
             <directory>test</directory>

diff --git a/appengine/flexible/logging/test/bootstrap.php b/appengine/flexible/logging/test/bootstrap.php
diff --git a/appengine/flexible/mailgun/composer.json b/appengine/flexible/mailgun/composer.json
@@ -6,7 +6,6 @@
         "symfony/yaml": "^3.1"
     },
     "require-dev": {
-        "google/cloud-tools": "^0.6",
         "paragonie/random_compat": "^2.0",
         "symfony/browser-kit": "^3.0"
     }

diff --git a/appengine/flexible/mailgun/phpunit.xml.dist b/appengine/flexible/mailgun/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="test/bootstrap.php">
+<phpunit bootstrap="../../../testing/bootstrap.php">
     <testsuites>
         <testsuite name="PHP AppEngine Flexible Mailgun test">
             <directory>test</directory>

diff --git a/appengine/flexible/mailgun/test/DeployTest.php b/appengine/flexible/mailgun/test/DeployTest.php
@@ -18,8 +18,9 @@
 
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
 use Google\Cloud\TestUtils\FileUtil;
+use PHPUnit\Framework\TestCase;
 
-class DeployTest extends \PHPUnit_Framework_TestCase
+class DeployTest extends TestCase
 {
     use AppEngineDeploymentTrait;
 

diff --git a/appengine/flexible/mailgun/test/bootstrap.php b/appengine/flexible/mailgun/test/bootstrap.php
diff --git a/appengine/flexible/mailjet/composer.json b/appengine/flexible/mailjet/composer.json
@@ -6,7 +6,6 @@
     },
     "require-dev": {
         "symfony/browser-kit": "^3.0",
-        "paragonie/random_compat": "^2.0",
-        "google/cloud-tools": "^0.6"
+        "paragonie/random_compat": "^2.0"
     }
 }