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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/local_discovery/privet_http_unittest.cc

Issue 208583007: Tunnel the CDD from the Print Preview javascript to the privet operation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/local_discovery/privet_http_impl.h ('K') | « chrome/browser/local_discovery/privet_http_impl.cc ('k') | chrome/browser/resources/print_preview/native_layer.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/local_discovery/privet_http_unittest.cc
diff --git a/chrome/browser/local_discovery/privet_http_unittest.cc b/chrome/browser/local_discovery/privet_http_unittest.cc
index 38b5938a40a2f0c945c4aa8d0db78a95ed202b2a..b9238d8d855aa1df6ce563bac365ca8fcd9a8166 100644
--- a/chrome/browser/local_discovery/privet_http_unittest.cc
+++ b/chrome/browser/local_discovery/privet_http_unittest.cc
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "base/bind.h"
+#include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
#include "base/message_loop/message_loop.h"
#include "chrome/browser/local_discovery/privet_http_impl.h"
#include "net/base/host_port_pair.h"
@@ -185,6 +187,19 @@ const char kSampleCreatejobResponse[] = "{ \"job_id\": \"1234\" }";
const char kSampleEmptyJSONResponse[] = "{}";
+const char kSampleCDD[] = "{ \"version\" : \"1.0\" }";
+
+// Return the representation of the given JSON that would be outputted by
+// JSONWriter. This ensures the same JSON values are represented by the same
+// string.
+std::string NormalizeJson(const std::string& json) {
+ std::string result = json;
+ scoped_ptr<base::Value> value(base::JSONReader::Read(result));
+ DCHECK(value);
+ base::JSONWriter::Write(value.get(), &result);
+ return result;
+}
+
class MockTestURLFetcherFactoryDelegate
: public net::TestURLFetcher::DelegateForTests {
public:
@@ -248,6 +263,25 @@ class PrivetHTTPTest : public ::testing::Test {
return SuccessfulResponseToURL(url, response);
}
+ bool SuccessfulResponseToURLAndJSONData(const GURL& url,
+ const std::string& data,
+ const std::string& response) {
+ net::TestURLFetcher* fetcher = fetcher_factory_.GetFetcherByID(0);
+ EXPECT_TRUE(fetcher);
+ EXPECT_EQ(url, fetcher->GetOriginalURL());
+
+ if (!fetcher)
+ return false;
+
+ std::string normalized_data = NormalizeJson(data);
+ std::string normalized_upload_data = NormalizeJson(fetcher->upload_data());
+ EXPECT_EQ(normalized_data, normalized_upload_data);
+ if (normalized_data != normalized_upload_data)
+ return false;
+
+ return SuccessfulResponseToURL(url, response);
+ }
+
bool SuccessfulResponseToURLAndFilePath(const GURL& url,
const base::FilePath& file_path,
const std::string& response) {
@@ -849,7 +883,7 @@ TEST_F(PrivetLocalPrintTest, SuccessfulPWGLocalPrint) {
TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrintWithCreatejob) {
local_print_operation_->SetUsername("sample@gmail.com");
local_print_operation_->SetJobname("Sample job name");
- local_print_operation_->SetTicket("Sample print ticket");
+ local_print_operation_->SetTicket(kSampleCDD);
local_print_operation_->SetData(
RefCountedBytesFromString("Sample print data"));
local_print_operation_->Start();
@@ -865,9 +899,9 @@ TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrintWithCreatejob) {
SuccessfulResponseToURL(GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponse));
- EXPECT_TRUE(SuccessfulResponseToURLAndData(
+ EXPECT_TRUE(SuccessfulResponseToURLAndJSONData(
GURL("http://10.0.0.8:6006/privet/printer/createjob"),
- "Sample print ticket",
+ kSampleCDD,
kSampleCreatejobResponse));
EXPECT_CALL(local_print_delegate_, OnPrivetPrintingDoneInternal());
@@ -885,7 +919,7 @@ TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrintWithOverlongName) {
local_print_operation_->SetUsername("sample@gmail.com");
local_print_operation_->SetJobname(
"123456789:123456789:123456789:123456789:123456789:123456789:123456789:");
- local_print_operation_->SetTicket("Sample print ticket");
+ local_print_operation_->SetTicket(kSampleCDD);
local_print_operation_->SetData(
RefCountedBytesFromString("Sample print data"));
local_print_operation_->Start();
@@ -900,9 +934,9 @@ TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrintWithOverlongName) {
SuccessfulResponseToURL(GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponse));
- EXPECT_TRUE(SuccessfulResponseToURLAndData(
+ EXPECT_TRUE(SuccessfulResponseToURLAndJSONData(
GURL("http://10.0.0.8:6006/privet/printer/createjob"),
- "Sample print ticket",
+ kSampleCDD,
kSampleCreatejobResponse));
EXPECT_CALL(local_print_delegate_, OnPrivetPrintingDoneInternal());
@@ -921,7 +955,7 @@ TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrintWithOverlongName) {
TEST_F(PrivetLocalPrintTest, PDFPrintInvalidDocumentTypeRetry) {
local_print_operation_->SetUsername("sample@gmail.com");
local_print_operation_->SetJobname("Sample job name");
- local_print_operation_->SetTicket("Sample print ticket");
+ local_print_operation_->SetTicket(kSampleCDD);
local_print_operation_->SetData(
RefCountedBytesFromString("sample/path/"));
local_print_operation_->Start();
@@ -937,9 +971,9 @@ TEST_F(PrivetLocalPrintTest, PDFPrintInvalidDocumentTypeRetry) {
SuccessfulResponseToURL(GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponse));
- EXPECT_TRUE(SuccessfulResponseToURLAndData(
+ EXPECT_TRUE(SuccessfulResponseToURLAndJSONData(
GURL("http://10.0.0.8:6006/privet/printer/createjob"),
- "Sample print ticket",
+ kSampleCDD,
kSampleCreatejobResponse));
// TODO(noamsml): Is encoding spaces as pluses standard?
@@ -963,7 +997,7 @@ TEST_F(PrivetLocalPrintTest, PDFPrintInvalidDocumentTypeRetry) {
TEST_F(PrivetLocalPrintTest, LocalPrintRetryOnInvalidJobID) {
local_print_operation_->SetUsername("sample@gmail.com");
local_print_operation_->SetJobname("Sample job name");
- local_print_operation_->SetTicket("Sample print ticket");
+ local_print_operation_->SetTicket(kSampleCDD);
local_print_operation_->SetData(
RefCountedBytesFromString("Sample print data"));
local_print_operation_->Start();
@@ -979,9 +1013,9 @@ TEST_F(PrivetLocalPrintTest, LocalPrintRetryOnInvalidJobID) {
GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponse));
- EXPECT_TRUE(SuccessfulResponseToURLAndData(
+ EXPECT_TRUE(SuccessfulResponseToURLAndJSONData(
GURL("http://10.0.0.8:6006/privet/printer/createjob"),
- "Sample print ticket",
+ kSampleCDD,
kSampleCreatejobResponse));
EXPECT_TRUE(SuccessfulResponseToURLAndData(
« chrome/browser/local_discovery/privet_http_impl.h ('K') | « chrome/browser/local_discovery/privet_http_impl.cc ('k') | chrome/browser/resources/print_preview/native_layer.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698