[Android] Fix argument order for assertEquals calls

assertEquals accepts an expected value as the first argument and an
actual value as the second. This CL fixes some tests that were using
the reversed order.

Bug: None
Change-Id: I158277a01d6146ef46b1b2fc97af04c7dcd7a563
Reviewed-on: https://chromium-review.googlesource.com/1008002Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553486}

chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterRouteTest.java

@@ -35,7 +35,7 @@ public class ChromeMediaRouterRouteTest extends ChromeMediaRouterTestBase {
         mChromeMediaRouter.onRouteCreated(
                 routeId1, SINK_ID1, REQUEST_ID1, mRouteProvider, true);
 
-        assertEquals(mChromeMediaRouter.getRouteIdsToProvidersForTest().size(), 1);
+        assertEquals(1, mChromeMediaRouter.getRouteIdsToProvidersForTest().size());
         assertTrue(mChromeMediaRouter.getRouteIdsToProvidersForTest().containsKey(routeId1));
     }
 
@@ -58,7 +58,7 @@ public class ChromeMediaRouterRouteTest extends ChromeMediaRouterTestBase {
         mChromeMediaRouter.onRouteCreated(
                 routeId2, SINK_ID2, REQUEST_ID2, mRouteProvider, true);
 
-        assertEquals(mChromeMediaRouter.getRouteIdsToProvidersForTest().size(), 2);
+        assertEquals(2, mChromeMediaRouter.getRouteIdsToProvidersForTest().size());
         assertTrue(mChromeMediaRouter.getRouteIdsToProvidersForTest().containsKey(routeId2));
     }
 
@@ -72,7 +72,7 @@ public class ChromeMediaRouterRouteTest extends ChromeMediaRouterTestBase {
                 SOURCE_ID1, SINK_ID1, PRESENTATION_ID1, ORIGIN1, TAB_ID1, false, REQUEST_ID1);
         mChromeMediaRouter.onRouteRequestError("ERROR", REQUEST_ID1);
 
-        assertEquals(mChromeMediaRouter.getRouteIdsToProvidersForTest().size(), 0);
+        assertEquals(0, mChromeMediaRouter.getRouteIdsToProvidersForTest().size());
     }
 
     @Test
@@ -94,7 +94,7 @@ public class ChromeMediaRouterRouteTest extends ChromeMediaRouterTestBase {
         mChromeMediaRouter.onRouteCreated(
                 routeId2, SINK_ID1, REQUEST_ID2, mRouteProvider, true);
 
-        assertEquals(mChromeMediaRouter.getRouteIdsToProvidersForTest().size(), 2);
+        assertEquals(2, mChromeMediaRouter.getRouteIdsToProvidersForTest().size());
         assertTrue(mChromeMediaRouter.getRouteIdsToProvidersForTest().containsKey(routeId2));
     }
 
@@ -115,7 +115,7 @@ public class ChromeMediaRouterRouteTest extends ChromeMediaRouterTestBase {
 
         mChromeMediaRouter.onRouteRequestError("error", REQUEST_ID2);
 
-        assertEquals(mChromeMediaRouter.getRouteIdsToProvidersForTest().size(), 1);
+        assertEquals(1, mChromeMediaRouter.getRouteIdsToProvidersForTest().size());
     }
 
     @Test
@@ -131,7 +131,7 @@ public class ChromeMediaRouterRouteTest extends ChromeMediaRouterTestBase {
         mChromeMediaRouter.detachRoute(routeId1);
         verify(mRouteProvider).detachRoute(routeId1);
 
-        assertEquals(mChromeMediaRouter.getRouteIdsToProvidersForTest().size(), 0);
+        assertEquals(0, mChromeMediaRouter.getRouteIdsToProvidersForTest().size());
     }
 
     @Test
@@ -146,9 +146,9 @@ public class ChromeMediaRouterRouteTest extends ChromeMediaRouterTestBase {
 
         mChromeMediaRouter.closeRoute(routeId1);
         verify(mRouteProvider).closeRoute(routeId1);
-        assertEquals(mChromeMediaRouter.getRouteIdsToProvidersForTest().size(), 1);
+        assertEquals(1, mChromeMediaRouter.getRouteIdsToProvidersForTest().size());
 
         mChromeMediaRouter.onRouteClosed(routeId1);
-        assertEquals(mChromeMediaRouter.getRouteIdsToProvidersForTest().size(), 0);
+        assertEquals(0, mChromeMediaRouter.getRouteIdsToProvidersForTest().size());
     }
 }

chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterSinkObservationTest.java

