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

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: fix tests Created 4 years 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
« no previous file with comments | « chrome/browser/media/router/issue_manager_unittest.cc ('k') | chrome/browser/media/router/issues_observer.h » ('j') | no next file with comments »
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 c13b2fd5a86c61618174f9dbb21d608aa3afbd99..7cc6afba48dcfde5b16c4346171e947af690753a 100644
--- a/chrome/browser/media/router/issue_unittest.cc
+++ b/chrome/browser/media/router/issue_unittest.cc
@@ -7,131 +7,110 @@
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 {
-// 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 issue1(title, message, IssueAction(IssueAction::TYPE_DISMISS),
- secondary_actions, "", Issue::WARNING, false,
- 12345);
-
- EXPECT_EQ(title, issue1.title());
- EXPECT_EQ(message, issue1.message());
- EXPECT_EQ(IssueAction::TYPE_DISMISS, issue1.default_action().type());
- EXPECT_TRUE(issue1.secondary_actions().empty());
- EXPECT_EQ(Issue::WARNING, issue1.severity());
- EXPECT_EQ("", issue1.route_id());
- EXPECT_TRUE(issue1.is_global());
- EXPECT_FALSE(issue1.is_blocking());
- EXPECT_EQ(12345, issue1.help_page_id());
-
- Issue issue2(title, message, IssueAction(IssueAction::TYPE_DISMISS),
- secondary_actions, "routeid", Issue::FATAL, true,
- 12345);
-
- EXPECT_EQ(title, issue2.title());
- EXPECT_EQ(message, issue2.message());
- EXPECT_EQ(IssueAction::TYPE_DISMISS, issue1.default_action().type());
- EXPECT_TRUE(issue2.secondary_actions().empty());
- EXPECT_EQ(Issue::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());
-
- Issue issue3(title, "", IssueAction(IssueAction::TYPE_DISMISS),
- secondary_actions, "routeid", Issue::FATAL, true,
- 12345);
-
- EXPECT_EQ(title, issue3.title());
- EXPECT_EQ("", issue3.message());
- EXPECT_EQ(IssueAction::TYPE_DISMISS, issue1.default_action().type());
- EXPECT_TRUE(issue3.secondary_actions().empty());
- EXPECT_EQ(Issue::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());
+IssueInfo CreateWarningIssueInfo(IssueInfo::Action action_type) {
+ IssueInfo issue("title", action_type, IssueInfo::Severity::WARNING);
+ issue.message = "message";
+ issue.help_page_id = 12345;
+ return issue;
}
-// Tests custom Issue factory method 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";
-
- Issue issue1(title, message, IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "", Issue::WARNING, false, -1);
-
- EXPECT_EQ(title, issue1.title());
- EXPECT_EQ(message, issue1.message());
- EXPECT_EQ(IssueAction::TYPE_LEARN_MORE, issue1.default_action().type());
- EXPECT_FALSE(issue1.secondary_actions().empty());
- EXPECT_EQ(1u, issue1.secondary_actions().size());
- EXPECT_EQ(Issue::WARNING, issue1.severity());
- EXPECT_EQ("", issue1.route_id());
- EXPECT_TRUE(issue1.is_global());
- EXPECT_FALSE(issue1.is_blocking());
-
- Issue issue2(title, message, IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "routeid", Issue::FATAL, true, -1);
-
- EXPECT_EQ(title, issue2.title());
- EXPECT_EQ(message, issue2.message());
- EXPECT_EQ(IssueAction::TYPE_LEARN_MORE, issue2.default_action().type());
- EXPECT_FALSE(issue2.secondary_actions().empty());
- EXPECT_EQ(1u, issue2.secondary_actions().size());
- EXPECT_EQ(Issue::FATAL, issue2.severity());
- EXPECT_EQ("routeid", issue2.route_id());
- EXPECT_FALSE(issue2.is_global());
- EXPECT_TRUE(issue2.is_blocking());
-
- Issue issue3(title, "", IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "routeid", Issue::FATAL, true, -1);
-
- EXPECT_EQ(title, issue3.title());
- EXPECT_EQ("", issue3.message());
- EXPECT_EQ(IssueAction::TYPE_LEARN_MORE, issue3.default_action().type());
- EXPECT_FALSE(issue3.secondary_actions().empty());
- EXPECT_EQ(1u, issue3.secondary_actions().size());
- EXPECT_EQ(Issue::FATAL, issue3.severity());
- EXPECT_EQ("routeid", issue3.route_id());
- EXPECT_FALSE(issue3.is_global());
- EXPECT_TRUE(issue3.is_blocking());
+IssueInfo CreateFatalRouteIssueInfoWithMessage(IssueInfo::Action action_type) {
+ IssueInfo issue("title", action_type, IssueInfo::Severity::FATAL);
+ issue.message = "message";
+ issue.route_id = "routeid";
+ issue.help_page_id = 12345;
+ return issue;
}
-// Tests == and != method.
-TEST(IssueUnitTest, Equal) {
- std::vector<IssueAction> secondary_actions;
- secondary_actions.push_back(IssueAction(IssueAction::TYPE_DISMISS));
-
- std::vector<IssueAction> secondary_actions2;
-
- std::string title = "title";
- std::string message = "message";
+IssueInfo CreateFatalRouteIssueInfo(IssueInfo::Action action_type) {
+ IssueInfo issue("title", action_type, IssueInfo::Severity::FATAL);
+ issue.route_id = "routeid";
+ issue.help_page_id = 12345;
+ return issue;
+}
- Issue issue1(Issue(title, message, IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "", Issue::WARNING, false, -1));
- EXPECT_TRUE(issue1.Equals(issue1));
+} // namespace
+
+// Tests Issues without any secondary actions.
+TEST(IssueInfoUnitTest, CustomIssueConstructionWithNoSecondaryActions) {
+ IssueInfo issue1 = CreateWarningIssueInfo(IssueInfo::Action::DISMISS);
+
+ EXPECT_EQ("title", issue1.title);
+ EXPECT_EQ("message", issue1.message);
+ EXPECT_EQ(IssueInfo::Action::DISMISS, issue1.default_action);
+ EXPECT_TRUE(issue1.secondary_actions.empty());
+ EXPECT_EQ(IssueInfo::Severity::WARNING, issue1.severity);
+ EXPECT_EQ("", issue1.route_id);
+ EXPECT_FALSE(issue1.is_blocking);
+ EXPECT_EQ(12345, issue1.help_page_id);
+
+ IssueInfo issue2 =
+ CreateFatalRouteIssueInfoWithMessage(IssueInfo::Action::DISMISS);
+
+ EXPECT_EQ("title", issue2.title);
+ EXPECT_EQ("message", issue2.message);
+ EXPECT_EQ(IssueInfo::Action::DISMISS, issue1.default_action);
+ EXPECT_TRUE(issue2.secondary_actions.empty());
+ EXPECT_EQ(IssueInfo::Severity::FATAL, issue2.severity);
+ EXPECT_EQ("routeid", issue2.route_id);
+ EXPECT_TRUE(issue2.is_blocking);
+ EXPECT_EQ(12345, issue2.help_page_id);
+
+ IssueInfo issue3 = CreateFatalRouteIssueInfo(IssueInfo::Action::DISMISS);
+
+ EXPECT_EQ("title", issue3.title);
+ EXPECT_EQ("", issue3.message);
+ EXPECT_EQ(IssueInfo::Action::DISMISS, issue1.default_action);
+ EXPECT_TRUE(issue3.secondary_actions.empty());
+ EXPECT_EQ(IssueInfo::Severity::FATAL, issue3.severity);
+ EXPECT_EQ("routeid", issue3.route_id);
+ EXPECT_TRUE(issue3.is_blocking);
+ EXPECT_EQ(12345, issue3.help_page_id);
+}
- Issue issue2(Issue(title, message, IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "", Issue::WARNING, false, -1));
- EXPECT_FALSE(issue1.Equals(issue2));
+// Tests Issues with secondary actions.
+TEST(IssueInfoUnitTest, CustomIssueConstructionWithSecondaryActions) {
+ std::vector<IssueInfo::Action> secondary_actions;
+ secondary_actions.push_back(IssueInfo::Action::DISMISS);
+
+ IssueInfo issue1 = CreateWarningIssueInfo(IssueInfo::Action::LEARN_MORE);
+ issue1.secondary_actions = secondary_actions;
+
+ EXPECT_EQ("title", issue1.title);
+ EXPECT_EQ("message", issue1.message);
+ EXPECT_EQ(IssueInfo::Action::LEARN_MORE, issue1.default_action);
+ EXPECT_FALSE(issue1.secondary_actions.empty());
+ EXPECT_EQ(1u, issue1.secondary_actions.size());
+ EXPECT_EQ(IssueInfo::Severity::WARNING, issue1.severity);
+ EXPECT_EQ("", issue1.route_id);
+ EXPECT_FALSE(issue1.is_blocking);
+
+ IssueInfo issue2 =
+ CreateFatalRouteIssueInfoWithMessage(IssueInfo::Action::LEARN_MORE);
+ issue2.secondary_actions = secondary_actions;
+
+ EXPECT_EQ("title", issue2.title);
+ EXPECT_EQ("message", issue2.message);
+ EXPECT_EQ(IssueInfo::Action::LEARN_MORE, issue2.default_action);
+ EXPECT_FALSE(issue2.secondary_actions.empty());
+ EXPECT_EQ(1u, issue2.secondary_actions.size());
+ EXPECT_EQ(IssueInfo::Severity::FATAL, issue2.severity);
+ EXPECT_EQ("routeid", issue2.route_id);
+ EXPECT_TRUE(issue2.is_blocking);
+
+ IssueInfo issue3 = CreateFatalRouteIssueInfo(IssueInfo::Action::LEARN_MORE);
+ issue3.secondary_actions = secondary_actions;
+
+ EXPECT_EQ("title", issue3.title);
+ EXPECT_EQ("", issue3.message);
+ EXPECT_EQ(IssueInfo::Action::LEARN_MORE, issue3.default_action);
+ EXPECT_FALSE(issue3.secondary_actions.empty());
+ EXPECT_EQ(1u, issue3.secondary_actions.size());
+ EXPECT_EQ(IssueInfo::Severity::FATAL, issue3.severity);
+ EXPECT_EQ("routeid", issue3.route_id);
+ EXPECT_TRUE(issue3.is_blocking);
}
} // namespace media_router
« no previous file with comments | « chrome/browser/media/router/issue_manager_unittest.cc ('k') | chrome/browser/media/router/issues_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698