test refactoring

bshaffer · bshaffer · commit a1abf73947ff · 2015-10-19T13:49:13.000-07:00
* test files/classes match class names
 * removes tests/general/AuthTest.php because it tested firebase-jwt library, and not this library.
 * removes tests/testdata/*.pem, tests/testdata/*.p12, and tests/testdata/*.json as they are no longer used.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ vendor
 examples/testfile-small.txt
 examples/testfile.txt
 tests/.accessToken
+tests/.apiKey
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -4,31 +4,13 @@
          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 name="Google PHP Client Test Suite">
+            <directory>tests/Google</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <blacklist>
-            <directory suffix=".php">tests</directory>
-        </blacklist>
+        <whitelist>
+            <directory suffix=".php">./src/Google</directory>
+        </whitelist>
     </filter>
 </phpunit>
diff --git a/tests/BaseTest.php b/tests/BaseTest.php
@@ -21,6 +21,7 @@ class BaseTest extends PHPUnit_Framework_TestCase
   private $token;
   private $memcacheHost;
   private $memcachePort;
+  protected $testDir = __DIR__;
 
   public function __construct()
   {
@@ -79,12 +80,12 @@ public function loadToken()
 
   public function checkKey()
   {
+    $this->key = $this->loadKey();
+
     if (!strlen($this->key)) {
       $this->markTestSkipped("Test requires api key\nYou can create one in your developer console");
       return false;
     }
-
-    $this->key = $this->loadKey();
   }
 
   public function loadKey()
diff --git a/tests/Google/Auth/ComputeEngineTest.php b/tests/Google/Auth/ComputeEngineTest.php
@@ -20,7 +20,7 @@
 
 use GuzzleHttp\Message\Request;
 
-class ComputeEngineAuthTest extends BaseTest
+class Google_Auth_ComputeEngineTest extends BaseTest
 {
   public function testTokenAcquisition()
   {
diff --git a/tests/Google/Auth/OAuth2Test.php b/tests/Google/Auth/OAuth2Test.php
@@ -21,7 +21,7 @@
  * under the License.
  */
 
-class ApiOAuth2Test extends BaseTest
+class Google_Auth_OAuth2Test extends BaseTest
 {
 
   public function testSign()
diff --git a/tests/Google/CacheTest.php b/tests/Google/CacheTest.php
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-class CacheTest extends BaseTest
+class Google_CacheTest extends BaseTest
 {
   public function testFile()
   {
diff --git a/tests/Google/ClientTest.php b/tests/Google/ClientTest.php
@@ -20,7 +20,7 @@
 
 use GuzzleHttp\Message\Request;
 
-class ApiClientTest extends BaseTest
+class Google_ClientTest extends BaseTest
 {
   public function testClient()
   {
@@ -195,7 +195,7 @@ public function testJsonConfig()
 
   public function testIniConfig()
   {
-    $config = new Google_Config(__DIR__ . "/testdata/test.ini");
+    $config = new Google_Config($this->testDir . "/config/test.ini");
     $this->assertEquals('My Test application', $config->getApplicationName());
     $this->assertEquals(
         'gjfiwnGinpena3',
@@ -210,4 +210,17 @@ public function testIniConfig()
         $config->getClassConfig('Google_IO_Abstract', 'request_timeout_seconds')
     );
   }
+
+  public function testNoAuth()
+  {
+    /** @var $noAuth Google_Auth_Simple */
+    $noAuth = new Google_Auth_Simple($this->getClient());
+    $client = new Google_Client();
+    $client->setAuth($noAuth);
+    $client->setDeveloperKey(null);
+    $req = new Request('GET', 'http://example.com');
+
+    $resp = $noAuth->sign($req);
+    $this->assertEquals('http://example.com', $resp->getUrl());
+  }
 }
diff --git a/tests/Google/Http/BatchTest.php b/tests/Google/Http/BatchTest.php
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-class ApiBatchRequestTest extends BaseTest
+class Google_Http_BatchTest extends BaseTest
 {
   public $plus;
 
diff --git a/tests/Google/Http/MediaFuleUploadTest.php b/tests/Google/Http/MediaFuleUploadTest.php
@@ -22,7 +22,7 @@
  * under the License.
  */
 
-class ApiMediaFileUploadTest extends BaseTest
+class Google_Http_MediaFileUploadTest extends BaseTest
 {
   public function testMediaFile()
   {
diff --git a/tests/Google/Http/RESTTest.php b/tests/Google/Http/RESTTest.php
@@ -18,7 +18,7 @@
 use GuzzleHttp\Message\Response;
 use GuzzleHttp\Stream\Stream;
 
-class RestTest extends BaseTest
+class Google_HTTP_RESTTest extends BaseTest
 {
   /**
    * @var Google_Http_REST $rest
diff --git a/tests/Google/LoggerTest.php b/tests/Google/LoggerTest.php
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-class LoggerTest extends PHPUnit_Framework_TestCase
+class Google_LoggerTest extends PHPUnit_Framework_TestCase
 {
   private $client;
 
diff --git a/tests/Google/ModelTest.php b/tests/Google/ModelTest.php
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-class ApiModelTest extends BaseTest
+class Google_ModelTest extends BaseTest
 {
   private $calendarData =  '{
          "kind": "calendar#event",
diff --git a/tests/Google/Service/AdSenseTest.php b/tests/Google/Service/AdSenseTest.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-class AdSenseManagementTest extends BaseTest
+class Google_Service_AdSenseTest extends BaseTest
 {
   public $adsense;
   public function __construct()
diff --git a/tests/Google/Service/PagespeedonlineTest.php b/tests/Google/Service/PagespeedonlineTest.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-class PageSpeedTest extends BaseTest
+class Google_Service_PagespeedonlineTest extends BaseTest
 {
   public $service;
   public function __construct()
diff --git a/tests/Google/Service/PlusTest.php b/tests/Google/Service/PlusTest.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-class PlusTest extends BaseTest
+class Google_Service_PlusTest extends BaseTest
 {
   /** @var Google_PlusService */
   public $plus;
diff --git a/tests/Google/Service/ResourceTest.php b/tests/Google/Service/ResourceTest.php
@@ -30,7 +30,7 @@ public function __construct(Google_Client $client)
   }
 }
 
-class ResourceTest extends PHPUnit_Framework_TestCase
+class Google_Service_ResourceTest extends PHPUnit_Framework_TestCase
 {
   private $client;
   private $service;
diff --git a/tests/Google/Service/TasksTest.php b/tests/Google/Service/TasksTest.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-class TasksTest extends BaseTest
+class Google_Service_TasksTest extends BaseTest
 {
   /** @var Google_TasksService */
   public $taskService;
diff --git a/tests/Google/Service/UrlshortenerTest.php b/tests/Google/Service/UrlshortenerTest.php
@@ -15,31 +15,29 @@
  * limitations under the License.
  */
 
-class UrlShortenerTests extends BaseTest
+class Google_Service_UrlshortenerTest extends BaseTest
 {
-  /** @var Google_UrlshortenerService */
-  public $service;
-
-  public function __construct()
-  {
-    parent::__construct();
-    $this->service = new Google_Service_Urlshortener($this->getClient());
-  }
-
   public function testUrlShort()
   {
+    $this->checkKey();
+
+    $service = new Google_Service_Urlshortener($this->getClient());
     $url = new Google_Service_Urlshortener_Url();
     $url->longUrl = "http://google.com";
 
-    $shortUrl = $this->service->url->insert($url);
+    $shortUrl = $service->url->insert($url);
     $this->assertEquals('urlshortener#url', $shortUrl['kind']);
     $this->assertEquals('http://google.com/', $shortUrl['longUrl']);
   }
 
   public function testEmptyJsonResponse()
   {
+    $this->checkKey();
+
+    $service = new Google_Service_Urlshortener($this->getClient());
+
     $optParams = array('fields' => '');
-    $resp = $this->service->url->get('http://goo.gl/KkHq8', $optParams);
+    $resp = $service->url->get('http://goo.gl/KkHq8', $optParams);
 
     $this->assertEquals("", $resp->longUrl);
   }
diff --git a/tests/Google/Service/YouTubeTest.php b/tests/Google/Service/YouTubeTest.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-class YouTubeTest extends BaseTest
+class Google_Service_YouTubeTest extends BaseTest
 {
   /** @var Google_PlusService */
   public $plus;
diff --git a/tests/Google/ServiceTest.php b/tests/Google/ServiceTest.php
@@ -31,7 +31,7 @@ public function isAssociativeArray($array)
   }
 }
 
-class ServiceTest extends PHPUnit_Framework_TestCase
+class Google_ServiceTest extends PHPUnit_Framework_TestCase
 {
 
   public function testModel()
diff --git a/tests/Google/Task/RunnerTest.php b/tests/Google/Task/RunnerTest.php
@@ -19,7 +19,7 @@
 use GuzzleHttp\Message\Response;
 use GuzzleHttp\Stream\Stream;
 
-class TaskTest extends PHPUnit_Framework_TestCase
+class Google_Task_RunnerTest extends PHPUnit_Framework_TestCase
 {
   private $client;
 
diff --git a/tests/Google/Utils/URITemplateTest b/tests/Google/Utils/URITemplateTest
@@ -18,7 +18,7 @@
  * under the License.
  */
 
-class URITemplateTest extends BaseTest
+class Google_Utils_URITemplateTest extends BaseTest
 {
   public function testLevelOne()
   {
diff --git a/tests/config/test.ini b/tests/config/test.ini
diff --git a/tests/general/AuthTest.php b/tests/general/AuthTest.php
diff --git a/tests/general/testdata/cacert.json b/tests/general/testdata/cacert.json
diff --git a/tests/general/testdata/cacert.pem b/tests/general/testdata/cacert.pem
diff --git a/tests/general/testdata/cert.p12 b/tests/general/testdata/cert.p12
diff --git a/tests/general/testdata/privkey.pem b/tests/general/testdata/privkey.pem
diff --git a/tests/general/testdata/service-12345.json b/tests/general/testdata/service-12345.json
diff --git a/tests/general/testdata/service-rsa-12345.json b/tests/general/testdata/service-rsa-12345.json
diff --git a/tests/general/testdata/test_public_key.pem b/tests/general/testdata/test_public_key.pem

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ class BaseTest extends PHPUnit_Framework_TestCase`
`21`	`21`	`private $token;`
`22`	`22`	`private $memcacheHost;`
`23`	`23`	`private $memcachePort;`
	`24`	`+ protected $testDir = __DIR__;`
`24`	`25`
`25`	`26`	`public function __construct()`
`26`	`27`	`{`
`@@ -79,12 +80,12 @@ public function loadToken()`
`79`	`80`
`80`	`81`	`public function checkKey()`
`81`	`82`	`{`
	`83`	`+ $this->key = $this->loadKey();`
	`84`	`+`
`82`	`85`	`if (!strlen($this->key)) {`
`83`	`86`	`$this->markTestSkipped("Test requires api key\nYou can create one in your developer console");`
`84`	`87`	`return false;`
`85`	`88`	`}`
`86`		`-`
`87`		`- $this->key = $this->loadKey();`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`public function loadKey()`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`use GuzzleHttp\Message\Request;`
`22`	`22`
`23`		`-class ComputeEngineAuthTest extends BaseTest`
	`23`	`+class Google_Auth_ComputeEngineTest extends BaseTest`
`24`	`24`	`{`
`25`	`25`	`public function testTokenAcquisition()`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* under the License.`
`22`	`22`	`*/`
`23`	`23`
`24`		`-class ApiOAuth2Test extends BaseTest`
	`24`	`+class Google_Auth_OAuth2Test extends BaseTest`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`public function testSign()`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* under the License.`
`19`	`19`	`*/`
`20`	`20`
`21`		`-class CacheTest extends BaseTest`
	`21`	`+class Google_CacheTest extends BaseTest`
`22`	`22`	`{`
`23`	`23`	`public function testFile()`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* under the License.`
`23`	`23`	`*/`
`24`	`24`
`25`		`-class ApiMediaFileUploadTest extends BaseTest`
	`25`	`+class Google_Http_MediaFileUploadTest extends BaseTest`
`26`	`26`	`{`
`27`	`27`	`public function testMediaFile()`
`28`	`28`	`{`