@@ -33,13 +33,16 @@ public class ChromeMediaRouterSinkObservationTest extends ChromeMediaRouterTestB
     public void testRouterOnSinksReceived() {
         mChromeMediaRouter.onSinksReceived(SOURCE_ID1, mRouteProvider, new ArrayList<MediaSink>());
 
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest().size(), 1);
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                .get(SOURCE_ID1).size(), 1);
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                .get(SOURCE_ID1).get(mRouteProvider).size(), 0);
-        assertEquals(mChromeMediaRouter.getSinksPerSourceForTest().size(), 1);
-        assertEquals(mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID1).size(), 0);
+        assertEquals(1, mChromeMediaRouter.getSinksPerSourcePerProviderForTest().size());
+        assertEquals(
+                1, mChromeMediaRouter.getSinksPerSourcePerProviderForTest().get(SOURCE_ID1).size());
+        assertEquals(0,
+                mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
+                        .get(SOURCE_ID1)
+                        .get(mRouteProvider)
+                        .size());
+        assertEquals(1, mChromeMediaRouter.getSinksPerSourceForTest().size());
+        assertEquals(0, mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID1).size());
     }
 
     @Test
@@ -52,16 +55,21 @@ public class ChromeMediaRouterSinkObservationTest extends ChromeMediaRouterTestB
         sinkList.add(sink);
         mChromeMediaRouter.onSinksReceived(SOURCE_ID1, mRouteProvider, sinkList);
 
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest().size(), 1);
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                .get(SOURCE_ID1).size(), 1);
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                .get(SOURCE_ID1).get(mRouteProvider).size(), 1);
+        assertEquals(1, mChromeMediaRouter.getSinksPerSourcePerProviderForTest().size());
+        assertEquals(
+                1, mChromeMediaRouter.getSinksPerSourcePerProviderForTest().get(SOURCE_ID1).size());
+        assertEquals(1,
+                mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
+                        .get(SOURCE_ID1)
+                        .get(mRouteProvider)
+                        .size());
         assertTrue(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                   .get(SOURCE_ID1).get(mRouteProvider).contains(sink));
+                           .get(SOURCE_ID1)
+                           .get(mRouteProvider)
+                           .contains(sink));
 
-        assertEquals(mChromeMediaRouter.getSinksPerSourceForTest().size(), 1);
-        assertEquals(mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID1).size(), 1);
+        assertEquals(1, mChromeMediaRouter.getSinksPerSourceForTest().size());
+        assertEquals(1, mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID1).size());
         assertTrue(mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID1).contains(sink));
     }
 
@@ -75,20 +83,26 @@ public class ChromeMediaRouterSinkObservationTest extends ChromeMediaRouterTestB
         sinkList.add(sink);
         mChromeMediaRouter.onSinksReceived(SOURCE_ID2, mRouteProvider, sinkList);
 
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest().size(), 2);
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                .get(SOURCE_ID1).size(), 1);
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                .get(SOURCE_ID1).get(mRouteProvider).size(), 0);
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                .get(SOURCE_ID2).size(), 1);
-        assertEquals(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
-                .get(SOURCE_ID2).get(mRouteProvider).size(), 1);
+        assertEquals(2, mChromeMediaRouter.getSinksPerSourcePerProviderForTest().size());
+        assertEquals(
+                1, mChromeMediaRouter.getSinksPerSourcePerProviderForTest().get(SOURCE_ID1).size());
+        assertEquals(0,
+                mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
+                        .get(SOURCE_ID1)
+                        .get(mRouteProvider)
+                        .size());
+        assertEquals(
+                1, mChromeMediaRouter.getSinksPerSourcePerProviderForTest().get(SOURCE_ID2).size());
+        assertEquals(1,
+                mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
+                        .get(SOURCE_ID2)
+                        .get(mRouteProvider)
+                        .size());
         assertTrue(mChromeMediaRouter.getSinksPerSourcePerProviderForTest()
                    .get(SOURCE_ID2).get(mRouteProvider).contains(sink));
-        assertEquals(mChromeMediaRouter.getSinksPerSourceForTest().size(), 2);
-        assertEquals(mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID1).size(), 0);
-        assertEquals(mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID2).size(), 1);
+        assertEquals(2, mChromeMediaRouter.getSinksPerSourceForTest().size());
+        assertEquals(0, mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID1).size());
+        assertEquals(1, mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID2).size());
         assertTrue(mChromeMediaRouter.getSinksPerSourceForTest().get(SOURCE_ID2).contains(sink));
     }
 

chrome/android/junit/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterTestBase.java

@@ -52,7 +52,7 @@ public class ChromeMediaRouterTestBase {
         mRouteProvider = mock(MediaRouteProvider.class);
         doReturn(true).when(mRouteProvider).supportsSource(anyString());
         mChromeMediaRouter.addMediaRouteProvider(mRouteProvider);
-        assertEquals(mChromeMediaRouter.getRouteProvidersForTest().size(), 1);
+        assertEquals(1, mChromeMediaRouter.getRouteProvidersForTest().size());
         assertEquals(mRouteProvider, mChromeMediaRouter.getRouteProvidersForTest().get(0));
         assertNotNull(mRouteProvider);