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

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

Issue 1224093004: [Media Router] 2nd take on fix route response callback lifetime in UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test Created 5 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
« no previous file with comments | « chrome/browser/media/router/create_session_request.cc ('k') | chrome/browser/media/router/media_router.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/router/create_session_request_unittest.cc
diff --git a/chrome/browser/media/router/create_session_request_unittest.cc b/chrome/browser/media/router/create_session_request_unittest.cc
deleted file mode 100644
index 322beaccbc062acf9495a2a065132b216088f61a..0000000000000000000000000000000000000000
--- a/chrome/browser/media/router/create_session_request_unittest.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/bind.h"
-#include "chrome/browser/media/router/create_session_request.h"
-#include "chrome/browser/media/router/media_source_helper.h"
-#include "content/public/browser/presentation_service_delegate.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace media_router {
-
-namespace {
-
-const char kPresentationUrl[] = "http://foo.com";
-const char kPresentationId[] = "presentationId";
-const char kRouteId[] =
- "urn:x-org.chromium:media:route:presentationId/cast-sink1/http://foo.com";
-
-} // namespace
-
-class CreateSessionRequestTest : public ::testing::Test {
- public:
- CreateSessionRequestTest() : cb_invoked_(false) {}
- ~CreateSessionRequestTest() override {}
-
- void OnSuccess(const content::PresentationSessionInfo& expected_info,
- const content::PresentationSessionInfo& actual_info,
- const MediaRoute::Id& route_id) {
- cb_invoked_ = true;
- EXPECT_EQ(expected_info.presentation_url, actual_info.presentation_url);
- EXPECT_EQ(expected_info.presentation_id, actual_info.presentation_id);
- }
-
- void OnError(const content::PresentationError& expected_error,
- const content::PresentationError& actual_error) {
- cb_invoked_ = true;
- EXPECT_EQ(expected_error.error_type, actual_error.error_type);
- EXPECT_EQ(expected_error.message, actual_error.message);
- }
-
- void FailOnSuccess(const content::PresentationSessionInfo& info,
- const MediaRoute::Id& route_id) {
- FAIL() << "Success callback should not have been called.";
- }
-
- void FailOnError(const content::PresentationError& error) {
- FAIL() << "Error should not have been called.";
- }
-
- bool cb_invoked_;
-};
-
-// Test that the object's getters match the constructor parameters.
-TEST_F(CreateSessionRequestTest, Getters) {
- GURL frame_url("http://frameUrl");
-
- content::PresentationSessionInfo session_info(kPresentationUrl,
- kPresentationId);
-
- CreateSessionRequest context(
- kPresentationUrl, kPresentationId, frame_url,
- CreateSessionRequest::PresentationSessionSuccessCallback(),
- CreateSessionRequest::PresentationSessionErrorCallback());
- EXPECT_TRUE(MediaSourceForPresentationUrl(kPresentationUrl)
- .Equals(context.GetMediaSource()));
- EXPECT_EQ(frame_url, context.frame_url());
- content::PresentationSessionInfo actual_session_info(
- context.presentation_info());
- EXPECT_EQ(kPresentationUrl, actual_session_info.presentation_url);
- EXPECT_EQ(kPresentationId, actual_session_info.presentation_id);
-}
-
-TEST_F(CreateSessionRequestTest, SuccessCallback) {
- GURL frame_url("http://frameUrl");
- content::PresentationSessionInfo session_info(kPresentationUrl,
- kPresentationId);
- CreateSessionRequest context(
- kPresentationUrl, kPresentationId, frame_url,
- base::Bind(&CreateSessionRequestTest::OnSuccess, base::Unretained(this),
- session_info),
- base::Bind(&CreateSessionRequestTest::FailOnError,
- base::Unretained(this)));
- context.MaybeInvokeSuccessCallback(kRouteId);
- // No-op since success callback is already invoked.
- context.MaybeInvokeErrorCallback(content::PresentationError(
- content::PRESENTATION_ERROR_NO_AVAILABLE_SCREENS, "Error message"));
- EXPECT_TRUE(cb_invoked_);
-}
-
-TEST_F(CreateSessionRequestTest, ErrorCallback) {
- GURL frame_url("http://frameUrl");
- content::PresentationSessionInfo session_info(kPresentationUrl,
- kPresentationId);
- content::PresentationError error(
- content::PRESENTATION_ERROR_SESSION_REQUEST_CANCELLED,
- "This is an error message");
- CreateSessionRequest context(
- kPresentationUrl, kPresentationId, frame_url,
- base::Bind(&CreateSessionRequestTest::FailOnSuccess,
- base::Unretained(this)),
- base::Bind(&CreateSessionRequestTest::OnError, base::Unretained(this),
- error));
- context.MaybeInvokeErrorCallback(error);
- // No-op since error callback is already invoked.
- context.MaybeInvokeSuccessCallback(kRouteId);
- EXPECT_TRUE(cb_invoked_);
-}
-
-} // namespace media_router
« no previous file with comments | « chrome/browser/media/router/create_session_request.cc ('k') | chrome/browser/media/router/media_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698