adds tests and refactoring for when alt=media

Author: bshaffer

src/Google/Http/REST.php

@@ -94,22 +94,20 @@ public static function decodeHttpResponse(
     $body = (string) $response->getBody();
     $code = $response->getStatusCode();
 
+    // return raw response when "alt" is "media"
+    $isJson = !($request && 'media' == $request->getQuery()->get('alt'));
+    $result = $isJson ? $response->json() : $body;
+
     // retry strategy
     if ((intVal($code)) >= 300) {
       $errors = null;
-      $result = $response->json();
       // Specific check for APIs which don't return error details, such as Blogger.
       if (isset($result['error']) && isset($result['error']['errors'])) {
         $errors = $result['error']['errors'];
       }
       throw new Google_Service_Exception($body, $code, null, $errors);
     }
 
-    // return raw response when "alt" is "media"
-    if ($request && $request->getQuery()->get('alt') == 'media') {
-      return $body;
-    }
-
-    return $response->json();
+    return $result;
   }
 }

tests/Google/Service/ResourceTest.php

@@ -18,6 +18,10 @@
  * under the License.
  */
 
+use GuzzleHttp\Message\Request;
+use GuzzleHttp\Message\Response;
+use GuzzleHttp\Stream\Stream;
+
 class Test_Google_Service extends Google_Service
 {
   public function __construct(Google_Client $client)
@@ -193,4 +197,95 @@ public function testAppEngineSslCerts()
         $this->client->getHttpClient()->getDefaultOption('verify')
     );
   }
+
+  public function testNoExpectedClassForAltMediaWithHttpSuccess()
+  {
+    // set the "alt" parameter to "media"
+    $arguments = [['alt' => 'media']];
+    $request = new Request('GET', '/?alt=media');
+    $body = Stream::factory('thisisnotvalidjson');
+    $response = new Response(200, [], $body);
+
+    $http = $this->getMockBuilder("GuzzleHttp\Client")
+        ->disableOriginalConstructor()
+        ->getMock();
+    $http->expects($this->once())
+        ->method('send')
+        ->will($this->returnValue($response));
+    $http->expects($this->any())
+        ->method('createRequest')
+        ->will($this->returnValue($request));
+    $client = new Google_Client();
+    $client->setHttpClient($http);
+    $service = new Test_Google_Service($client);
+
+    // set up mock objects
+    $resource = new Google_Service_Resource(
+      $service,
+      "test",
+      "testResource",
+      array("methods" =>
+        array(
+          "testMethod" => array(
+            "parameters" => array(),
+            "path" => "method/path",
+            "httpMethod" => "POST",
+          )
+        )
+      )
+    );
+
+    $expectedClass = 'ThisShouldBeIgnored';
+    $decoded = $resource->call('testMethod', $arguments, $expectedClass);
+    $this->assertEquals('thisisnotvalidjson', $decoded);
+  }
+
+  public function testNoExpectedClassForAltMediaWithHttpFail()
+  {
+    // set the "alt" parameter to "media"
+    $arguments = [['alt' => 'media']];
+    $request = new Request('GET', '/?alt=media');
+    $body = Stream::factory('thisisnotvalidjson');
+    $response = new Response(300, [], $body);
+
+    $http = $this->getMockBuilder("GuzzleHttp\Client")
+        ->disableOriginalConstructor()
+        ->getMock();
+    $http->expects($this->once())
+        ->method('send')
+        ->will($this->returnValue($response));
+    $http->expects($this->any())
+        ->method('createRequest')
+        ->will($this->returnValue(new Request('GET', '/?alt=media')));
+    $http->expects($this->once())
+        ->method('send')
+        ->will($this->returnValue($response));
+    $client = new Google_Client();
+    $client->setHttpClient($http);
+    $service = new Test_Google_Service($client);
+
+    // set up mock objects
+    $resource = new Google_Service_Resource(
+      $service,
+      "test",
+      "testResource",
+      array("methods" =>
+        array(
+          "testMethod" => array(
+            "parameters" => array(),
+            "path" => "method/path",
+            "httpMethod" => "POST",
+          )
+        )
+      )
+    );
+
+    try {
+      $expectedClass = 'ThisShouldBeIgnored';
+      $decoded = $resource->call('testMethod', $arguments, $expectedClass);
+      $this->fail('should have thrown exception');
+    } catch (Google_Service_Exception $e) {
+      $this->assertEquals('thisisnotvalidjson', $e->getMessage());
+    }
+  }
 }