Commit e61faf7b authored by Pranav Batra's avatar Pranav Batra Committed by Commit Bot

Fix broken printing api unit tests

Bug: none
Test: xvfb-run ./unit_tests --gtest_filter=PrintingAPIHandlerUnittest.*:PrintingApiUtilsTest.*
Test: xvfb-run ./browser_tests --gtest_filter=PrintingApiTest.*

Change-Id: I9db22507ec83082536accf12378d849693c7c04c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2411565Reviewed-by: default avatarNikita Podguzov <nikitapodguzov@chromium.org>
Commit-Queue: Pranav Batra <batrapranav@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807200}
parent a27166e7
...@@ -96,7 +96,7 @@ constexpr char kId2[] = "id2"; ...@@ -96,7 +96,7 @@ constexpr char kId2[] = "id2";
constexpr char kId3[] = "id3"; constexpr char kId3[] = "id3";
constexpr char kName[] = "name"; constexpr char kName[] = "name";
constexpr char kDescription[] = "description"; constexpr char kDescription[] = "description";
constexpr char kUri[] = "ipp://1.2.3.4/"; constexpr char kUri[] = "ipp://1.2.3.4";
constexpr int kHorizontalDpi = 300; constexpr int kHorizontalDpi = 300;
constexpr int kVerticalDpi = 400; constexpr int kVerticalDpi = 400;
...@@ -199,7 +199,7 @@ ConstructPrinterCapabilities() { ...@@ -199,7 +199,7 @@ ConstructPrinterCapabilities() {
std::make_unique<printing::PrinterSemanticCapsAndDefaults>(); std::make_unique<printing::PrinterSemanticCapsAndDefaults>();
capabilities->color_model = printing::mojom::ColorModel::kColor; capabilities->color_model = printing::mojom::ColorModel::kColor;
capabilities->duplex_modes.push_back(printing::mojom::DuplexMode::kSimplex); capabilities->duplex_modes.push_back(printing::mojom::DuplexMode::kSimplex);
capabilities->copies_max = 2; capabilities->copies_max = 5;
capabilities->dpis.push_back(gfx::Size(kHorizontalDpi, kVerticalDpi)); capabilities->dpis.push_back(gfx::Size(kHorizontalDpi, kVerticalDpi));
printing::PrinterSemanticCapsAndDefaults::Paper paper; printing::PrinterSemanticCapsAndDefaults::Paper paper;
paper.vendor_id = kMediaSizeVendorId; paper.vendor_id = kMediaSizeVendorId;
...@@ -541,7 +541,7 @@ TEST_F(PrintingAPIHandlerUnittest, GetPrinterInfo) { ...@@ -541,7 +541,7 @@ TEST_F(PrintingAPIHandlerUnittest, GetPrinterInfo) {
// Mock CUPS wrapper to return predefined status for given printer. // Mock CUPS wrapper to return predefined status for given printer.
printing::PrinterStatus::PrinterReason reason; printing::PrinterStatus::PrinterReason reason;
reason.reason = printing::PrinterStatus::PrinterReason::MEDIA_EMPTY; reason.reason = printing::PrinterStatus::PrinterReason::Reason::kMediaEmpty;
cups_wrapper_->SetPrinterStatus(kPrinterId, reason); cups_wrapper_->SetPrinterStatus(kPrinterId, reason);
base::RunLoop run_loop; base::RunLoop run_loop;
......
...@@ -100,7 +100,7 @@ printing::PrinterSemanticCapsAndDefaults ConstructPrinterCapabilities() { ...@@ -100,7 +100,7 @@ printing::PrinterSemanticCapsAndDefaults ConstructPrinterCapabilities() {
printing::PrinterSemanticCapsAndDefaults capabilities; printing::PrinterSemanticCapsAndDefaults capabilities;
capabilities.color_model = printing::mojom::ColorModel::kColor; capabilities.color_model = printing::mojom::ColorModel::kColor;
capabilities.duplex_modes.push_back(printing::mojom::DuplexMode::kLongEdge); capabilities.duplex_modes.push_back(printing::mojom::DuplexMode::kLongEdge);
capabilities.copies_max = 2; capabilities.copies_max = kCopies;
capabilities.dpis.push_back(gfx::Size(kHorizontalDpi, kVerticalDpi)); capabilities.dpis.push_back(gfx::Size(kHorizontalDpi, kVerticalDpi));
printing::PrinterSemanticCapsAndDefaults::Paper paper; printing::PrinterSemanticCapsAndDefaults::Paper paper;
paper.vendor_id = kMediaSizeVendorId; paper.vendor_id = kMediaSizeVendorId;
...@@ -193,7 +193,7 @@ TEST(PrintingApiUtilsTest, CheckSettingsAndCapabilitiesCompatibility_Color) { ...@@ -193,7 +193,7 @@ TEST(PrintingApiUtilsTest, CheckSettingsAndCapabilitiesCompatibility_Color) {
std::unique_ptr<printing::PrintSettings> settings = ConstructPrintSettings(); std::unique_ptr<printing::PrintSettings> settings = ConstructPrintSettings();
printing::PrinterSemanticCapsAndDefaults capabilities = printing::PrinterSemanticCapsAndDefaults capabilities =
ConstructPrinterCapabilities(); ConstructPrinterCapabilities();
capabilities.color_model = printing::UNKNOWN_COLOR_MODEL; capabilities.color_model = printing::mojom::ColorModel::kUnknownColorModel;
EXPECT_FALSE( EXPECT_FALSE(
CheckSettingsAndCapabilitiesCompatibility(*settings, capabilities)); CheckSettingsAndCapabilitiesCompatibility(*settings, capabilities));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment