Merge "Fix Error Prone errors" (b41bab2a) · Commits · e / os / android_frameworks_base

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.text.TextUtils;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@@ -202,8 +203,10 @@ public class MediaRouterManagerTest {
		* Tests if MR2.Callback.onRouteSelected is called when a route is selected from MR2Manager.
		*
		* TODO: Change this test so that this test check whether the route is added in a session.
		* Until then, temporailiy removing @Test annotation.
		* Until then, temporailiy marking @Ignore
		*/
		@Test
		@Ignore
		public void testRouterOnRouteSelected() throws Exception {
		Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(CATEGORIES_ALL);

		@@ -235,7 +238,8 @@ public class MediaRouterManagerTest {
		* Tests if MR2Manager.Callback.onRouteSelected is called
		* when a route is selected by MR2Manager.
		*/
		//TODO: test session created callback instead of onRouteSelected
		@Test
		@Ignore("TODO: test session created callback instead of onRouteSelected")
		public void testManagerOnRouteSelected() throws Exception {
		CountDownLatch latch = new CountDownLatch(1);
		Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(CATEGORIES_ALL);
		@@ -263,7 +267,8 @@ public class MediaRouterManagerTest {
		}
		}

		//TODO: enable this when "releasing session" is implemented
		@Test
		@Ignore("TODO: enable this when 'releasing session' is implemented")
		public void testGetActiveRoutes() throws Exception {
		CountDownLatch latch = new CountDownLatch(1);

		@@ -300,7 +305,8 @@ public class MediaRouterManagerTest {
		/**
		* Tests selecting and unselecting routes of a single provider.
		*/
		//TODO: @Test when session is released
		@Test
		@Ignore("TODO: enable when session is released")
		public void testSingleProviderSelect() throws Exception {
		Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(CATEGORIES_ALL);
		addRouterCallback(new RouteCallback());