Commit 3b7b671f authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Fix some nits in PrinterCapabilitiesTest.

Change-Id: I853a885dd09d523969353c698a7312272d5b0523
Reviewed-on: https://chromium-review.googlesource.com/c/1357761
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613378}
parent 3da02f95
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
namespace printing { namespace printing {
namespace { namespace {
const char kDpi[] = "dpi"; const char kDpi[] = "dpi";
}
} // namespace
class PrinterCapabilitiesTest : public testing::Test { class PrinterCapabilitiesTest : public testing::Test {
public: public:
...@@ -43,8 +45,8 @@ class PrinterCapabilitiesTest : public testing::Test { ...@@ -43,8 +45,8 @@ class PrinterCapabilitiesTest : public testing::Test {
// Verify that we don't crash for a missing printer and a nullptr is never // Verify that we don't crash for a missing printer and a nullptr is never
// returned. // returned.
TEST_F(PrinterCapabilitiesTest, NonNullForMissingPrinter) { TEST_F(PrinterCapabilitiesTest, NonNullForMissingPrinter) {
PrinterBasicInfo basic_info;
std::string printer_name = "missing_printer"; std::string printer_name = "missing_printer";
PrinterBasicInfo basic_info;
std::unique_ptr<base::DictionaryValue> settings_dictionary = std::unique_ptr<base::DictionaryValue> settings_dictionary =
GetSettingsOnBlockingPool(printer_name, basic_info, nullptr); GetSettingsOnBlockingPool(printer_name, basic_info, nullptr);
...@@ -55,24 +57,24 @@ TEST_F(PrinterCapabilitiesTest, NonNullForMissingPrinter) { ...@@ -55,24 +57,24 @@ TEST_F(PrinterCapabilitiesTest, NonNullForMissingPrinter) {
TEST_F(PrinterCapabilitiesTest, ProvidedCapabilitiesUsed) { TEST_F(PrinterCapabilitiesTest, ProvidedCapabilitiesUsed) {
std::string printer_name = "test_printer"; std::string printer_name = "test_printer";
PrinterBasicInfo basic_info; PrinterBasicInfo basic_info;
auto caps = std::make_unique<PrinterSemanticCapsAndDefaults>();
// set a capability
caps->dpis = {gfx::Size(600, 600)};
// Set a capability and add a valid printer.
auto caps = std::make_unique<PrinterSemanticCapsAndDefaults>();
caps->dpis = {{600, 600}};
print_backend()->AddValidPrinter(printer_name, std::move(caps)); print_backend()->AddValidPrinter(printer_name, std::move(caps));
std::unique_ptr<base::DictionaryValue> settings_dictionary = std::unique_ptr<base::DictionaryValue> settings_dictionary =
GetSettingsOnBlockingPool(printer_name, basic_info, print_backend()); GetSettingsOnBlockingPool(printer_name, basic_info, print_backend());
// verify settings were created // Verify settings were created.
ASSERT_TRUE(settings_dictionary); ASSERT_TRUE(settings_dictionary);
// verify capabilities and have one entry // Verify capabilities dict exists and has 2 entries. (printer and version)
base::DictionaryValue* cdd; base::DictionaryValue* cdd;
ASSERT_TRUE(settings_dictionary->GetDictionary(kSettingCapabilities, &cdd)); ASSERT_TRUE(settings_dictionary->GetDictionary(kSettingCapabilities, &cdd));
EXPECT_EQ(2U, cdd->size());
// read the CDD for the dpi attribute. // Read the CDD for the "dpi" attribute.
base::DictionaryValue* caps_dict; base::DictionaryValue* caps_dict;
ASSERT_TRUE(cdd->GetDictionary(kPrinter, &caps_dict)); ASSERT_TRUE(cdd->GetDictionary(kPrinter, &caps_dict));
EXPECT_TRUE(caps_dict->HasKey(kDpi)); EXPECT_TRUE(caps_dict->HasKey(kDpi));
...@@ -84,16 +86,16 @@ TEST_F(PrinterCapabilitiesTest, NullCapabilitiesExcluded) { ...@@ -84,16 +86,16 @@ TEST_F(PrinterCapabilitiesTest, NullCapabilitiesExcluded) {
std::string printer_name = "test_printer"; std::string printer_name = "test_printer";
PrinterBasicInfo basic_info; PrinterBasicInfo basic_info;
// return false when attempting to retrieve capabilities // Return false when attempting to retrieve capabilities.
print_backend()->AddValidPrinter(printer_name, nullptr); print_backend()->AddValidPrinter(printer_name, nullptr);
std::unique_ptr<base::DictionaryValue> settings_dictionary = std::unique_ptr<base::DictionaryValue> settings_dictionary =
GetSettingsOnBlockingPool(printer_name, basic_info, print_backend()); GetSettingsOnBlockingPool(printer_name, basic_info, print_backend());
// verify settings were created // Verify settings were created.
ASSERT_TRUE(settings_dictionary); ASSERT_TRUE(settings_dictionary);
// verify that capabilities is an empty dictionary // Verify that capabilities is an empty dictionary.
base::DictionaryValue* caps_dict; base::DictionaryValue* caps_dict;
ASSERT_TRUE( ASSERT_TRUE(
settings_dictionary->GetDictionary(kSettingCapabilities, &caps_dict)); settings_dictionary->GetDictionary(kSettingCapabilities, &caps_dict));
......
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