Merge pull request googleapis#192 from ianbarber/master

Small test tidy ups

Author: ianbarber

src/Google/Client.php

@@ -103,9 +103,9 @@ function_exists('date_default_timezone_set')) {
 
     if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
       if (function_exists('curl_version') && function_exists('curl_exec')) {
-        $config->setIoClass("Google_Io_Curl");
+        $config->setIoClass("Google_IO_Curl");
       } else {
-        $config->setIoClass("Google_Io_Stream");
+        $config->setIoClass("Google_IO_Stream");
       }
     }
 

tests/general/ApiOAuth2Test.php

@@ -169,7 +169,7 @@ public function testValidateIdToken()
    * Test for revoking token when none is opened
    */
   public function testRevokeWhenNoTokenExists() {
-    $client = $this->getClient();
-    $client->revokeToken();
+    $client = new Google_Client();
+    $this->assertFalse($client->revokeToken());
   }
 }

tests/general/IoTest.php

@@ -28,8 +28,9 @@ class IoTest extends BaseTest
 
   public function testExecutorSelection()
   {
+    $default = function_exists('curl_version') ? 'Google_IO_Curl' : 'Google_IO_Stream';
     $client = $this->getClient();
-    $this->assertInstanceOf('Google_IO_Curl', $client->getIo());
+    $this->assertInstanceOf($default, $client->getIo());
     $config = new Google_Config();
     $config->setIoClass('Google_IO_Stream');
     $client = new Google_Client($config);
@@ -80,32 +81,47 @@ public function testStreamInvalidRequest()
 
   public function testCurlSetTimeout()
   {
+    if (!function_exists('curl_version')) {
+      $this->markTestSkipped('cURL not present');
+    }
     $io = new Google_IO_Curl($this->getClient());
     $this->timeoutChecker($io);
   }
 
   public function testCurlParseHttpResponseBody()
   {
+    if (!function_exists('curl_version')) {
+      $this->markTestSkipped('cURL not present');
+    }
     $io = new Google_IO_Curl($this->getClient());
     $this->responseChecker($io);
   }
 
   public function testCurlProcessEntityRequest()
   {
+    if (!function_exists('curl_version')) {
+      $this->markTestSkipped('cURL not present');
+    }
     $client = $this->getClient();
     $io = new Google_IO_Curl($client);
     $this->processEntityRequest($io, $client);
   }
 
   public function testCurlCacheHit()
   {
+    if (!function_exists('curl_version')) {
+      $this->markTestSkipped('cURL not present');
+    }
     $client = $this->getClient();
     $io = new Google_IO_Curl($client);
     $this->cacheHit($io, $client);
   }
 
   public function testCurlAuthCache()
   {
+    if (!function_exists('curl_version')) {
+      $this->markTestSkipped('cURL not present');
+    }
     $client = $this->getClient();
     $io = new Google_IO_Curl($client);
     $this->authCache($io, $client);
@@ -116,6 +132,9 @@ public function testCurlAuthCache()
    */
   public function testCurlInvalidRequest()
   {
+    if (!function_exists('curl_version')) {
+      $this->markTestSkipped('cURL not present');
+    }
     $io = new Google_IO_Curl($this->getClient());
     $this->invalidRequest($io);
   }