GoogleCloudPlatform · bshaffer · Feb 7, 2017 · Feb 2, 2017 · Feb 6, 2017
diff --git a/appengine/flexible/analytics/phpunit.xml b/appengine/flexible/analytics/phpunit.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
   <php>
     <env name="GA_TRACKING_ID" value="UA-78971600-1"/>
   </php>
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
   <logging>

diff --git a/...e/flexible/analytics/tests/DeployTest.php → ...ne/flexible/analytics/test/DeployTest.php b/...e/flexible/analytics/tests/DeployTest.php → ...ne/flexible/analytics/test/DeployTest.php
diff --git a/...ne/flexible/analytics/tests/LocalTest.php → ...ine/flexible/analytics/test/LocalTest.php b/...ne/flexible/analytics/tests/LocalTest.php → ...ine/flexible/analytics/test/LocalTest.php
diff --git a/...ne/flexible/analytics/tests/bootstrap.php → ...ine/flexible/analytics/test/bootstrap.php b/...ne/flexible/analytics/tests/bootstrap.php → ...ine/flexible/analytics/test/bootstrap.php
diff --git a/appengine/flexible/cloudsql/phpunit.xml b/appengine/flexible/cloudsql/phpunit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
   <logging>

diff --git a/...ne/flexible/cloudsql/tests/DeployTest.php → ...ine/flexible/cloudsql/test/DeployTest.php b/...ne/flexible/cloudsql/tests/DeployTest.php → ...ine/flexible/cloudsql/test/DeployTest.php
diff --git a/...ine/flexible/cloudsql/tests/LocalTest.php → ...gine/flexible/cloudsql/test/LocalTest.php b/...ine/flexible/cloudsql/tests/LocalTest.php → ...gine/flexible/cloudsql/test/LocalTest.php
diff --git a/...ine/flexible/cloudsql/tests/bootstrap.php → ...gine/flexible/cloudsql/test/bootstrap.php b/...ine/flexible/cloudsql/tests/bootstrap.php → ...gine/flexible/cloudsql/test/bootstrap.php
diff --git a/appengine/flexible/datastore/phpunit.xml b/appengine/flexible/datastore/phpunit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
   <logging>

diff --git a/...e/flexible/datastore/tests/DeployTest.php → ...ne/flexible/datastore/test/DeployTest.php b/...e/flexible/datastore/tests/DeployTest.php → ...ne/flexible/datastore/test/DeployTest.php
diff --git a/...ne/flexible/datastore/tests/LocalTest.php → ...ine/flexible/datastore/test/LocalTest.php b/...ne/flexible/datastore/tests/LocalTest.php → ...ine/flexible/datastore/test/LocalTest.php
diff --git a/...ne/flexible/datastore/tests/bootstrap.php → ...ine/flexible/datastore/test/bootstrap.php b/...ne/flexible/datastore/tests/bootstrap.php → ...ine/flexible/datastore/test/bootstrap.php
diff --git a/appengine/flexible/drupal8/phpunit.xml b/appengine/flexible/drupal8/phpunit.xml
@@ -14,10 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit bootstrap="test/bootstrap.php">
     <testsuites>
         <testsuite name="Drupal deployment test">
-            <directory>tests</directory>
+            <directory>test</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/...ine/flexible/drupal8/tests/DeployTest.php → ...gine/flexible/drupal8/test/DeployTest.php b/...ine/flexible/drupal8/tests/DeployTest.php → ...gine/flexible/drupal8/test/DeployTest.php
diff --git a/...gine/flexible/drupal8/tests/bootstrap.php → ...ngine/flexible/drupal8/test/bootstrap.php b/...gine/flexible/drupal8/tests/bootstrap.php → ...ngine/flexible/drupal8/test/bootstrap.php
diff --git a/appengine/flexible/laravel/phpunit.xml b/appengine/flexible/laravel/phpunit.xml
@@ -14,10 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit bootstrap="test/bootstrap.php">
     <testsuites>
         <testsuite name="Laravel deployment test">
