Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3673)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataBridgeTest.java

Issue 2956283002: Expose Add/RemoveActionCallback to java (Closed)
Patch Set: Use assert instead of an exception Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java_sources.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataBridgeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataBridgeTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1d5bf349ce456823f4e0d7ed860d6c53cd1178aa
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/BrowsingDataBridgeTest.java
@@ -0,0 +1,197 @@
+// Copyright 2017 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.preferences.privacy;
+
+import static org.junit.Assert.assertThat;
+
+import android.support.test.filters.SmallTest;
+
+import org.hamcrest.Matchers;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.CallbackHelper;
+import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.UserActionTester;
+import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
+import org.chromium.chrome.browser.browsing_data.TimePeriod;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+
+/**
+ * Integration tests for ClearBrowsingDataPreferences.
+ */
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+ ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
+public class BrowsingDataBridgeTest {
+ @Rule
+ public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+ new ChromeActivityTestRule<>(ChromeActivity.class);
+
+ private CallbackHelper mCallbackHelper;
+ private BrowsingDataBridge.OnClearBrowsingDataListener mListener;
+ private UserActionTester mActionTester;
+
+ @Before
+ public void setUp() throws Exception {
+ mCallbackHelper = new CallbackHelper();
+ mListener = new BrowsingDataBridge.OnClearBrowsingDataListener() {
+ @Override
+ public void onBrowsingDataCleared() {
+ mCallbackHelper.notifyCalled();
+ }
+ };
+ mActivityTestRule.startMainActivityOnBlankPage();
+ mActionTester = new UserActionTester();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mActionTester.tearDown();
+ }
+
+ /**
+ * Test no clear browsing data calls.
+ */
+ @Test
+ @SmallTest
+ public void testNoCalls() throws Exception {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ BrowsingDataBridge.getInstance().clearBrowsingData(
+ mListener, new int[] {}, TimePeriod.ALL_TIME);
+ }
+ });
+ mCallbackHelper.waitForCallback(0);
+ assertThat(mActionTester.toString(), mActionTester.getActions(),
+ Matchers.contains("ClearBrowsingData_Everything"));
+ }
+
+ /**
+ * Test cookies deletion.
+ */
+ @Test
+ @SmallTest
+ public void testCookiesDeleted() throws Exception {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ BrowsingDataBridge.getInstance().clearBrowsingData(
+ mListener, new int[] {BrowsingDataType.COOKIES}, TimePeriod.LAST_HOUR);
+ }
+ });
+ mCallbackHelper.waitForCallback(0);
+ assertThat(mActionTester.toString(), mActionTester.getActions(),
+ Matchers.containsInAnyOrder("ClearBrowsingData_LastHour",
+ "ClearBrowsingData_MaskContainsUnprotectedWeb",
+ "ClearBrowsingData_ChannelIDs", "ClearBrowsingData_Cookies"));
+ }
+
+ /**
+ * Test history deletion.
+ */
+ @Test
+ @SmallTest
+ public void testHistoryDeleted() throws Exception {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ BrowsingDataBridge.getInstance().clearBrowsingData(
+ mListener, new int[] {BrowsingDataType.HISTORY}, TimePeriod.LAST_DAY);
+ }
+ });
+ mCallbackHelper.waitForCallback(0);
+ assertThat(mActionTester.toString(), mActionTester.getActions(),
+ Matchers.containsInAnyOrder("ClearBrowsingData_LastDay",
+ "ClearBrowsingData_MaskContainsUnprotectedWeb",
+ "ClearBrowsingData_History"));
+ }
+
+ /**
+ * Test deleting cache and content settings.
+ */
+ @Test
+ @SmallTest
+ public void testClearingSiteSettingsAndCache() throws Exception {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ BrowsingDataBridge.getInstance().clearBrowsingData(mListener,
+ new int[] {
+ BrowsingDataType.CACHE, BrowsingDataType.SITE_SETTINGS,
+ },
+ TimePeriod.FOUR_WEEKS);
+ }
+ });
+ mCallbackHelper.waitForCallback(0);
+ assertThat(mActionTester.toString(), mActionTester.getActions(),
+ Matchers.containsInAnyOrder("ClearBrowsingData_LastMonth",
+ "ClearBrowsingData_MaskContainsUnprotectedWeb", "ClearBrowsingData_Cache",
+ "ClearBrowsingData_ShaderCache", "ClearBrowsingData_ContentSettings"));
+ }
+
+ /**
+ * Test deleting cache and content settings with important sites.
+ */
+ @Test
+ @SmallTest
+ public void testClearingSiteSettingsAndCacheWithImportantSites() throws Exception {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ BrowsingDataBridge.getInstance().clearBrowsingDataExcludingDomains(mListener,
+ new int[] {
+ BrowsingDataType.CACHE, BrowsingDataType.SITE_SETTINGS,
+ },
+ TimePeriod.FOUR_WEEKS, new String[] {"google.com"}, new int[] {1},
+ new String[0], new int[0]);
+ }
+ });
+ mCallbackHelper.waitForCallback(0);
+ assertThat(mActionTester.toString(), mActionTester.getActions(),
+ Matchers.containsInAnyOrder("ClearBrowsingData_LastMonth",
+ // ClearBrowsingData_MaskContainsUnprotectedWeb is logged
+ // twice because important storage is deleted separately.
+ "ClearBrowsingData_MaskContainsUnprotectedWeb",
+ "ClearBrowsingData_MaskContainsUnprotectedWeb", "ClearBrowsingData_Cache",
+ "ClearBrowsingData_ShaderCache", "ClearBrowsingData_ContentSettings"));
+ }
+
+ /**
+ * Test deleting all browsing data. (Except bookmarks, they are deleted in Java code)
+ */
+ @Test
+ @SmallTest
+ public void testClearingAll() throws Exception {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ BrowsingDataBridge.getInstance().clearBrowsingData(mListener,
+ new int[] {
+ BrowsingDataType.CACHE, BrowsingDataType.COOKIES,
+ BrowsingDataType.FORM_DATA, BrowsingDataType.HISTORY,
+ BrowsingDataType.PASSWORDS, BrowsingDataType.SITE_SETTINGS,
+ },
+ TimePeriod.LAST_WEEK);
+ }
+ });
+ mCallbackHelper.waitForCallback(0);
+ assertThat(mActionTester.toString(), mActionTester.getActions(),
+ Matchers.containsInAnyOrder("ClearBrowsingData_LastWeek",
+ "ClearBrowsingData_MaskContainsUnprotectedWeb", "ClearBrowsingData_Cache",
+ "ClearBrowsingData_ShaderCache", "ClearBrowsingData_Cookies",
+ "ClearBrowsingData_ChannelIDs", "ClearBrowsingData_Autofill",
+ "ClearBrowsingData_History", "ClearBrowsingData_Passwords",
+ "ClearBrowsingData_ContentSettings"));
+ }
+}
« no previous file with comments | « chrome/android/java_sources.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698