Simplify PHPUnit setup.

 * Use the much more succinct style of composing suites with XML configurations.
 * Remove all unnecessary includes/requires. All test runs should load the bootstrap which includes the appropriate autoloader.
 * Move the XML configuration file to a more standard location so that PHPUnit can run from the root directory with no arguments.
 * Allow for local phpunit.xml files.
 * Use the version of PHPUnit that's installed by composer.

Author: whatthejeff

.gitignore

@@ -0,0 +1 @@
+phpunit.xml

.travis.yml

@@ -14,7 +14,7 @@ php:
   - 5.5
   - 5.6
   - hhvm
-        
+
 before_script:
   - composer install
   - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "extension=memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
@@ -23,4 +23,4 @@ before_script:
   - phpenv version-name | grep ^5.[34] && echo "apc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; true
 
 script:
-  - cd tests ; phpunit .
+  - vendor/bin/phpunit

phpunit.xml.dist

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"
+         colors="true"
+         bootstrap="tests/bootstrap.php">
+    <testsuites>
+        <testsuite name="Google YouTube API tests">
+            <directory>tests/youtube</directory>
+        </testsuite>
+        <testsuite name="Google Tasks API tests">
+            <directory>tests/tasks</directory>
+        </testsuite>
+        <testsuite name="Google PageSpeed API tests">
+            <directory>tests/pagespeed</directory>
+        </testsuite>
+        <testsuite name="Google UrlShortener API tests">
+            <directory>tests/urlshortener</directory>
+        </testsuite>
+        <testsuite name="Google Plus API tests">
+            <directory>tests/plus</directory>
+        </testsuite>
+        <testsuite name="AdSense Management API tests">
+            <directory>tests/adsense</directory>
+        </testsuite>
+        <testsuite name="Google API PHP Library core component tests">
+            <directory>tests/general</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <blacklist>
+            <directory suffix=".php">tests</directory>
+        </blacklist>
+    </filter>
+</phpunit>

tests/AllTests.php

@@ -14,16 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require_once 'bootstrap.php';
-require_once 'Google/Client.php';
 
 class BaseTest extends PHPUnit_Framework_TestCase
 {
   const KEY = "";
   private $token;
   private $memcacheHost;
   private $memcachePort;
-  
+
   public function __construct()
   {
     parent::__construct();
@@ -34,7 +32,7 @@ public function __construct()
     $this->memcacheHost = getenv('MEMCACHE_HOST') ? getenv('MEMCACHE_HOST') : null;
     $this->memcachePort = getenv('MEMCACHE_PORT') ? getenv('MEMCACHE_PORT') : null;
   }
-  
+
   public function getClient()
   {
     $client = new Google_Client();
@@ -48,22 +46,20 @@ public function getClient()
     }
     return $client;
   }
-  
+
   public function testClientConstructor()
   {
     $this->assertInstanceOf('Google_Client', $this->getClient());
   }
-  
+
   public function testIncludes()
   {
-    $prefix = dirname(dirname(__FILE__)) . '/src/';
     $path = dirname(dirname(__FILE__)) . '/src/Google/Service';
     foreach (glob($path . "/*.php") as $file) {
-      // Munge prefix so we don't double require.
-      $this->assertEquals(1, require_once(str_replace($prefix, '', $file)));
+      $this->assertEquals(1, require_once($file));
     }
   }
-  
+
   public function checkToken()
   {
     if (!strlen($this->token)) {

tests/BaseTest.php

@@ -14,8 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-include_once 'bootstrap.php';
-require_once 'Google/Client.php';
+require_once dirname(__FILE__) . '/../autoload.php';
 
 $client = new Google_Client();
 $client->setScopes(

tests/OAuthHelper.php

@@ -15,19 +15,6 @@
  * limitations under the License.
  */
 
-require_once realpath(dirname(__FILE__) . '/../../autoload.php');
-
-class AdsenseTests extends PHPUnit_Framework_TestSuite
-{
-  public static function suite()
-  {
-    $suite = new PHPUnit_Framework_TestSuite();
-    $suite->setName('AdSense Management API tests');
-    $suite->addTestSuite('AdSenseManagementTest');
-    return $suite;
-  }
-}
-
 class AdSenseManagementTest extends BaseTest
 {
   public $adsense;

tests/adsense/AdSenseTest.php

@@ -1,7 +1,21 @@
 <?php
-set_include_path(
-    dirname(__FILE__) . PATH_SEPARATOR .
-    dirname(dirname(__FILE__)) . "/src". PATH_SEPARATOR .
-    get_include_path()
-);
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once dirname(__FILE__) . '/../autoload.php';
+require_once dirname(__FILE__) . '/BaseTest.php';
+
 date_default_timezone_set('UTC');

tests/bootstrap.php

@@ -18,9 +18,6 @@
  * under the License.
  */
 
-require_once 'BaseTest.php';
-require_once realpath(dirname(__FILE__) . '/../../autoload.php');
-
 class ApiBatchRequestTest extends BaseTest
 {
   public $plus;

tests/general/ApiBatchRequestTest.php

@@ -18,9 +18,6 @@
  * under the License.
  */
 
-require_once 'BaseTest.php';
-require_once realpath(dirname(__FILE__) . '/../../autoload.php');
-
 class ApiCacheParserTest extends BaseTest
 {
   public function testIsResponseCacheable()