-            <directory>tests</directory>
+            <directory>test</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/...ine/flexible/laravel/tests/DeployTest.php → ...gine/flexible/laravel/test/DeployTest.php b/...ine/flexible/laravel/tests/DeployTest.php → ...gine/flexible/laravel/test/DeployTest.php
diff --git a/...gine/flexible/laravel/tests/bootstrap.php → ...ngine/flexible/laravel/test/bootstrap.php b/...gine/flexible/laravel/tests/bootstrap.php → ...ngine/flexible/laravel/test/bootstrap.php
diff --git a/appengine/flexible/memcache/phpunit.xml b/appengine/flexible/memcache/phpunit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
   <logging>

diff --git a/...ne/flexible/memcache/tests/DeployTest.php → ...ine/flexible/memcache/test/DeployTest.php b/...ne/flexible/memcache/tests/DeployTest.php → ...ine/flexible/memcache/test/DeployTest.php
diff --git a/...ine/flexible/memcache/tests/LocalTest.php → ...gine/flexible/memcache/test/LocalTest.php b/...ine/flexible/memcache/tests/LocalTest.php → ...gine/flexible/memcache/test/LocalTest.php
diff --git a/...ine/flexible/memcache/tests/bootstrap.php → ...gine/flexible/memcache/test/bootstrap.php b/...ine/flexible/memcache/tests/bootstrap.php → ...gine/flexible/memcache/test/bootstrap.php
diff --git a/appengine/flexible/staticcontent/phpunit.xml b/appengine/flexible/staticcontent/phpunit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/...exible/staticcontent/tests/DeployTest.php → ...lexible/staticcontent/test/DeployTest.php b/...exible/staticcontent/tests/DeployTest.php → ...lexible/staticcontent/test/DeployTest.php
diff --git a/...lexible/staticcontent/tests/bootstrap.php → ...flexible/staticcontent/test/bootstrap.php b/...lexible/staticcontent/tests/bootstrap.php → ...flexible/staticcontent/test/bootstrap.php
diff --git a/appengine/flexible/symfony/phpunit.xml b/appengine/flexible/symfony/phpunit.xml
@@ -14,10 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit bootstrap="test/bootstrap.php">
     <testsuites>
         <testsuite name="Symfony deployment test">
-            <directory>tests</directory>
+            <directory>test</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/...ine/flexible/symfony/tests/DeployTest.php → ...gine/flexible/symfony/test/DeployTest.php b/...ine/flexible/symfony/tests/DeployTest.php → ...gine/flexible/symfony/test/DeployTest.php
diff --git a/...gine/flexible/symfony/tests/bootstrap.php → ...ngine/flexible/symfony/test/bootstrap.php b/...gine/flexible/symfony/tests/bootstrap.php → ...ngine/flexible/symfony/test/bootstrap.php
diff --git a/...ngine/flexible/twilio/test/TwilioTest.php → appengine/flexible/twilio/test/LocalTest.php b/...ngine/flexible/twilio/test/TwilioTest.php → appengine/flexible/twilio/test/LocalTest.php
@@ -16,7 +16,7 @@
  */
 use Silex\WebTestCase;
 
