Separate state of basic and advanced tab in CBD dialog

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.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.preferences.privacy;
 
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.support.test.filters.LargeTest;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
 import android.support.v7.app.AlertDialog;
 import android.text.SpannableString;
 import android.widget.ListView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ShortcutHelper;
+import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataPreferenceType;
 import org.chromium.chrome.browser.preferences.ButtonPreference;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataPreferences.DialogOption;
 import org.chromium.chrome.browser.webapps.TestFetchStorageCallback;
 import org.chromium.chrome.browser.webapps.WebappDataStorage;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
 import org.chromium.content.browser.test.util.Criteria;
@@ skipping 137 matching lines @@
         final ClearBrowsingDataPreferences preferences =
                 (ClearBrowsingDataPreferences) startPreferences(
                         ClearBrowsingDataPreferences.class.getName())
                         .getFragmentForTest();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 PreferenceScreen screen = preferences.getPreferenceScreen();
 
                 for (int i = 0; i < screen.getPreferenceCount(); ++i) {

[msramek, 2017/02/08 10:55:56]

You were asking about tests on Android - this file is an example of the so
called instrumentation test.

On this line, we iterate over checkboxes, make sure they're all checked, then
programatically click the "Clear" button. You might want to use the same
principle to test the UI; For example, check the checkboxes in one tab, switch
to the other tab, check that the configuration didn't carry over etc.

Regarding integration tests:
-> For data that are handled by Android code, we have
BrowsingDataRemoverIntegrationTest.
-> For data that are handled by the native code, we currently rely on unittests
in c/b/browsing_data and this instrumentation test. However, a bug in
PrefServiceBridge could potentially go unnoticed. I would love for you to
improve that, but that's a larger effort that does not belong to this CL.

Basically, to write a proper integration test between the Android UI and the
backend, you need an instrumentation test which populates the data storage
backends, runs the deletion, and inspects that the storage backends are empty.
That means adding a lot of methods to *Bridge for the population and inspection.
If we proceed to do that, I would start by splitting of browsing_data stuff from
PrefServiceBridge to our own BrowsingDataBridge.

[dullweber, 2017/02/08 23:03:18]

Ok, I will try to add a test here. Maybe it would be helpful if we could
redirect the call to a mock browsing data remover and only check that the right
remove mask is used to avoid creating all the different data types from java?
The actual deletion should already be tested in many unit tests. The browsing
data remover factory looks like a good point to insert a different remover that
just remembers the last deletion mask.

[msramek, 2017/02/09 18:16:48]

Yes, that's a possibility. We could use
BrowsingDataRemoverFactory::SetTestingFactory() to force the profile to produce
a mock. Then we would call something like testDeletion(datatypes,
expected_mask), which passes the |datatypes| through PrefServiceBridge and
verifies that the mock has seen a call with |expected_mask|. That would cost us
only 2 new methods in the bridge.

                     Preference pref = screen.getPreference(i);
                     if (!(pref instanceof CheckBoxPreference)) {
                         continue;
                     }
                     CheckBoxPreference checkbox = (CheckBoxPreference) pref;
                     assertTrue(checkbox.isChecked());
                 }
 
                 ButtonPreference clearButton = (ButtonPreference) screen.findPreference(
                         ClearBrowsingDataPreferences.PREF_CLEAR_BUTTON);
@@ skipping 404 matching lines @@
         assertEquals("true", runJavaScriptCodeInCurrentTab("hasAllStorage()"));
     }
 
     private void setDataTypesToClear(final List<DialogOption> typesToClear) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 for (DialogOption option : DialogOption.values()) {
                     boolean enabled = typesToClear.contains(option);
                     PrefServiceBridge.getInstance().setBrowsingDataDeletionPreference(
-                            option.getDataType(), enabled);
+                            option.getDataType(), ClearBrowsingDataPreferenceType.DEFAULT, enabled);
                 }
             }
         });
     }
 }