diff options
| author | olli.raula <olli.raula@intel.com> | 2015-09-10 23:03:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-11 06:03:43 +0000 |
| commit | ef782993a7a420acdc5c0d2583de4dd9507064a7 (patch) | |
| tree | af78aab8687ba3bbaf5010dc058d14a5b1535e1c /chrome/service | |
| parent | 0f477f6ddb003bbb75e0dd710c3f3544173f1de7 (diff) | |
| download | chromium_src-ef782993a7a420acdc5c0d2583de4dd9507064a7.zip chromium_src-ef782993a7a420acdc5c0d2583de4dd9507064a7.tar.gz chromium_src-ef782993a7a420acdc5c0d2583de4dd9507064a7.tar.bz2 | |
Remove use of JSONReader::DeprecatedRead from printer_job_queue_handler_unittest.cc
Remove use of deprecated function DeprecatedRead from
chrome/service/cloud_print/printer_job_queue_handler_unittest.cc
Also make PrinterJobQueueHandlerTest to use scoped_ptr
BUG=523194
Review URL: https://codereview.chromium.org/1316923003
Cr-Commit-Position: refs/heads/master@{#348342}
Diffstat (limited to 'chrome/service')
| -rw-r--r-- | chrome/service/cloud_print/printer_job_queue_handler_unittest.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/chrome/service/cloud_print/printer_job_queue_handler_unittest.cc b/chrome/service/cloud_print/printer_job_queue_handler_unittest.cc index 134242e..0e54257 100644 --- a/chrome/service/cloud_print/printer_job_queue_handler_unittest.cc +++ b/chrome/service/cloud_print/printer_job_queue_handler_unittest.cc @@ -51,22 +51,25 @@ class TimeProviderMock : public PrinterJobQueueHandler::TimeProvider { class PrinterJobQueueHandlerTest : public ::testing::Test { protected: - base::Value* data_; - base::DictionaryValue* json_data_; + scoped_ptr<base::Value> data_; + + const base::DictionaryValue* GetAsDictionary() const { + const base::DictionaryValue* json_data_ = nullptr; + EXPECT_TRUE(data_->GetAsDictionary(&json_data_)); + return json_data_; + } + void SetUp() override { base::JSONReader json_reader; - data_ = json_reader.DeprecatedRead(kJobListResponse); - data_->GetAsDictionary(&json_data_); + data_ = json_reader.Read(kJobListResponse); } - - void TearDown() override { delete data_; } }; TEST_F(PrinterJobQueueHandlerTest, BasicJobReadTest) { PrinterJobQueueHandler job_queue_handler; std::vector<JobDetails> jobs; - job_queue_handler.GetJobsFromQueue(json_data_, &jobs); + job_queue_handler.GetJobsFromQueue(GetAsDictionary(), &jobs); ASSERT_EQ((size_t)3, jobs.size()); @@ -99,7 +102,7 @@ TEST_F(PrinterJobQueueHandlerTest, PreferNonFailureTest) { job_queue_handler.JobFetchFailed("__testjob1"); std::vector<JobDetails> jobs; - job_queue_handler.GetJobsFromQueue(json_data_, &jobs); + job_queue_handler.GetJobsFromQueue(GetAsDictionary(), &jobs); EXPECT_EQ(std::string("__testjob2"), jobs[0].job_id_); EXPECT_EQ(base::TimeDelta(), jobs[0].time_remaining_); @@ -128,7 +131,7 @@ TEST_F(PrinterJobQueueHandlerTest, PreferNoTimeTest) { job_queue_handler.JobFetchFailed("__testjob3"); std::vector<JobDetails> jobs; - job_queue_handler.GetJobsFromQueue(json_data_, &jobs); + job_queue_handler.GetJobsFromQueue(GetAsDictionary(), &jobs); EXPECT_EQ(base::TimeDelta(), jobs[0].time_remaining_); EXPECT_EQ(std::string("__testjob1"), jobs[0].job_id_); @@ -158,8 +161,7 @@ TEST_F(PrinterJobQueueHandlerTest, PreferLowerTimeTest) { job_queue_handler.JobFetchFailed("__testjob3"); std::vector<JobDetails> jobs; - job_queue_handler.GetJobsFromQueue(json_data_, - &jobs); + job_queue_handler.GetJobsFromQueue(GetAsDictionary(), &jobs); base::TimeDelta time_to_wait = jobs[0].time_remaining_; EXPECT_NE(base::TimeDelta(), time_to_wait); @@ -169,8 +171,7 @@ TEST_F(PrinterJobQueueHandlerTest, PreferLowerTimeTest) { .WillByDefault(Return(base::Time::UnixEpoch() + base::TimeDelta::FromSeconds(4) + time_to_wait)); - job_queue_handler.GetJobsFromQueue(json_data_, - &jobs); + job_queue_handler.GetJobsFromQueue(GetAsDictionary(), &jobs); EXPECT_EQ(base::TimeDelta(), jobs[0].time_remaining_); EXPECT_EQ(std::string("__testjob2"), jobs[0].job_id_); |