-class TwilioTest extends WebTestCase
+class LocalTest extends WebTestCase
 {
     public function createApplication()
     {

diff --git a/...e/standard/cloudsql/test/cloudsqlTest.php → ...gine/standard/cloudsql/test/LocalTest.php b/...e/standard/cloudsql/test/cloudsqlTest.php → ...gine/standard/cloudsql/test/LocalTest.php
@@ -16,7 +16,7 @@
  */
 use Silex\WebTestCase;
 
-class cloudsqlTest extends WebTestCase
+class LocalTest extends WebTestCase
 {
     public function createApplication()
     {

diff --git a/appengine/standard/http/test/httpTest.php → appengine/standard/http/test/LocalTest.php b/appengine/standard/http/test/httpTest.php → appengine/standard/http/test/LocalTest.php
@@ -16,7 +16,7 @@
  */
 use Silex\WebTestCase;
 
-class httpTest extends WebTestCase
+class LocalTest extends WebTestCase
 {
     private $expected;
 

diff --git a/...ine/standard/logging/test/loggingTest.php → ...ngine/standard/logging/test/LocalTest.php b/...ine/standard/logging/test/loggingTest.php → ...ngine/standard/logging/test/LocalTest.php
@@ -17,7 +17,7 @@
 
 use google\appengine\api\log\LogService;
 
-class loggingTest extends PHPUnit_Framework_TestCase
+class LocalTest extends PHPUnit_Framework_TestCase
 {
     public function testNoLogs()
     {

diff --git a/appengine/standard/mail/test/mailTest.php → appengine/standard/mail/test/LocalTest.php b/appengine/standard/mail/test/mailTest.php → appengine/standard/mail/test/LocalTest.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-class mailTest extends PHPUnit_Framework_TestCase
+class LocalTest extends PHPUnit_Framework_TestCase
 {
     public function testSendMail()
     {

diff --git a/...ine/standard/mailgun/test/mailgunTest.php → ...ngine/standard/mailgun/test/LocalTest.php b/...ine/standard/mailgun/test/mailgunTest.php → ...ngine/standard/mailgun/test/LocalTest.php
@@ -16,7 +16,7 @@
  */
 use Silex\WebTestCase;
 
-class mailgunTest extends WebTestCase
+class LocalTest extends WebTestCase
 {
     private $recipient;
 

diff --git a/...ine/standard/mailjet/test/mailjetTest.php → ...ngine/standard/mailjet/test/LocalTest.php b/...ine/standard/mailjet/test/mailjetTest.php → ...ngine/standard/mailjet/test/LocalTest.php
@@ -16,7 +16,7 @@
  */
 use Silex\WebTestCase;
 
-class mailjetTest extends WebTestCase
+class LocalTest extends WebTestCase
 {
     public function createApplication()
     {

diff --git a/appengine/standard/memcache/phpunit.xml.dist b/appengine/standard/memcache/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/...ne/standard/memcache/tests/DeployTest.php → ...ine/standard/memcache/test/DeployTest.php b/...ne/standard/memcache/tests/DeployTest.php → ...ine/standard/memcache/test/DeployTest.php
diff --git a/...ine/standard/memcache/tests/bootstrap.php → ...gine/standard/memcache/test/bootstrap.php b/...ine/standard/memcache/tests/bootstrap.php → ...gine/standard/memcache/test/bootstrap.php
diff --git a/appengine/standard/modules/phpunit.xml b/appengine/standard/modules/phpunit.xml
@@ -14,13 +14,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit bootstrap="test/bootstrap.php">
     <php>
         <env name="LOCAL_TEST_TARGETS" value="app.yaml backend.yaml"/>
     </php>
     <testsuites>
         <testsuite name="PHP Modules API unit tests">
-            <directory>tests</directory>
+            <directory>test</directory>
         </testsuite>
     </testsuites>
     <logging>

diff --git a/...gine/standard/modules/tests/bootstrap.php → ...ngine/standard/modules/test/bootstrap.php b/...gine/standard/modules/tests/bootstrap.php → ...ngine/standard/modules/test/bootstrap.php
diff --git a/...standard/modules/tests/e2e/DeployTest.php → .../standard/modules/test/e2e/DeployTest.php b/...standard/modules/tests/e2e/DeployTest.php → .../standard/modules/test/e2e/DeployTest.php
diff --git a/.../standard/modules/tests/e2e/LocalTest.php → ...e/standard/modules/test/e2e/LocalTest.php b/.../standard/modules/tests/e2e/LocalTest.php → ...e/standard/modules/test/e2e/LocalTest.php
diff --git a/...rd/modules/tests/e2e/ModulesTestTrait.php → ...ard/modules/test/e2e/ModulesTestTrait.php b/...rd/modules/tests/e2e/ModulesTestTrait.php → ...ard/modules/test/e2e/ModulesTestTrait.php
diff --git a/...ard/modules/tests/unit/ModulesApiTest.php → ...dard/modules/test/unit/ModulesApiTest.php b/...ard/modules/tests/unit/ModulesApiTest.php → ...dard/modules/test/unit/ModulesApiTest.php
diff --git a/...rd/modules/tests/unit/mocks/Functions.php → ...ard/modules/test/unit/mocks/Functions.php b/...rd/modules/tests/unit/mocks/Functions.php → ...ard/modules/test/unit/mocks/Functions.php
diff --git a/...dules/tests/unit/mocks/ModulesService.php → ...odules/test/unit/mocks/ModulesService.php b/...dules/tests/unit/mocks/ModulesService.php → ...odules/test/unit/mocks/ModulesService.php
diff --git a/appengine/standard/phpmyadmin/phpunit.xml.dist b/appengine/standard/phpmyadmin/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/.../standard/phpmyadmin/tests/DeployTest.php → ...e/standard/phpmyadmin/test/DeployTest.php b/.../standard/phpmyadmin/tests/DeployTest.php → ...e/standard/phpmyadmin/test/DeployTest.php
diff --git a/...e/standard/phpmyadmin/tests/bootstrap.php → ...ne/standard/phpmyadmin/test/bootstrap.php b/...e/standard/phpmyadmin/tests/bootstrap.php → ...ne/standard/phpmyadmin/test/bootstrap.php
diff --git a/...ine/standard/storage/test/storageTest.php → ...ngine/standard/storage/test/LocalTest.php b/...ine/standard/storage/test/storageTest.php → ...ngine/standard/storage/test/LocalTest.php
@@ -17,7 +17,7 @@
 use Silex\WebTestCase;
 use google\appengine\api\cloud_storage\CloudStorageTools;
 
-class storageTest extends WebTestCase
+class LocalTest extends WebTestCase
 {
     public function createApplication()
     {

diff --git a/appengine/standard/taskqueue/phpunit.xml b/appengine/standard/taskqueue/phpunit.xml
@@ -14,10 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit bootstrap="test/bootstrap.php">
     <testsuites>
         <testsuite name="PHP Taskqueue API unit tests">
-            <directory>tests</directory>
+            <directory>test</directory>
         </testsuite>
     </testsuites>
     <logging>

diff --git a/...ne/standard/taskqueue/tests/bootstrap.php → ...ine/standard/taskqueue/test/bootstrap.php b/...ne/standard/taskqueue/tests/bootstrap.php → ...ine/standard/taskqueue/test/bootstrap.php
diff --git a/...rd/taskqueue/tests/unit/TaskQueueTest.php → ...ard/taskqueue/test/unit/TaskQueueTest.php b/...rd/taskqueue/tests/unit/TaskQueueTest.php → ...ard/taskqueue/test/unit/TaskQueueTest.php
diff --git a/.../taskqueue/tests/unit/mocks/PushQueue.php → ...d/taskqueue/test/unit/mocks/PushQueue.php b/.../taskqueue/tests/unit/mocks/PushQueue.php → ...d/taskqueue/test/unit/mocks/PushQueue.php
diff --git a/...d/taskqueue/tests/unit/mocks/PushTask.php → ...rd/taskqueue/test/unit/mocks/PushTask.php b/...d/taskqueue/tests/unit/mocks/PushTask.php → ...rd/taskqueue/test/unit/mocks/PushTask.php
diff --git a/...ngine/standard/twilio/test/twilioTest.php → appengine/standard/twilio/test/LocalTest.php b/...ngine/standard/twilio/test/twilioTest.php → appengine/standard/twilio/test/LocalTest.php
@@ -17,7 +17,7 @@
 
 use Silex\WebTestCase;
 
-class twilioTest extends WebTestCase
+class LocalTest extends WebTestCase
 {
     public function createApplication()
     {

diff --git a/appengine/standard/users/phpunit.xml b/appengine/standard/users/phpunit.xml
@@ -14,10 +14,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="tests/bootstrap.php">
+<phpunit bootstrap="test/bootstrap.php">
     <testsuites>
         <testsuite name="PHP Users API unit tests">
-            <directory>tests</directory>
+            <directory>test</directory>
         </testsuite>
     </testsuites>
     <logging>

diff --git a/appengine/standard/users/tests/bootstrap.php → appengine/standard/users/test/bootstrap.php b/appengine/standard/users/tests/bootstrap.php → appengine/standard/users/test/bootstrap.php
diff --git a/...e/standard/users/tests/e2e/DeployTest.php → ...ne/standard/users/test/e2e/DeployTest.php b/...e/standard/users/tests/e2e/DeployTest.php → ...ne/standard/users/test/e2e/DeployTest.php
diff --git a/...ne/standard/users/tests/e2e/LocalTest.php → ...ine/standard/users/test/e2e/LocalTest.php b/...ne/standard/users/tests/e2e/LocalTest.php → ...ine/standard/users/test/e2e/LocalTest.php
diff --git a/...tandard/users/tests/unit/UsersApiTest.php → ...standard/users/test/unit/UsersApiTest.php b/...tandard/users/tests/unit/UsersApiTest.php → ...standard/users/test/unit/UsersApiTest.php
diff --git a/.../standard/users/tests/unit/mocks/User.php → ...e/standard/users/test/unit/mocks/User.php b/.../standard/users/tests/unit/mocks/User.php → ...e/standard/users/test/unit/mocks/User.php
diff --git a/...rd/users/tests/unit/mocks/UserService.php → ...ard/users/test/unit/mocks/UserService.php b/...rd/users/tests/unit/mocks/UserService.php → ...ard/users/test/unit/mocks/UserService.php
diff --git a/appengine/wordpress/composer.json b/appengine/wordpress/composer.json
@@ -13,6 +13,6 @@
     },
     "autoload": {
         "psr-4": { "Google\\Cloud\\Helper\\": "src/",
-                   "Google\\Cloud\\Test\\": "tests/"}
+                   "Google\\Cloud\\Test\\": "test/"}
     }
 }
diff --git a/appengine/wordpress/phpunit.xml b/appengine/wordpress/phpunit.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./test/bootstrap.php" colors="true">
   <testsuites>
     <testsuite>
-      <directory>tests</directory>
+      <directory>test</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/appengine/wordpress/tests/FlexTest.php → appengine/wordpress/test/DeployFlexTest.php b/appengine/wordpress/tests/FlexTest.php → appengine/wordpress/test/DeployFlexTest.php
@@ -18,7 +18,7 @@
 
 use GuzzleHttp\Client;
 
-class FlexTest extends \PHPUnit_Framework_TestCase
+class DeployFlexTest extends \PHPUnit_Framework_TestCase
 {
     private $client;
 

diff --git a/appengine/wordpress/tests/StdTest.php → ...ine/wordpress/test/DeployStandardTest.php b/appengine/wordpress/tests/StdTest.php → ...ine/wordpress/test/DeployStandardTest.php
@@ -18,7 +18,7 @@
 
 use GuzzleHttp\Client;
 
-class StdTest extends \PHPUnit_Framework_TestCase
+class DeployStandardTest extends \PHPUnit_Framework_TestCase
 {
     private $client;
 

diff --git a/appengine/wordpress/tests/bootstrap.php → appengine/wordpress/test/bootstrap.php b/appengine/wordpress/tests/bootstrap.php → appengine/wordpress/test/bootstrap.php