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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/media/router/issue_unittest.cc

Issue 2176613003: [Media Router] Clean up issues related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/media/router/issue_manager.h ('K') | « chrome/browser/media/router/issue_manager_unittest.cc ('k') | chrome/browser/media/router/mojo/media_router_type_converters.h » ('j') | chrome/browser/ui/toolbar/media_router_action.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/router/issue_unittest.cc
diff --git a/chrome/browser/media/router/issue_unittest.cc b/chrome/browser/media/router/issue_unittest.cc
index 79cfcd643c7838260bd5b2a84532d1c59715de25..517ab298cc16a3f4563313068d8909a7394acb63 100644
--- a/chrome/browser/media/router/issue_unittest.cc
+++ b/chrome/browser/media/router/issue_unittest.cc
@@ -9,131 +9,142 @@
namespace media_router {
-// Checks static IssueAction factory method.
-TEST(IssueUnitTest, IssueActionConstructor) {
- // Pre-defined "Dismiss" issue action.
- IssueAction action1(IssueAction::TYPE_DISMISS);
- EXPECT_EQ(IssueAction::TYPE_DISMISS, action1.type());
-
- // Pre-defined "Learn More" issue action.
- IssueAction action2(IssueAction::TYPE_LEARN_MORE);
- EXPECT_EQ(IssueAction::TYPE_LEARN_MORE, action2.type());
+namespace {
+
+Issue CreateWarningIssue(Issue::ActionType action_type) {
+ Issue issue("title", action_type, Issue::Severity::WARNING);
+ issue.set_message("message");
+ issue.set_help_page_id(12345);
+ return issue;
}
-// Tests custom Issue factory method without any secondary actions.
-TEST(IssueUnitTest, CustomIssueConstructionWithNoSecondaryActions) {
- std::vector<IssueAction> secondary_actions;
- std::string title = "title";
- std::string message = "message";
+Issue CreateFatalRouteIssueWithMessage(Issue::ActionType action_type) {
+ Issue issue("title", action_type, Issue::Severity::FATAL);
+ issue.set_message("message");
+ issue.set_route_id("routeid");
+ issue.set_help_page_id(12345);
+ return issue;
+}
+
+Issue CreateFatalRouteIssue(Issue::ActionType action_type) {
+ Issue issue("title", action_type, Issue::Severity::FATAL);
+ issue.set_route_id("routeid");
+ issue.set_help_page_id(12345);
+ return issue;
+}
- Issue issue1(title, message, IssueAction(IssueAction::TYPE_DISMISS),
- secondary_actions, "", Issue::WARNING, false,
- 12345);
+} // namespace
- EXPECT_EQ(title, issue1.title());
- EXPECT_EQ(message, issue1.message());
- EXPECT_EQ(IssueAction::TYPE_DISMISS, issue1.default_action().type());
+// Tests Issues without any secondary actions.
+TEST(IssueUnitTest, CustomIssueConstructionWithNoSecondaryActions) {
+ Issue issue1 = CreateWarningIssue(Issue::ActionType::DISMISS);
+
+ EXPECT_EQ("title", issue1.title());
+ EXPECT_EQ("message", issue1.message());
+ EXPECT_EQ(Issue::ActionType::DISMISS, issue1.default_action());
EXPECT_TRUE(issue1.secondary_actions().empty());
- EXPECT_EQ(Issue::WARNING, issue1.severity());
+ EXPECT_EQ(Issue::Severity::WARNING, issue1.severity());
EXPECT_EQ("", issue1.route_id());
- EXPECT_TRUE(issue1.is_global());
- EXPECT_FALSE(issue1.is_blocking());
+ EXPECT_TRUE(issue1.IsGlobal());
+ EXPECT_FALSE(issue1.IsBlocking());
EXPECT_EQ(12345, issue1.help_page_id());
- Issue issue2(title, message, IssueAction(IssueAction::TYPE_DISMISS),
- secondary_actions, "routeid", Issue::FATAL, true,
- 12345);
+ Issue issue2 = CreateFatalRouteIssueWithMessage(Issue::ActionType::DISMISS);
- EXPECT_EQ(title, issue2.title());
- EXPECT_EQ(message, issue2.message());
- EXPECT_EQ(IssueAction::TYPE_DISMISS, issue1.default_action().type());
+ EXPECT_EQ("title", issue2.title());
+ EXPECT_EQ("message", issue2.message());
+ EXPECT_EQ(Issue::ActionType::DISMISS, issue1.default_action());
EXPECT_TRUE(issue2.secondary_actions().empty());
- EXPECT_EQ(Issue::FATAL, issue2.severity());
+ EXPECT_EQ(Issue::Severity::FATAL, issue2.severity());
EXPECT_EQ("routeid", issue2.route_id());
- EXPECT_FALSE(issue2.is_global());
- EXPECT_TRUE(issue2.is_blocking());
- EXPECT_EQ(12345, issue1.help_page_id());
+ EXPECT_FALSE(issue2.IsGlobal());
+ EXPECT_TRUE(issue2.IsBlocking());
+ EXPECT_EQ(12345, issue2.help_page_id());
- Issue issue3(title, "", IssueAction(IssueAction::TYPE_DISMISS),
- secondary_actions, "routeid", Issue::FATAL, true,
- 12345);
+ Issue issue3 = CreateFatalRouteIssue(Issue::ActionType::DISMISS);
- EXPECT_EQ(title, issue3.title());
+ EXPECT_EQ("title", issue3.title());
EXPECT_EQ("", issue3.message());
- EXPECT_EQ(IssueAction::TYPE_DISMISS, issue1.default_action().type());
+ EXPECT_EQ(Issue::ActionType::DISMISS, issue1.default_action());
EXPECT_TRUE(issue3.secondary_actions().empty());
- EXPECT_EQ(Issue::FATAL, issue3.severity());
+ EXPECT_EQ(Issue::Severity::FATAL, issue3.severity());
EXPECT_EQ("routeid", issue3.route_id());
- EXPECT_FALSE(issue3.is_global());
- EXPECT_TRUE(issue3.is_blocking());
- EXPECT_EQ(12345, issue1.help_page_id());
+ EXPECT_FALSE(issue3.IsGlobal());
+ EXPECT_TRUE(issue3.IsBlocking());
+ EXPECT_EQ(12345, issue3.help_page_id());
}
-// Tests custom Issue factory method with secondary actions.
+// Tests Issues with secondary actions.
TEST(IssueUnitTest, CustomIssueConstructionWithSecondaryActions) {
- std::vector<IssueAction> secondary_actions;
- secondary_actions.push_back(IssueAction(IssueAction::TYPE_DISMISS));
- EXPECT_EQ(1u, secondary_actions.size());
- std::string title = "title";
- std::string message = "message";
+ std::vector<Issue::ActionType> secondary_actions;
+ secondary_actions.push_back(Issue::ActionType::DISMISS);
- Issue issue1(title, message, IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "", Issue::WARNING, false, -1);
+ Issue issue1 = CreateWarningIssue(Issue::ActionType::LEARN_MORE);
+ issue1.set_secondary_actions(secondary_actions);
- EXPECT_EQ(title, issue1.title());
- EXPECT_EQ(message, issue1.message());
- EXPECT_EQ(IssueAction::TYPE_LEARN_MORE, issue1.default_action().type());
+ EXPECT_EQ("title", issue1.title());
+ EXPECT_EQ("message", issue1.message());
+ EXPECT_EQ(Issue::ActionType::LEARN_MORE, issue1.default_action());
EXPECT_FALSE(issue1.secondary_actions().empty());
EXPECT_EQ(1u, issue1.secondary_actions().size());
- EXPECT_EQ(Issue::WARNING, issue1.severity());
+ EXPECT_EQ(Issue::Severity::WARNING, issue1.severity());
EXPECT_EQ("", issue1.route_id());
- EXPECT_TRUE(issue1.is_global());
- EXPECT_FALSE(issue1.is_blocking());
+ EXPECT_TRUE(issue1.IsGlobal());
+ EXPECT_FALSE(issue1.IsBlocking());
- Issue issue2(title, message, IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "routeid", Issue::FATAL, true, -1);
+ Issue issue2 =
+ CreateFatalRouteIssueWithMessage(Issue::ActionType::LEARN_MORE);
+ issue2.set_secondary_actions(secondary_actions);
- EXPECT_EQ(title, issue2.title());
- EXPECT_EQ(message, issue2.message());
- EXPECT_EQ(IssueAction::TYPE_LEARN_MORE, issue2.default_action().type());
+ EXPECT_EQ("title", issue2.title());
+ EXPECT_EQ("message", issue2.message());
+ EXPECT_EQ(Issue::ActionType::LEARN_MORE, issue2.default_action());
EXPECT_FALSE(issue2.secondary_actions().empty());
EXPECT_EQ(1u, issue2.secondary_actions().size());
- EXPECT_EQ(Issue::FATAL, issue2.severity());
+ EXPECT_EQ(Issue::Severity::FATAL, issue2.severity());
EXPECT_EQ("routeid", issue2.route_id());
- EXPECT_FALSE(issue2.is_global());
- EXPECT_TRUE(issue2.is_blocking());
+ EXPECT_FALSE(issue2.IsGlobal());
+ EXPECT_TRUE(issue2.IsBlocking());
- Issue issue3(title, "", IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "routeid", Issue::FATAL, true, -1);
+ Issue issue3 = CreateFatalRouteIssue(Issue::ActionType::LEARN_MORE);
+ issue3.set_secondary_actions(secondary_actions);
- EXPECT_EQ(title, issue3.title());
+ EXPECT_EQ("title", issue3.title());
EXPECT_EQ("", issue3.message());
- EXPECT_EQ(IssueAction::TYPE_LEARN_MORE, issue3.default_action().type());
+ EXPECT_EQ(Issue::ActionType::LEARN_MORE, issue3.default_action());
EXPECT_FALSE(issue3.secondary_actions().empty());
EXPECT_EQ(1u, issue3.secondary_actions().size());
- EXPECT_EQ(Issue::FATAL, issue3.severity());
+ EXPECT_EQ(Issue::Severity::FATAL, issue3.severity());
EXPECT_EQ("routeid", issue3.route_id());
- EXPECT_FALSE(issue3.is_global());
- EXPECT_TRUE(issue3.is_blocking());
+ EXPECT_FALSE(issue3.IsGlobal());
+ EXPECT_TRUE(issue3.IsBlocking());
}
-// Tests == and != method.
-TEST(IssueUnitTest, Equal) {
- std::vector<IssueAction> secondary_actions;
- secondary_actions.push_back(IssueAction(IssueAction::TYPE_DISMISS));
+// Tests the copy constructor, ==, and != methods.
+TEST(IssueUnitTest, Equality) {
+ std::vector<Issue::ActionType> secondary_actions;
+ secondary_actions.push_back(Issue::ActionType::DISMISS);
- std::vector<IssueAction> secondary_actions2;
+ std::vector<Issue::ActionType> secondary_actions2;
std::string title = "title";
std::string message = "message";
- Issue issue1(Issue(title, message, IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "", Issue::WARNING, false, -1));
- EXPECT_TRUE(issue1.Equals(issue1));
+ Issue issue1(title, Issue::ActionType::LEARN_MORE, Issue::Severity::WARNING);
+ issue1.set_message(message);
+ issue1.set_secondary_actions(secondary_actions);
+ EXPECT_EQ(issue1, issue1);
+
+ Issue issue2(title, Issue::ActionType::LEARN_MORE, Issue::Severity::WARNING);
+ issue2.set_message(message);
+ issue2.set_secondary_actions(secondary_actions);
+
+ // |issue1| != |issue2| because their IDs are different.
+ EXPECT_NE(issue1, issue2);
- Issue issue2(Issue(title, message, IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "", Issue::WARNING, false, -1));
- EXPECT_FALSE(issue1.Equals(issue2));
+ // Copy constructor also copies the ID.
+ Issue issue3 = issue1;
+ EXPECT_EQ(issue1, issue3);
}
} // namespace media_router
« chrome/browser/media/router/issue_manager.h ('K') | « chrome/browser/media/router/issue_manager_unittest.cc ('k') | chrome/browser/media/router/mojo/media_router_type_converters.h » ('j') | chrome/browser/ui/toolbar/media_router_action.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698