Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5746)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/service/cloud_print/printer_job_handler_unittest.cc

Issue 23625015: Consolidate TestURLFetcherFactory::SetFakeResponse (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/safe_browsing/download_protection_service.cc ('K') | « chrome/browser/ui/search/instant_extended_interactive_uitest.cc ('k') | net/url_request/test_url_fetcher_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/cloud_print/printer_job_handler_unittest.cc
diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc
index 13736d3afa02aec90a515deba64c04e44d5fafcd..4056903e9a95af1430e730007ac8ec42b93e9229 100644
--- a/chrome/service/cloud_print/printer_job_handler_unittest.cc
+++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc
@@ -22,17 +22,17 @@
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::AtLeast;
+using ::testing::DoAll;
using ::testing::Exactly;
-using ::testing::Sequence;
+using ::testing::Invoke;
+using ::testing::InvokeWithoutArgs;
+using ::testing::NiceMock;
using ::testing::Return;
using ::testing::SaveArg;
-using ::testing::DoAll;
-using ::testing::_;
-using ::testing::NiceMock;
-using ::testing::StrictMock;
-using ::testing::Invoke;
+using ::testing::Sequence;
using ::testing::SetArgPointee;
-using ::testing::InvokeWithoutArgs;
+using ::testing::StrictMock;
+using ::testing::_;
namespace cloud_print {
@@ -203,35 +203,34 @@ std::string JobListResponse(int num_jobs) {
return StringPrintf(kExampleJobListResponse, job_objects.c_str());
}
-std::string JobListURI(const char* reason) {
- return StringPrintf(kExamplePrinterJobListURI, reason);
+GURL JobListURI(const char* reason) {
+ return GURL(StringPrintf(kExamplePrinterJobListURI, reason));
}
std::string JobID(int job_num) {
return StringPrintf(kExampleJobID, job_num);
}
-std::string DoneURI(int job_num) {
- return StringPrintf(kExampleUpdateDoneURI, job_num);
+GURL DoneURI(int job_num) {
+ return GURL(StringPrintf(kExampleUpdateDoneURI, job_num));
}
-std::string ErrorURI(int job_num) {
- return StringPrintf(kExampleUpdateErrorURI, job_num);
+GURL ErrorURI(int job_num) {
+ return GURL(StringPrintf(kExampleUpdateErrorURI, job_num));
}
-std::string TicketURI(int job_num) {
- return StringPrintf(kExamplePrintTicketURI, job_num);
+GURL TicketURI(int job_num) {
+ return GURL(StringPrintf(kExamplePrintTicketURI, job_num));
}
-std::string DownloadURI(int job_num) {
- return StringPrintf(kExamplePrintDownloadURI, job_num);
+GURL DownloadURI(int job_num) {
+ return GURL(StringPrintf(kExamplePrintDownloadURI, job_num));
}
-// converts to string for consistency
-std::string InProgressURI(int job_num) {
+GURL InProgressURI(int job_num) {
return GetUrlForJobStatusUpdate(GURL(kExampleCloudPrintServerURL),
StringPrintf(kExampleJobID, job_num),
- PRINT_JOB_STATUS_IN_PROGRESS).spec();
+ PRINT_JOB_STATUS_IN_PROGRESS);
}
std::string StatusResponse(int job_num, const char* status_string) {
@@ -554,18 +553,17 @@ void PrinterJobHandlerTest::SetUpJobSuccessTest(int job_num) {
// The times requirement is relaxed for the ticket URI
// in order to accommodate TicketDownloadFailureTest
- EXPECT_CALL(url_callback_, OnRequestCreate(
- GURL(TicketURI(job_num)), _))
+ EXPECT_CALL(url_callback_, OnRequestCreate(TicketURI(job_num), _))
.Times(AtLeast(1));
- EXPECT_CALL(url_callback_, OnRequestCreate(GURL(DownloadURI(job_num)), _))
+ EXPECT_CALL(url_callback_, OnRequestCreate(DownloadURI(job_num), _))
.Times(Exactly(1))
.WillOnce(Invoke(this, &PrinterJobHandlerTest::AddMimeHeader));
- EXPECT_CALL(url_callback_, OnRequestCreate(GURL(InProgressURI(job_num)), _))
+ EXPECT_CALL(url_callback_, OnRequestCreate(InProgressURI(job_num), _))
.Times(Exactly(1));
- EXPECT_CALL(url_callback_, OnRequestCreate(GURL(DoneURI(job_num)), _))
+ EXPECT_CALL(url_callback_, OnRequestCreate(DoneURI(job_num), _))
.Times(Exactly(1));
EXPECT_CALL(print_system_->JobSpooler(),
@@ -660,10 +658,10 @@ TEST_F(PrinterJobHandlerTest, DISABLED_HappyPathTest) {
JobListResponse(0), true);
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonStartup)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonStartup), _))
.Times(Exactly(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonQueryMore)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonQueryMore), _))
.Times(Exactly(1));
SetUpJobSuccessTest(1);
@@ -679,19 +677,19 @@ TEST_F(PrinterJobHandlerTest, TicketDownloadFailureTest) {
JobListResponse(0), true);
factory_.SetFakeResponse(TicketURI(1), std::string(), false);
- EXPECT_CALL(url_callback_, OnRequestCreate(GURL(TicketURI(1)), _))
+ EXPECT_CALL(url_callback_, OnRequestCreate(TicketURI(1), _))
.Times(AtLeast(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonStartup)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonStartup), _))
.Times(AtLeast(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonQueryMore)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonQueryMore), _))
.Times(AtLeast(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonFailure)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonFailure), _))
.Times(AtLeast(1));
SetUpJobSuccessTest(2);
@@ -711,19 +709,19 @@ TEST_F(PrinterJobHandlerTest, DISABLED_ManyFailureTest) {
JobListResponse(0), true);
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonStartup)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonStartup), _))
.Times(AtLeast(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonQueryMore)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonQueryMore), _))
.Times(AtLeast(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonFailure)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonFailure), _))
.Times(AtLeast(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonRetry)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonRetry), _))
.Times(AtLeast(1));
SetUpJobSuccessTest(1);
@@ -756,23 +754,23 @@ TEST_F(PrinterJobHandlerTest, DISABLED_CompleteFailureTest) {
factory_.SetFakeResponse(TicketURI(1), std::string(), false);
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonStartup)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonStartup), _))
.Times(AtLeast(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonFailure)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonFailure), _))
.Times(AtLeast(1));
EXPECT_CALL(url_callback_,
- OnRequestCreate(GURL(JobListURI(kJobFetchReasonRetry)), _))
+ OnRequestCreate(JobListURI(kJobFetchReasonRetry), _))
.Times(AtLeast(1));
- EXPECT_CALL(url_callback_, OnRequestCreate(GURL(ErrorURI(1)), _))
+ EXPECT_CALL(url_callback_, OnRequestCreate(ErrorURI(1), _))
.Times(Exactly(1))
.WillOnce(InvokeWithoutArgs(
this, &PrinterJobHandlerTest::MakeJobFetchReturnNoJobs));
- EXPECT_CALL(url_callback_, OnRequestCreate(GURL(TicketURI(1)), _))
+ EXPECT_CALL(url_callback_, OnRequestCreate(TicketURI(1), _))
.Times(AtLeast(kNumRetriesBeforeAbandonJob));
BeginTest(70);
« chrome/browser/safe_browsing/download_protection_service.cc ('K') | « chrome/browser/ui/search/instant_extended_interactive_uitest.cc ('k') | net/url_request/test_url_fetcher_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698