[Reland] Refactor WebappRegistry into a singleton instance.

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLooper;
+
 import org.chromium.base.ContextUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.blink_public.platform.WebDisplayMode;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.testing.local.BackgroundShadowAsyncTask;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowLooper;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * Tests the WebappDataStorage class by ensuring that it persists data to
  * SharedPreferences as expected.
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE, shadows = {BackgroundShadowAsyncTask.class})
 public class WebappDataStorageTest {
@@ skipping 29 matching lines @@
         @Override
         public long currentTimeMillis() {
             return mCurrentTime;
         }
     }
 
     @Before
     public void setUp() throws Exception {
         ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application);
         mSharedPreferences = ContextUtils.getApplicationContext().getSharedPreferences(
-                "webapp_test", Context.MODE_PRIVATE);
+                WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "test", Context.MODE_PRIVATE);
 
         // Set the last_used as if the web app had been registered by WebappRegistry.
-        mSharedPreferences.edit().putLong("last_used", 0).apply();
+        mSharedPreferences.edit().putLong(WebappDataStorage.KEY_LAST_USED, 0).apply();
 
         mCallbackCalled = false;
     }
 
     @After
     public void tearDown() {
         mSharedPreferences.edit().clear().apply();
     }
 
     @Test
@@ skipping 12 matching lines @@
         assertEquals("background_color", WebappDataStorage.KEY_BACKGROUND_COLOR);
         assertEquals("source", WebappDataStorage.KEY_SOURCE);
         assertEquals("action", WebappDataStorage.KEY_ACTION);
         assertEquals("is_icon_generated", WebappDataStorage.KEY_IS_ICON_GENERATED);
         assertEquals("version", WebappDataStorage.KEY_VERSION);
     }
 
     @Test
     @Feature({"Webapp"})
     public void testLastUsedRetrieval() throws Exception {
-        mSharedPreferences.edit().putLong(WebappDataStorage.KEY_LAST_USED, 100L).apply();
-
-        WebappDataStorage.getLastUsedTime("test", new FetchCallback<Long>(new Long(100L)));
-        BackgroundShadowAsyncTask.runBackgroundTasks();
-        ShadowLooper.runUiThreadTasks();
-
-        assertTrue(mCallbackCalled);
+        long lastUsed = 100;
+        mSharedPreferences.edit().putLong(WebappDataStorage.KEY_LAST_USED, lastUsed).apply();
+        assertEquals(lastUsed, new WebappDataStorage("test").getLastUsedTime());
     }
 
     @Test
     @Feature({"Webapp"})
     public void testSplashImageRetrieval() throws Exception {
         final Bitmap expected = createBitmap();
         mSharedPreferences.edit()
                 .putString(WebappDataStorage.KEY_SPLASH_ICON,
                         ShortcutHelper.encodeBitmapAsString(expected))
-                .commit();
-        WebappDataStorage.open("test")
-                .getSplashScreenImage(new WebappDataStorage.FetchCallback<Bitmap>() {
+                .apply();
+        WebappDataStorage.open("test").getSplashScreenImage(
+                new WebappDataStorage.FetchCallback<Bitmap>() {
                     @Override
                     public void onDataRetrieved(Bitmap actual) {
                         mCallbackCalled = true;
 
                         // TODO(lalitm) - once the Robolectric bug is fixed change to
                         // assertTrue(expected.sameAs(actual)).
                         // See bitmapEquals(Bitmap, Bitmap) for more information.
                         assertTrue(bitmapEquals(expected, actual));
                     }
                 });
         BackgroundShadowAsyncTask.runBackgroundTasks();
         ShadowLooper.runUiThreadTasks();
 
         assertTrue(mCallbackCalled);
     }
 
     @Test
     @Feature({"Webapp"})
     public void testSplashImageUpdate() throws Exception {
         final Bitmap expectedImage = createBitmap();
         WebappDataStorage.open("test").updateSplashScreenImage(expectedImage);
         BackgroundShadowAsyncTask.runBackgroundTasks();
+        ShadowLooper.runUiThreadTasks();
 
         assertEquals(ShortcutHelper.encodeBitmapAsString(expectedImage),
                 mSharedPreferences.getString(WebappDataStorage.KEY_SPLASH_ICON, null));
     }
 
     @Test
     @Feature({"Webapp"})
     public void testScopeRetrieval() throws Exception {
-        final String scope = "http://drive.google.com";
+        String scope = "http://drive.google.com";
         mSharedPreferences.edit().putString(WebappDataStorage.KEY_SCOPE, scope).apply();
-
-        WebappDataStorage.getScope("test", new FetchCallback<String>(scope));
-        BackgroundShadowAsyncTask.runBackgroundTasks();
-        ShadowLooper.runUiThreadTasks();
-
-        assertTrue(mCallbackCalled);
+        assertEquals(scope, new WebappDataStorage("test").getScope());
     }
 
     @Test
     @Feature({"Webapp"})
     public void testUrlRetrieval() throws Exception {
-        final String url = "https://www.google.com";
+        String url = "https://www.google.com";
         mSharedPreferences.edit().putString(WebappDataStorage.KEY_URL, url).apply();
-
-        WebappDataStorage.getUrl("test", new FetchCallback<String>(url));
-        BackgroundShadowAsyncTask.runBackgroundTasks();
-        ShadowLooper.runUiThreadTasks();
-
-        assertTrue(mCallbackCalled);
+        assertEquals(url, new WebappDataStorage("test").getUrl());
     }
 
     @Test
     @Feature({"Webapp"})
     public void testWasLaunchedRecently() throws Exception {
         final TestClock clock = new TestClock(System.currentTimeMillis());
         WebappDataStorage.setClockForTests(clock);
 
         // Opening a data storage doesn't count as a launch.
         WebappDataStorage storage = WebappDataStorage.open("test");
-        BackgroundShadowAsyncTask.runBackgroundTasks();
-        ShadowLooper.runUiThreadTasks();
         assertTrue(!storage.wasLaunchedRecently());
 
         // When the last used time is updated, then it is a launch.
         storage.updateLastUsedTime();
-        BackgroundShadowAsyncTask.runBackgroundTasks();
-        ShadowLooper.runUiThreadTasks();
         assertTrue(storage.wasLaunchedRecently());
 
         long lastUsedTime = mSharedPreferences.getLong(WebappDataStorage.KEY_LAST_USED,
                 WebappDataStorage.LAST_USED_INVALID);
 
         assertTrue(lastUsedTime != WebappDataStorage.LAST_USED_UNSET);
         assertTrue(lastUsedTime != WebappDataStorage.LAST_USED_INVALID);
 
         // Move the last used time one day in the past.
         mSharedPreferences.edit()
@@ skipping 44 matching lines @@
             protected Intent doInBackground(Void... nothing) {
                 return ShortcutHelper.createWebappShortcutIntent(id, action, url, scope, name,
                         shortName, icon, ShortcutHelper.WEBAPP_SHORTCUT_VERSION, displayMode,
                         orientation, themeColor, backgroundColor, isIconGenerated);
             }
         };
         Intent shortcutIntent = shortcutIntentTask.execute().get();
 
         WebappDataStorage storage = WebappDataStorage.open("test");
         storage.updateFromShortcutIntent(shortcutIntent);
-        BackgroundShadowAsyncTask.runBackgroundTasks();
-        ShadowLooper.runUiThreadTasks();
 
         assertEquals(action, mSharedPreferences.getString(WebappDataStorage.KEY_ACTION, null));
         assertEquals(url, mSharedPreferences.getString(WebappDataStorage.KEY_URL, null));
         assertEquals(scope, mSharedPreferences.getString(WebappDataStorage.KEY_SCOPE, null));
         assertEquals(name, mSharedPreferences.getString(WebappDataStorage.KEY_NAME, null));
         assertEquals(shortName,
                 mSharedPreferences.getString(WebappDataStorage.KEY_SHORT_NAME, null));
         assertEquals(ShortcutHelper.encodeBitmapAsString(icon),
                 mSharedPreferences.getString(WebappDataStorage.KEY_ICON, null));
         assertEquals(ShortcutHelper.WEBAPP_SHORTCUT_VERSION,
@@ skipping 27 matching lines @@
         assertEquals(null, mSharedPreferences.getString(WebappDataStorage.KEY_ICON, null));
         assertEquals(0, mSharedPreferences.getInt(WebappDataStorage.KEY_VERSION, 0));
         assertEquals(0, mSharedPreferences.getInt(WebappDataStorage.KEY_ORIENTATION, 0));
         assertEquals(0, mSharedPreferences.getLong(WebappDataStorage.KEY_THEME_COLOR, 0));
         assertEquals(0, mSharedPreferences.getLong(WebappDataStorage.KEY_BACKGROUND_COLOR, 0));
         assertEquals(true,
                 mSharedPreferences.getBoolean(WebappDataStorage.KEY_IS_ICON_GENERATED, true));
 
         // Update again from the intent and ensure that the data is restored.
         storage.updateFromShortcutIntent(shortcutIntent);
-        BackgroundShadowAsyncTask.runBackgroundTasks();
-        ShadowLooper.runUiThreadTasks();
 
         assertEquals(action, mSharedPreferences.getString(WebappDataStorage.KEY_ACTION, null));
         assertEquals(url, mSharedPreferences.getString(WebappDataStorage.KEY_URL, null));
         assertEquals(scope, mSharedPreferences.getString(WebappDataStorage.KEY_SCOPE, null));
         assertEquals(name, mSharedPreferences.getString(WebappDataStorage.KEY_NAME, null));
         assertEquals(shortName,
                 mSharedPreferences.getString(WebappDataStorage.KEY_SHORT_NAME, null));
         assertEquals(ShortcutHelper.encodeBitmapAsString(icon),
                 mSharedPreferences.getString(WebappDataStorage.KEY_ICON, null));
         assertEquals(ShortcutHelper.WEBAPP_SHORTCUT_VERSION,
@@ skipping 20 matching lines @@
                 if (actual.getPixel(i, j) != 0) return false;
             }
         }
         return true;
     }
 
     private static Bitmap createBitmap() {
         return Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_4444);
     }
 }