diff options
Diffstat (limited to 'src/common/linux/google_crashdump_uploader_test.cc')
| -rw-r--r-- | src/common/linux/google_crashdump_uploader_test.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/common/linux/google_crashdump_uploader_test.cc b/src/common/linux/google_crashdump_uploader_test.cc index 957874ad..e94c5d62 100644 --- a/src/common/linux/google_crashdump_uploader_test.cc +++ b/src/common/linux/google_crashdump_uploader_test.cc @@ -32,7 +32,6 @@ #include <string> #include "common/linux/google_crashdump_uploader.h" -#include "common/linux/libcurl_wrapper.h" #include "breakpad_googletest_includes.h" #include "common/using_std_string.h" @@ -48,10 +47,12 @@ class MockLibcurlWrapper : public LibcurlWrapper { const string& proxy_userpwd)); MOCK_METHOD2(AddFile, bool(const string& upload_file_path, const string& basename)); - MOCK_METHOD3(SendRequest, + MOCK_METHOD5(SendRequest, bool(const string& url, const std::map<string, string>& parameters, - string* server_response)); + int* http_status_code, + string* http_header_data, + string* http_response_data)); }; class GoogleCrashdumpUploaderTest : public ::testing::Test { @@ -72,7 +73,7 @@ TEST_F(GoogleCrashdumpUploaderTest, InitFailsCausesUploadFailure) { "", "", &m); - ASSERT_FALSE(uploader->Upload()); + ASSERT_FALSE(uploader->Upload(NULL, NULL, NULL)); } TEST_F(GoogleCrashdumpUploaderTest, TestSendRequestHappensWithValidParameters) { @@ -86,7 +87,7 @@ TEST_F(GoogleCrashdumpUploaderTest, TestSendRequestHappensWithValidParameters) { EXPECT_CALL(m, Init()).Times(1).WillOnce(Return(true)); EXPECT_CALL(m, AddFile(tempfn, _)).WillOnce(Return(true)); EXPECT_CALL(m, - SendRequest("http://foo.com",_,_)).Times(1).WillOnce(Return(true)); + SendRequest("http://foo.com",_,_,_,_)).Times(1).WillOnce(Return(true)); GoogleCrashdumpUploader *uploader = new GoogleCrashdumpUploader("foobar", "1.0", "AAA-BBB", @@ -99,14 +100,14 @@ TEST_F(GoogleCrashdumpUploaderTest, TestSendRequestHappensWithValidParameters) { "", "", &m); - ASSERT_TRUE(uploader->Upload()); + ASSERT_TRUE(uploader->Upload(NULL, NULL, NULL)); } TEST_F(GoogleCrashdumpUploaderTest, InvalidPathname) { MockLibcurlWrapper m; EXPECT_CALL(m, Init()).Times(1).WillOnce(Return(true)); - EXPECT_CALL(m, SendRequest(_,_,_)).Times(0); + EXPECT_CALL(m, SendRequest(_,_,_,_,_)).Times(0); GoogleCrashdumpUploader *uploader = new GoogleCrashdumpUploader("foobar", "1.0", "AAA-BBB", @@ -119,7 +120,7 @@ TEST_F(GoogleCrashdumpUploaderTest, InvalidPathname) { "", "", &m); - ASSERT_FALSE(uploader->Upload()); + ASSERT_FALSE(uploader->Upload(NULL, NULL, NULL)); } TEST_F(GoogleCrashdumpUploaderTest, TestRequiredParametersMustBePresent) { @@ -135,7 +136,7 @@ TEST_F(GoogleCrashdumpUploaderTest, TestRequiredParametersMustBePresent) { "http://foo.com", "", ""); - ASSERT_FALSE(uploader.Upload()); + ASSERT_FALSE(uploader.Upload(NULL, NULL, NULL)); // Test with empty product version. GoogleCrashdumpUploader uploader1("product", @@ -150,7 +151,7 @@ TEST_F(GoogleCrashdumpUploaderTest, TestRequiredParametersMustBePresent) { "", ""); - ASSERT_FALSE(uploader1.Upload()); + ASSERT_FALSE(uploader1.Upload(NULL, NULL, NULL)); // Test with empty client GUID. GoogleCrashdumpUploader uploader2("product", @@ -164,6 +165,6 @@ TEST_F(GoogleCrashdumpUploaderTest, TestRequiredParametersMustBePresent) { "", "", ""); - ASSERT_FALSE(uploader2.Upload()); + ASSERT_FALSE(uploader2.Upload(NULL, NULL, NULL)); } } |