Convert the rest of chrome_public_test_apk InstrumentationTestCases to JUnit4

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java

 // 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.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.blink_public.platform.WebDisplayMode;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.ShortcutSource;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.common.ScreenOrientationValues;
 
 /**
  * Tests the WebappInfo class's ability to parse various URLs.
  */
-public class WebappInfoTest extends InstrumentationTestCase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class WebappInfoTest {
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testAbout() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String url = "about:blank";
 
         WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
-        assertNotNull(info);
+        Assert.assertNotNull(info);
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testRandomUrl() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String url = "http://google.com";
 
         WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
-        assertNotNull(info);
+        Assert.assertNotNull(info);
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testSpacesInUrl() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String bustedUrl = "http://money.cnn.com/?category=Latest News";
 
         Intent intent = new Intent();
         intent.putExtra(ShortcutHelper.EXTRA_ID, id);
         intent.putExtra(ShortcutHelper.EXTRA_NAME, name);
         intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
         intent.putExtra(ShortcutHelper.EXTRA_URL, bustedUrl);
 
         WebappInfo info = WebappInfo.create(intent);
-        assertNotNull(info);
+        Assert.assertNotNull(info);
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentTitleFallBack() {
         String title = "webapp title";
 
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_TITLE, title);
 
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(title, info.name());
-        assertEquals(title, info.shortName());
+        Assert.assertEquals(title, info.name());
+        Assert.assertEquals(title, info.shortName());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentNameBlankNoTitle() {
         String shortName = "name";
 
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
 
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals("", info.name());
-        assertEquals(shortName, info.shortName());
+        Assert.assertEquals("", info.name());
+        Assert.assertEquals(shortName, info.shortName());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentShortNameFallBack() {
         String title = "webapp title";
         String shortName = "name";
 
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_TITLE, title);
         intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
 
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(title, info.name());
-        assertEquals(shortName, info.shortName());
+        Assert.assertEquals(title, info.name());
+        Assert.assertEquals(shortName, info.shortName());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentNameShortname() {
         String name = "longName";
         String shortName = "name";
 
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_NAME, name);
         intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
 
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(name, info.name());
-        assertEquals(shortName, info.shortName());
+        Assert.assertEquals(name, info.name());
+        Assert.assertEquals(shortName, info.shortName());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testDisplayModeAndOrientationAndSource() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String url = "http://money.cnn.com";
 
         WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 WebDisplayMode.Fullscreen, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
-        assertEquals(WebDisplayMode.Fullscreen, info.displayMode());
-        assertEquals(ScreenOrientationValues.DEFAULT, info.orientation());
-        assertEquals(ShortcutSource.UNKNOWN, info.source());
+        Assert.assertEquals(WebDisplayMode.Fullscreen, info.displayMode());
+        Assert.assertEquals(ScreenOrientationValues.DEFAULT, info.orientation());
+        Assert.assertEquals(ShortcutSource.UNKNOWN, info.source());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testNormalColors() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String url = "http://money.cnn.com";
         long themeColor = 0xFF00FF00L;
         long backgroundColor = 0xFF0000FFL;
 
         WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT,
                 ShortcutSource.UNKNOWN, themeColor, backgroundColor, false);
-        assertEquals(themeColor, info.themeColor());
-        assertEquals(backgroundColor, info.backgroundColor());
+        Assert.assertEquals(themeColor, info.themeColor());
+        Assert.assertEquals(backgroundColor, info.backgroundColor());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testInvalidOrMissingColors() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String url = "http://money.cnn.com";
 
         WebappInfo info = WebappInfo.create(id, url, null, null, name, shortName,
                 WebDisplayMode.Standalone, ScreenOrientationValues.DEFAULT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
-        assertEquals(ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, info.themeColor());
-        assertEquals(ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, info.backgroundColor());
+        Assert.assertEquals(ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, info.themeColor());
+        Assert.assertEquals(
+                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, info.backgroundColor());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testColorsIntentCreation() {
         long themeColor = 0xFF00FF00L;
         long backgroundColor = 0xFF0000FFL;
 
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_THEME_COLOR, themeColor);
         intent.putExtra(ShortcutHelper.EXTRA_BACKGROUND_COLOR, backgroundColor);
 
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(themeColor, info.themeColor());
-        assertEquals(backgroundColor, info.backgroundColor());
+        Assert.assertEquals(themeColor, info.themeColor());
+        Assert.assertEquals(backgroundColor, info.backgroundColor());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testScopeIntentCreation() {
         String scope = "https://www.foo.com";
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_SCOPE, scope);
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(scope, info.scopeUri().toString());
+        Assert.assertEquals(scope, info.scopeUri().toString());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentScopeFallback() {
         String url = "https://www.foo.com/homepage.html";
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_URL, url);
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(ShortcutHelper.getScopeFromUrl(url), info.scopeUri().toString());
+        Assert.assertEquals(ShortcutHelper.getScopeFromUrl(url), info.scopeUri().toString());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentDisplayMode() {
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_DISPLAY_MODE, WebDisplayMode.MinimalUi);
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(WebDisplayMode.MinimalUi, info.displayMode());
+        Assert.assertEquals(WebDisplayMode.MinimalUi, info.displayMode());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentOrientation() {
         Intent intent = createIntentWithUrlAndId();
         intent.putExtra(ShortcutHelper.EXTRA_ORIENTATION, ScreenOrientationValues.LANDSCAPE);
         WebappInfo info = WebappInfo.create(intent);
-        assertEquals(ScreenOrientationValues.LANDSCAPE, info.orientation());
+        Assert.assertEquals(ScreenOrientationValues.LANDSCAPE, info.orientation());
     }
 
+    @Test
     @SmallTest
     @Feature({"Webapps"})
     public void testIntentGeneratedIcon() {
         String id = "webapp id";
         String name = "longName";
         String shortName = "name";
         String url = "about:blank";
 
         // Default value.
         {
             Intent intent = new Intent();
             intent.putExtra(ShortcutHelper.EXTRA_ID, id);
             intent.putExtra(ShortcutHelper.EXTRA_NAME, name);
             intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
             intent.putExtra(ShortcutHelper.EXTRA_URL, url);
 
-            assertFalse(name, WebappInfo.create(intent).isIconGenerated());
+            Assert.assertFalse(name, WebappInfo.create(intent).isIconGenerated());
         }
 
         // Set to true.
         {
             Intent intent = new Intent();
             intent.putExtra(ShortcutHelper.EXTRA_ID, id);
             intent.putExtra(ShortcutHelper.EXTRA_NAME, name);
             intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
             intent.putExtra(ShortcutHelper.EXTRA_URL, url);
             intent.putExtra(ShortcutHelper.EXTRA_IS_ICON_GENERATED, true);
 
-            assertTrue(name, WebappInfo.create(intent).isIconGenerated());
+            Assert.assertTrue(name, WebappInfo.create(intent).isIconGenerated());
         }
 
         // Set to false.
         {
             Intent intent = new Intent();
             intent.putExtra(ShortcutHelper.EXTRA_ID, id);
             intent.putExtra(ShortcutHelper.EXTRA_NAME, name);
             intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
             intent.putExtra(ShortcutHelper.EXTRA_URL, url);
             intent.putExtra(ShortcutHelper.EXTRA_IS_ICON_GENERATED, false);
 
-            assertFalse(name, WebappInfo.create(intent).isIconGenerated());
+            Assert.assertFalse(name, WebappInfo.create(intent).isIconGenerated());
         }
 
         // Set to something else than a boolean.
         {
             Intent intent = new Intent();
             intent.putExtra(ShortcutHelper.EXTRA_ID, id);
             intent.putExtra(ShortcutHelper.EXTRA_NAME, name);
             intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
             intent.putExtra(ShortcutHelper.EXTRA_URL, url);
             intent.putExtra(ShortcutHelper.EXTRA_IS_ICON_GENERATED, "true");
 
-            assertFalse(name, WebappInfo.create(intent).isIconGenerated());
+            Assert.assertFalse(name, WebappInfo.create(intent).isIconGenerated());
         }
     }
 
     /**
      * Creates intent with url and id. If the url or id are not set WebappInfo#create() returns
      * null.
      */
     private Intent createIntentWithUrlAndId() {
         Intent intent = new Intent();
         intent.putExtra(ShortcutHelper.EXTRA_ID, "web app id");
         intent.putExtra(ShortcutHelper.EXTRA_URL, "about:blank");
         return intent;
     }
 }