| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> |
| 6 |
| 5 #include "base/bind.h" | 7 #include "base/bind.h" |
| 6 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 7 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/json/json_reader.h" | 11 #include "base/json/json_reader.h" |
| 10 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 11 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 12 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/values.h" | 15 #include "base/values.h" |
| 14 #include "google_apis/drive/drive_api_parser.h" | 16 #include "google_apis/drive/drive_api_parser.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 expected_upload_path_.clear(); | 148 expected_upload_path_.clear(); |
| 147 expected_content_type_.clear(); | 149 expected_content_type_.clear(); |
| 148 expected_content_.clear(); | 150 expected_content_.clear(); |
| 149 } | 151 } |
| 150 | 152 |
| 151 // For "Children: delete" request, the server will return "204 No Content" | 153 // For "Children: delete" request, the server will return "204 No Content" |
| 152 // response meaning "success". | 154 // response meaning "success". |
| 153 scoped_ptr<net::test_server::HttpResponse> HandleChildrenDeleteRequest( | 155 scoped_ptr<net::test_server::HttpResponse> HandleChildrenDeleteRequest( |
| 154 const net::test_server::HttpRequest& request) { | 156 const net::test_server::HttpRequest& request) { |
| 155 if (request.method != net::test_server::METHOD_DELETE || | 157 if (request.method != net::test_server::METHOD_DELETE || |
| 156 request.relative_url.find("/children/") == string::npos) { | 158 request.relative_url.find("/children/") == std::string::npos) { |
| 157 // The request is not the "Children: delete" request. Delegate the | 159 // The request is not the "Children: delete" request. Delegate the |
| 158 // processing to the next handler. | 160 // processing to the next handler. |
| 159 return scoped_ptr<net::test_server::HttpResponse>(); | 161 return scoped_ptr<net::test_server::HttpResponse>(); |
| 160 } | 162 } |
| 161 | 163 |
| 162 http_request_ = request; | 164 http_request_ = request; |
| 163 | 165 |
| 164 // Return the response with just "204 No Content" status code. | 166 // Return the response with just "204 No Content" status code. |
| 165 scoped_ptr<net::test_server::BasicHttpResponse> http_response( | 167 scoped_ptr<net::test_server::BasicHttpResponse> http_response( |
| 166 new net::test_server::BasicHttpResponse); | 168 new net::test_server::BasicHttpResponse); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 184 | 186 |
| 185 // Return the response from the data file. | 187 // Return the response from the data file. |
| 186 return test_util::CreateHttpResponseFromFile(expected_data_file_path_); | 188 return test_util::CreateHttpResponseFromFile(expected_data_file_path_); |
| 187 } | 189 } |
| 188 | 190 |
| 189 // Deletes the resource and returns no content with HTTP_NO_CONTENT status | 191 // Deletes the resource and returns no content with HTTP_NO_CONTENT status |
| 190 // code. | 192 // code. |
| 191 scoped_ptr<net::test_server::HttpResponse> HandleDeleteRequest( | 193 scoped_ptr<net::test_server::HttpResponse> HandleDeleteRequest( |
| 192 const net::test_server::HttpRequest& request) { | 194 const net::test_server::HttpRequest& request) { |
| 193 if (request.method != net::test_server::METHOD_DELETE || | 195 if (request.method != net::test_server::METHOD_DELETE || |
| 194 request.relative_url.find("/files/") == string::npos) { | 196 request.relative_url.find("/files/") == std::string::npos) { |
| 195 // The file is not file deletion request. Delegate the processing to the | 197 // The file is not file deletion request. Delegate the processing to the |
| 196 // next handler. | 198 // next handler. |
| 197 return scoped_ptr<net::test_server::HttpResponse>(); | 199 return scoped_ptr<net::test_server::HttpResponse>(); |
| 198 } | 200 } |
| 199 | 201 |
| 200 http_request_ = request; | 202 http_request_ = request; |
| 201 | 203 |
| 202 scoped_ptr<net::test_server::BasicHttpResponse> response( | 204 scoped_ptr<net::test_server::BasicHttpResponse> response( |
| 203 new net::test_server::BasicHttpResponse); | 205 new net::test_server::BasicHttpResponse); |
| 204 response->set_code(net::HTTP_NO_CONTENT); | 206 response->set_code(net::HTTP_NO_CONTENT); |
| (...skipping 1640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1845 expected.reset(base::JSONReader::Read( | 1847 expected.reset(base::JSONReader::Read( |
| 1846 "{\"role\":\"writer\", \"type\":\"domain\",\"value\":\"example.com\"}")); | 1848 "{\"role\":\"writer\", \"type\":\"domain\",\"value\":\"example.com\"}")); |
| 1847 ASSERT_TRUE(expected); | 1849 ASSERT_TRUE(expected); |
| 1848 | 1850 |
| 1849 result.reset(base::JSONReader::Read(http_request_.content)); | 1851 result.reset(base::JSONReader::Read(http_request_.content)); |
| 1850 EXPECT_TRUE(http_request_.has_content); | 1852 EXPECT_TRUE(http_request_.has_content); |
| 1851 EXPECT_TRUE(base::Value::Equals(expected.get(), result.get())); | 1853 EXPECT_TRUE(base::Value::Equals(expected.get(), result.get())); |
| 1852 } | 1854 } |
| 1853 | 1855 |
| 1854 } // namespace google_apis | 1856 } // namespace google_apis |
| OLD | NEW |