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

Unified Diff: chrome/browser/media/router/mojo/media_router_type_converters_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
Index: chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc
diff --git a/chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc b/chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc
index 51591832d20f794fb15800046fbde07c87eab4fb..fef54c4b0023e00d432349636ec6980561f573c9 100644
--- a/chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc
+++ b/chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/media/router/media_sink.h"
#include "chrome/browser/media/router/media_source_helper.h"
#include "chrome/browser/media/router/mojo/media_router_type_converters.h"
-#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
namespace media_router {
@@ -121,74 +121,4 @@ TEST(MediaRouterTypeConvertersTest, ConvertMediaRouteWithoutOptionalFields) {
EXPECT_TRUE(expected_media_route.Equals(media_route));
}
-TEST(MediaRouterTypeConvertersTest, ConvertIssue) {
- mojom::IssuePtr mojoIssue;
- mojoIssue = mojom::Issue::New();
- mojoIssue->title = "title";
- mojoIssue->message = std::string("msg");
- mojoIssue->route_id = std::string("routeId");
- mojoIssue->default_action = mojom::Issue::ActionType::LEARN_MORE;
- mojoIssue->secondary_actions = std::vector<mojom::Issue::ActionType>(
- 1, mojom::Issue::ActionType::DISMISS);
- mojoIssue->severity = mojom::Issue::Severity::WARNING;
- mojoIssue->is_blocking = true;
- mojoIssue->help_page_id = 12345;
-
- std::vector<IssueAction> secondary_actions;
- secondary_actions.push_back(IssueAction(IssueAction::TYPE_DISMISS));
- Issue expected_issue(
- "title", "msg", IssueAction(IssueAction::TYPE_LEARN_MORE),
- secondary_actions, "routeId", Issue::WARNING, true, 12345);
- Issue converted_issue = mojo::TypeConverter<
- media_router::Issue,
- media_router::mojom::IssuePtr>::Convert(mojoIssue);
-
- EXPECT_EQ(expected_issue.title(), converted_issue.title());
- EXPECT_EQ(expected_issue.message(), converted_issue.message());
- EXPECT_EQ(expected_issue.default_action().type(),
- converted_issue.default_action().type());
- ASSERT_EQ(expected_issue.secondary_actions().size(),
- converted_issue.secondary_actions().size());
- for (size_t i = 0; i < expected_issue.secondary_actions().size(); ++i) {
- EXPECT_EQ(expected_issue.secondary_actions()[i].type(),
- converted_issue.secondary_actions()[i].type());
- }
- EXPECT_EQ(expected_issue.route_id(), converted_issue.route_id());
- EXPECT_EQ(expected_issue.severity(), converted_issue.severity());
- EXPECT_EQ(expected_issue.is_blocking(), converted_issue.is_blocking());
- EXPECT_EQ(expected_issue.help_page_id(), converted_issue.help_page_id());
-
- // Ensure that the internal Issue objects are considered distinct
- // (they possess different IDs.)
- EXPECT_FALSE(converted_issue.Equals(expected_issue));
-}
-
-TEST(MediaRouterTypeConvertersTest, ConvertIssueWithoutOptionalFields) {
- mojom::IssuePtr mojoIssue;
- mojoIssue = mojom::Issue::New();
- mojoIssue->title = "title";
- mojoIssue->default_action = mojom::Issue::ActionType::DISMISS;
- mojoIssue->severity = mojom::Issue::Severity::WARNING;
- mojoIssue->is_blocking = true;
-
- Issue expected_issue("title", "", IssueAction(IssueAction::TYPE_DISMISS),
- std::vector<IssueAction>(), "", Issue::WARNING, true,
- -1);
-
- Issue converted_issue = mojo::TypeConverter<
- media_router::Issue,
- media_router::mojom::IssuePtr>::Convert(mojoIssue);
-
- EXPECT_EQ(expected_issue.title(), converted_issue.title());
- EXPECT_EQ(expected_issue.default_action().type(),
- converted_issue.default_action().type());
- EXPECT_EQ(0u, converted_issue.secondary_actions().size());
- EXPECT_EQ(expected_issue.severity(), converted_issue.severity());
- EXPECT_EQ(expected_issue.is_blocking(), converted_issue.is_blocking());
-
- // Ensure that the internal Issue objects are considered distinct
- // (they possess different IDs.)
- EXPECT_FALSE(converted_issue.Equals(expected_issue));
-}
-
} // namespace media_router
« no previous file with comments | « chrome/browser/media/router/mojo/media_router_type_converters.cc ('k') | chrome/browser/media/router/test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698