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

Unified Diff: chrome/test/data/webui/media_router/route_details_tests.js

Issue 1415533019: [Media Router] Use common media-router-header for MR UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes per imcheng@'s comments. Created 5 years, 1 month 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/test/data/webui/media_router/media_router_container_tests.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/media_router/route_details_tests.js
diff --git a/chrome/test/data/webui/media_router/route_details_tests.js b/chrome/test/data/webui/media_router/route_details_tests.js
index 1fb53b2e5d9e6bd4b20bb9078101d65b320c09c0..528f55d9f2411bedeb91f0de148115512f0dbfe7 100644
--- a/chrome/test/data/webui/media_router/route_details_tests.js
+++ b/chrome/test/data/webui/media_router/route_details_tests.js
@@ -24,18 +24,6 @@ cr.define('route_details', function() {
*/
var fakeRouteTwo;
- /**
- * First fake sink created before each test.
- * @type {media_router.Sink}
- */
- var fakeSinkOne;
-
- /**
- * Second fake sink created before each test.
- * @type {media_router.Sink}
- */
- var fakeSinkTwo;
-
// Checks whether |expected| and the text in the span element in
// the |elementId| element are equal.
var checkSpanText = function(expected, elementId) {
@@ -79,12 +67,6 @@ cr.define('route_details', function() {
'Video 1', 1, true, 'chrome-extension://123/custom_view.html');
fakeRouteTwo = new media_router.Route('route id 2', 'sink id 2',
'Video 2', 2, false);
- fakeSinkOne = new media_router.Sink('sink id 1', 'Living Room',
- media_router.SinkIconType.CAST,
- media_router.SinkStatus.ACTIVE, [0, 1, 2]);
- fakeSinkTwo = new media_router.Sink('sink id 2', 'my device',
- media_router.SinkIconType.CAST,
- media_router.SinkStatus.ACTIVE, [0, 1, 2]);
// Allow for the route details to be created and attached.
setTimeout(done);
@@ -107,8 +89,8 @@ cr.define('route_details', function() {
checkSpanText('', 'route-information');
});
- // Tests when |route| exists but |sink| is null.
- test('route is set', function() {
+ // Tests when |route| is null or set.
+ test('route is null or set', function() {
// |route| is null.
assertEquals(null, details.route);
checkDefaultViewIsShown();
@@ -118,7 +100,6 @@ cr.define('route_details', function() {
assertEquals(fakeRouteOne, details.route);
checkSpanText(loadTimeData.getStringF('castingActivityStatus',
fakeRouteOne.description), 'route-information');
- assertEquals(null, details.sink);
checkDefaultViewIsShown();
// Set |route| to a different route.
@@ -129,44 +110,7 @@ cr.define('route_details', function() {
checkDefaultViewIsShown();
});
- // Tests when |sink| exists but |route| is null.
- test('sink is set', function() {
- // |sink| is null.
- assertEquals(null, details.sink);
- checkSpanText('', 'route-information');
-
- // Set |sink| to be non-null. 'route-information' should be updated.
- details.sink = fakeSinkOne;
- assertEquals(fakeSinkOne, details.sink);
- assertEquals(null, details.route);
- checkSpanText('', 'route-information');
-
- // Set |sink| to be a different sink. 'route-information' text should
- // be updated.
- details.sink = fakeSinkTwo;
- assertEquals(fakeSinkTwo, details.sink);
- checkSpanText('', 'route-information');
- });
-
- // Tests when |route| and |sink| both exist.
- test('sink and route are set', function() {
- details.route = fakeRouteOne;
- details.sink = fakeSinkOne;
- assertEquals(fakeSinkOne, details.sink);
- assertEquals(fakeRouteOne, details.route);
- checkSpanText(loadTimeData.getStringF('castingActivityStatus',
- fakeRouteOne.description), 'route-information');
- });
-
- // Tests when |route| and |sink| are both null.
- test('sink and route are null', function() {
- assertEquals(null, details.route);
- assertEquals(null, details.sink);
- checkSpanText('', 'route-information');
- });
-
- // Tests when |route| and |sink| both exist and |route| has custom
- // controller and it loads.
+ // Tests when |route| exists, has a custom controller, and it loads.
test('route has custom controller and loading succeeds', function(done) {
var loadInvoked = false;
details.$['custom-controller'].load = function(url) {
@@ -176,7 +120,6 @@ cr.define('route_details', function() {
};
details.route = fakeRouteOne;
- details.sink = fakeSinkOne;
setTimeout(function() {
assertTrue(loadInvoked);
checkCustomControllerIsShown();
@@ -184,8 +127,7 @@ cr.define('route_details', function() {
});
});
- // Tests when |route| and |sink| both exist and |route| has custom
- // controller but it fails to load.
+ // Tests when |route| exists, has a custom controller, but fails to load.
test('route has custom controller but loading fails', function(done) {
var loadInvoked = false;
details.$['custom-controller'].load = function(url) {
@@ -194,7 +136,6 @@ cr.define('route_details', function() {
};
details.route = fakeRouteOne;
- details.sink = fakeSinkOne;
setTimeout(function() {
assertTrue(loadInvoked);
checkDefaultViewIsShown();
« no previous file with comments | « chrome/test/data/webui/media_router/media_router_container_tests.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698