Revert 288017 "Parse Drive API responses all at once in the bloc..."

trunk/src/google_apis/drive/base_requests_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/drive/base_requests.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 33 matching lines @@
     callback_.Run(GetErrorCode());
   }
   virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE {
     callback_.Run(code);
   }
 
   EntryActionCallback callback_;
   GURL url_;
 };
 
+class FakeGetDataRequest : public GetDataRequest {
+ public:
+  explicit FakeGetDataRequest(RequestSender* sender,
+                              const GetDataCallback& callback,
+                              const GURL& url)
+      : GetDataRequest(sender, callback),
+        url_(url) {
+  }
+
+  virtual ~FakeGetDataRequest() {
+  }
+
+ protected:
+  virtual GURL GetURL() const OVERRIDE { return url_; }
+
+  GURL url_;
+};
+
 }  // namespace
 
 class BaseRequestsTest : public testing::Test {
  public:
   BaseRequestsTest() : response_code_(net::HTTP_OK) {}
 
   virtual void SetUp() OVERRIDE {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_.message_loop_proxy());
 
@@ skipping 20 matching lines @@
   base::MessageLoopForIO message_loop_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   scoped_ptr<RequestSender> sender_;
   net::test_server::EmbeddedTestServer test_server_;
 
   net::HttpStatusCode response_code_;
   std::string response_body_;
 };
 
 TEST_F(BaseRequestsTest, ParseValidJson) {
-  scoped_ptr<base::Value> json(ParseJson(kValidJsonString));
+  scoped_ptr<base::Value> json;
+  ParseJson(message_loop_.message_loop_proxy(),
+            kValidJsonString,
+            base::Bind(test_util::CreateCopyResultCallback(&json)));
+  base::RunLoop().RunUntilIdle();
 
   base::DictionaryValue* root_dict = NULL;
   ASSERT_TRUE(json);
   ASSERT_TRUE(json->GetAsDictionary(&root_dict));
 
   int int_value = 0;
   ASSERT_TRUE(root_dict->GetInteger("test", &int_value));
   EXPECT_EQ(123, int_value);
 }
 
 TEST_F(BaseRequestsTest, ParseInvalidJson) {
-  EXPECT_FALSE(ParseJson(kInvalidJsonString));
+  // Initialize with a valid pointer to verify that null is indeed assigned.
+  scoped_ptr<base::Value> json(base::Value::CreateNullValue());
+  ParseJson(message_loop_.message_loop_proxy(),
+            kInvalidJsonString,
+            base::Bind(test_util::CreateCopyResultCallback(&json)));
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_FALSE(json);
 }
 
 TEST_F(BaseRequestsTest, UrlFetchRequestBaseResponseCodeOverride) {
   response_code_ = net::HTTP_FORBIDDEN;
   response_body_ =
       "{\"error\": {\n"
       "  \"errors\": [\n"
       "   {\n"
       "    \"domain\": \"usageLimits\",\n"
       "    \"reason\": \"rateLimitExceeded\",\n"
@@ skipping 12 matching lines @@
           sender_.get(),
           test_util::CreateQuitCallback(
               &run_loop, test_util::CreateCopyResultCallback(&error)),
           test_server_.base_url()));
   run_loop.Run();
 
   // HTTP_FORBIDDEN (403) is overridden by the error reason.
   EXPECT_EQ(HTTP_SERVICE_UNAVAILABLE, error);
 }
 
+TEST_F(BaseRequestsTest, GetDataRequestParseValidResponse) {
+  response_body_ = kValidJsonString;
+
+  GDataErrorCode error = GDATA_OTHER_ERROR;
+  scoped_ptr<base::Value> value;
+  base::RunLoop run_loop;
+  sender_->StartRequestWithRetry(
+      new FakeGetDataRequest(
+          sender_.get(),
+          test_util::CreateQuitCallback(
+              &run_loop, test_util::CreateCopyResultCallback(&error, &value)),
+          test_server_.base_url()));
+  run_loop.Run();
+
+  EXPECT_EQ(HTTP_SUCCESS, error);
+  EXPECT_TRUE(value);
+}
+
+TEST_F(BaseRequestsTest, GetDataRequestParseInvalidResponse) {
+  response_body_ = kInvalidJsonString;
+
+  GDataErrorCode error = GDATA_OTHER_ERROR;
+  scoped_ptr<base::Value> value;
+  base::RunLoop run_loop;
+  sender_->StartRequestWithRetry(
+      new FakeGetDataRequest(
+          sender_.get(),
+          test_util::CreateQuitCallback(
+              &run_loop, test_util::CreateCopyResultCallback(&error, &value)),
+          test_server_.base_url()));
+  run_loop.Run();
+
+  EXPECT_EQ(GDATA_PARSE_ERROR, error);
+  EXPECT_FALSE(value);
+}
+
 }  // namespace google_apis