Clear webapp storage when site data is cleared

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.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.SharedPreferences;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.testing.local.BackgroundShadowAsyncTask;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
  * Tests the WebappRegistry class by ensuring that it persists data to
  * SharedPreferences as expected.
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE, shadows = {BackgroundShadowAsyncTask.class})
 public class WebappRegistryTest {
 
@@ skipping 41 matching lines @@
         SharedPreferences webAppPrefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "test", Context.MODE_PRIVATE);
         long actual = webAppPrefs.getLong(WebappDataStorage.KEY_LAST_USED,
                 WebappDataStorage.INVALID_LAST_USED);
         assertTrue("Timestamp is out of range", before <= actual && actual <= after);
     }
 
     @Test
     @Feature({"Webapp"})
     public void testWebappIdsRetrieval() throws Exception {
-        final Set<String> expected = new HashSet<String>();
-        expected.add("first");
-        expected.add("second");
-
-        mSharedPreferences.edit()
-                .putStringSet(WebappRegistry.KEY_WEBAPP_SET, expected)
-                .commit();
+        final Set<String> expected = addWebappsToRegistry("first", "second");
 
         WebappRegistry.getRegisteredWebappIds(Robolectric.application,
                 new WebappRegistry.FetchCallback() {
                     @Override
                     public void onWebappIdsRetrieved(Set<String> actual) {
                         mCallbackCalled = true;
                         assertEquals(expected, actual);
                     }
                 });
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         assertTrue(mCallbackCalled);
     }
 
     @Test
     @Feature({"Webapp"})
     public void testWebappIdsRetrievalRegisterRetrival() throws Exception {
-        final Set<String> expected = new HashSet<String>();
-        expected.add("first");
-
-        mSharedPreferences.edit()
-                .putStringSet(WebappRegistry.KEY_WEBAPP_SET, expected)
-                .commit();
+        final Set<String> expected = addWebappsToRegistry("first");
 
         WebappRegistry.getRegisteredWebappIds(Robolectric.application,
                 new WebappRegistry.FetchCallback() {
                     @Override
                     public void onWebappIdsRetrieved(Set<String> actual) {
                         mCallbackCalled = true;
                         assertEquals(expected, actual);
                     }
                 });
         BackgroundShadowAsyncTask.runBackgroundTasks();
@@ skipping 16 matching lines @@
                     public void onWebappIdsRetrieved(Set<String> actual) {
                         mCallbackCalled = true;
                         assertEquals(secondExpected, actual);
                     }
                 });
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         assertTrue(mCallbackCalled);
     }
+
+    @Test
+    @Feature({"Webapp"})
+    public void testUnregisterClearsRegistry() throws Exception {
+        addWebappsToRegistry("test");
+
+        WebappRegistry.unregisterAllWebapps(Robolectric.application);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+
+        assertTrue(getRegisteredWebapps().isEmpty());
+    }
+
+    @Test
+    @Feature({"Webapp"})
+    public void testUnregisterClearsWebappDataStorage() throws Exception {
+        addWebappsToRegistry("test");
+

[gone, 2015/09/09 23:30:40]

You should actually check if the file exists before checking that it's gone. In
this case, you're not really registering something, so would the file even have
been made?

[Lalit Maganti, 2015/09/10 09:41:57]

Yeah this test is sort of broken. Fixed.

+        WebappRegistry.unregisterAllWebapps(Robolectric.application);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+
+        SharedPreferences webAppPrefs = Robolectric.application.getSharedPreferences(
+                WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "test", Context.MODE_PRIVATE);
+        Map<String, ?> actual = webAppPrefs.getAll();
+        assertTrue(actual.isEmpty());
+    }
+
+    private Set<String> addWebappsToRegistry(String... webapps) {
+        final Set<String> expected = new HashSet<String>(Arrays.asList(webapps));
+        mSharedPreferences.edit()
+                .putStringSet(WebappRegistry.KEY_WEBAPP_SET, expected)
+                .commit();
+        return expected;
+    }
+
+    private Set<String> getRegisteredWebapps() {
+        return mSharedPreferences.getStringSet(
+                WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
+    }
 }