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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 73503002: Move PDF to PWG conversion into PrivetLocalPrintOperationImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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.h ('K') | « chrome/browser/local_discovery/privet_http_impl.cc ('k') | chrome/browser/local_discovery/pwg_raster_converter.h » ('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 9062f3b22c0fac31f336ce88297edfc61a82aa93..ea068aa5d62ed5ca09c3116a4b81fe4113c96dc6 100644
--- a/chrome/browser/local_discovery/privet_http_unittest.cc
+++ b/chrome/browser/local_discovery/privet_http_unittest.cc
@@ -379,20 +379,6 @@ class MockLocalPrintDelegate : public PrivetLocalPrintOperation::Delegate {
MockLocalPrintDelegate() {}
~MockLocalPrintDelegate() {}
- virtual void OnPrivetPrintingRequestPDF(
- const PrivetLocalPrintOperation* print_operation) {
- OnPrivetPrintingRequestPDFInternal();
- }
-
- MOCK_METHOD0(OnPrivetPrintingRequestPDFInternal, void());
-
- virtual void OnPrivetPrintingRequestPWGRaster(
- const PrivetLocalPrintOperation* print_operation) {
- OnPrivetPrintingRequestPWGRasterInternal();
- }
-
- MOCK_METHOD0(OnPrivetPrintingRequestPWGRasterInternal, void());
-
virtual void OnPrivetPrintingDone(
const PrivetLocalPrintOperation* print_operation) {
OnPrivetPrintingDoneInternal();
@@ -408,6 +394,37 @@ class MockLocalPrintDelegate : public PrivetLocalPrintOperation::Delegate {
MOCK_METHOD1(OnPrivetPrintingErrorInternal, void(int http_code));
};
+// A note on PWG raster conversion: The PWG raster converter used simply
+// converts strings to file paths based on them by appending "test.pdf", since
+// it's easier to test that way. Instead of using a mock, we simply check if the
+// request is uploading a file that is based on this pattern.
+class FakePWGRasterConverter : public PWGRasterConverter {
+ public:
+ FakePWGRasterConverter() {
+ }
+
+ virtual ~FakePWGRasterConverter() {
+ }
+
+ virtual void SetResultCallback(const ResultCallback& callback) OVERRIDE {
+ callback_ = callback;
+ }
+
+ virtual void SetPDFData(scoped_refptr<base::RefCountedBytes> data) OVERRIDE {
+ std::string data_str((const char*)data->front(), data->size());
+ data_ = data_str;
+ }
+
+ virtual void Start() OVERRIDE {
+ callback_.Run(true, base::FilePath(data_ + "test.pdf"));
+ }
+
+ private:
+ ResultCallback callback_;
+ std::string data_;
+};
+
+
class PrivetInfoTest : public PrivetHTTPTest {
public:
PrivetInfoTest() {}
@@ -782,6 +799,17 @@ class PrivetLocalPrintTest : public PrivetHTTPTest {
virtual void SetUp() OVERRIDE {
local_print_operation_ = privet_client_->CreateLocalPrintOperation(
&local_print_delegate_);
+
+ local_print_operation_->SetPWGRasterConverterForTesting(
+ scoped_ptr<PWGRasterConverter>(new FakePWGRasterConverter));
+ }
+
+ scoped_refptr<base::RefCountedBytes> RefCountedBytesFromString(
+ std::string str) {
+ std::vector<unsigned char> str_vec;
+ str_vec.insert(str_vec.begin(), str.begin(), str.end());
+ return scoped_refptr<base::RefCountedBytes>(
+ base::RefCountedBytes::TakeVector(&str_vec));
}
protected:
@@ -792,20 +820,18 @@ class PrivetLocalPrintTest : public PrivetHTTPTest {
TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrint) {
local_print_operation_->SetUsername("sample@gmail.com");
local_print_operation_->SetJobname("Sample job name");
+ local_print_operation_->SetData(RefCountedBytesFromString(
+ "Sample print data"));
local_print_operation_->Start();
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/info"),
kSampleInfoResponse));
- EXPECT_CALL(local_print_delegate_, OnPrivetPrintingRequestPDFInternal());
-
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponse));
- local_print_operation_->SendData("Sample print data");
-
EXPECT_CALL(local_print_delegate_, OnPrivetPrintingDoneInternal());
// TODO(noamsml): Is encoding spaces as pluses standard?
@@ -819,20 +845,18 @@ TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrint) {
TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrintWithAnyMimetype) {
local_print_operation_->SetUsername("sample@gmail.com");
local_print_operation_->SetJobname("Sample job name");
+ local_print_operation_->SetData(RefCountedBytesFromString(
Vitaly Buka (NO REVIEWS) 2013/11/15 06:48:38 line break before RefCountedBytesFromString
Noam Samuel 2013/11/15 19:13:46 Done.
+ "Sample print data"));
local_print_operation_->Start();
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/info"),
kSampleInfoResponse));
- EXPECT_CALL(local_print_delegate_, OnPrivetPrintingRequestPDFInternal());
-
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponseWithAnyMimetype));
- local_print_operation_->SendData("Sample print data");
-
EXPECT_CALL(local_print_delegate_, OnPrivetPrintingDoneInternal());
// TODO(noamsml): Is encoding spaces as pluses standard?
@@ -846,28 +870,25 @@ TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrintWithAnyMimetype) {
TEST_F(PrivetLocalPrintTest, SuccessfulPWGLocalPrint) {
local_print_operation_->SetUsername("sample@gmail.com");
local_print_operation_->SetJobname("Sample job name");
+ local_print_operation_->SetData(RefCountedBytesFromString(
Vitaly Buka (NO REVIEWS) 2013/11/15 06:48:38 same
Noam Samuel 2013/11/15 19:13:46 Done.
+ "path/to/"));
local_print_operation_->Start();
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/info"),
kSampleInfoResponse));
- EXPECT_CALL(local_print_delegate_,
- OnPrivetPrintingRequestPWGRasterInternal());
-
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponsePWGOnly));
- local_print_operation_->SendDataFile(base::FilePath("sample/file/path"));
-
EXPECT_CALL(local_print_delegate_, OnPrivetPrintingDoneInternal());
// TODO(noamsml): Is encoding spaces as pluses standard?
EXPECT_TRUE(SuccessfulResponseToURLAndFilePath(
GURL("http://10.0.0.8:6006/privet/printer/submitdoc?"
"user=sample%40gmail.com&jobname=Sample+job+name"),
- base::FilePath("sample/file/path"),
+ base::FilePath("path/to/test.pdf"),
kSampleLocalPrintResponse));
};
@@ -875,20 +896,18 @@ 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_->SetData(RefCountedBytesFromString(
Vitaly Buka (NO REVIEWS) 2013/11/15 06:48:38 same
Noam Samuel 2013/11/15 19:13:46 Done.
+ "Sample print data"));
local_print_operation_->Start();
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/info"),
kSampleInfoResponseWithCreatejob));
- EXPECT_CALL(local_print_delegate_, OnPrivetPrintingRequestPDFInternal());
-
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponse));
- local_print_operation_->SendData("Sample print data");
-
EXPECT_TRUE(SuccessfulResponseToURLAndData(
GURL("http://10.0.0.8:6006/privet/printer/createjob"),
"Sample print ticket",
@@ -908,43 +927,36 @@ 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_->SetData(RefCountedBytesFromString(
+ "sample/path/"));
local_print_operation_->Start();
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/info"),
kSampleInfoResponseWithCreatejob));
- EXPECT_CALL(local_print_delegate_, OnPrivetPrintingRequestPDFInternal());
-
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponse));
- local_print_operation_->SendData("Sample print data");
-
EXPECT_TRUE(SuccessfulResponseToURLAndData(
GURL("http://10.0.0.8:6006/privet/printer/createjob"),
"Sample print ticket",
kSampleCreatejobResponse));
- EXPECT_CALL(local_print_delegate_,
- OnPrivetPrintingRequestPWGRasterInternal());
-
// TODO(noamsml): Is encoding spaces as pluses standard?
EXPECT_TRUE(SuccessfulResponseToURLAndData(
GURL("http://10.0.0.8:6006/privet/printer/submitdoc?"
"user=sample%40gmail.com&jobname=Sample+job+name&job_id=1234"),
- "Sample print data",
+ "sample/path/",
kSampleInvalidDocumentTypeResponse));
- local_print_operation_->SendData("Sample print data2");
-
EXPECT_CALL(local_print_delegate_, OnPrivetPrintingDoneInternal());
- EXPECT_TRUE(SuccessfulResponseToURLAndData(
+ EXPECT_TRUE(SuccessfulResponseToURLAndFilePath(
GURL("http://10.0.0.8:6006/privet/printer/submitdoc?"
"user=sample%40gmail.com&jobname=Sample+job+name&job_id=1234"),
- "Sample print data2",
+ base::FilePath("sample/path/test.pdf"),
kSampleLocalPrintResponse));
};
@@ -952,20 +964,18 @@ 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_->SetData(RefCountedBytesFromString(
+ "Sample print data"));
local_print_operation_->Start();
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/info"),
kSampleInfoResponseWithCreatejob));
- EXPECT_CALL(local_print_delegate_, OnPrivetPrintingRequestPDFInternal());
-
EXPECT_TRUE(SuccessfulResponseToURL(
GURL("http://10.0.0.8:6006/privet/capabilities"),
kSampleCapabilitiesResponse));
- local_print_operation_->SendData("Sample print data");
-
EXPECT_TRUE(SuccessfulResponseToURLAndData(
GURL("http://10.0.0.8:6006/privet/printer/createjob"),
"Sample print ticket",
« chrome/browser/local_discovery/privet_http.h ('K') | « chrome/browser/local_discovery/privet_http_impl.cc ('k') | chrome/browser/local_discovery/pwg_raster_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698