chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java - Issue 2292083004: Revert of Add tab persistence support for CustomTabs.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java

Issue 2292083004: Revert of Add tab persistence support for CustomTabs. (Closed)

Patch Set: Created 4 years, 3 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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java

deleted file mode 100644

index 499348c96dcc840fd376b730bb470de68cc7bd47..0000000000000000000000000000000000000000

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java

+++ /dev/null

@@ -1,432 +0,0 @@

-// 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.customtabs;

-import static android.test.MoreAsserts.assertContentsInAnyOrder;

-import static android.test.MoreAsserts.assertEmpty;

-import android.app.Activity;

-import android.os.AsyncTask;

-import android.test.InstrumentationTestCase;

-import android.test.UiThreadTest;

-import android.test.suitebuilder.annotation.MediumTest;

-import android.test.suitebuilder.annotation.SmallTest;

-import org.chromium.base.ActivityState;

-import org.chromium.base.ApplicationStatus;

-import org.chromium.base.Callback;

-import org.chromium.base.ContextUtils;

-import org.chromium.base.StreamUtil;

-import org.chromium.base.ThreadUtils;

-import org.chromium.base.test.util.AdvancedMockContext;

-import org.chromium.base.test.util.Feature;

-import org.chromium.chrome.browser.ChromeTabbedActivity;

-import org.chromium.chrome.browser.TabState;

-import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;

-import org.chromium.chrome.browser.tab.Tab;

-import org.chromium.chrome.browser.tabmodel.TabModelSelector;

-import org.chromium.chrome.browser.tabmodel.TabModelSelectorImpl;

-import org.chromium.chrome.browser.tabmodel.TabPersistencePolicy;

-import org.chromium.chrome.browser.tabmodel.TabPersistentStore;

-import org.chromium.chrome.browser.tabmodel.TestTabModelDirectory;

-import org.chromium.chrome.test.util.browser.tabmodel.MockTabModel;

-import org.chromium.content.browser.test.util.CallbackHelper;

-import java.io.File;

-import java.io.FileOutputStream;

-import java.lang.ref.WeakReference;

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-import java.util.concurrent.Callable;

-import java.util.concurrent.Executor;

-import java.util.concurrent.atomic.AtomicReference;

-import javax.annotation.Nullable;

-/**

- * Tests for the Custom Tab persistence logic.

- */

-public class CustomTabTabPersistencePolicyTest extends InstrumentationTestCase {

- private TestTabModelDirectory mMockDirectory;

- private AdvancedMockContext mAppContext;

- @Override

- public void setUp() throws Exception {

- super.setUp();

- mAppContext = new AdvancedMockContext(

- getInstrumentation().getTargetContext().getApplicationContext());

- ContextUtils.initApplicationContextForTests(mAppContext);

- mMockDirectory = new TestTabModelDirectory(

- mAppContext, "CustomTabTabPersistencePolicyTest",

- CustomTabTabPersistencePolicy.SAVED_STATE_DIRECTORY);

- TabPersistentStore.setBaseStateDirectoryForTests(mMockDirectory.getBaseDirectory());

- }

- @Override

- public void tearDown() throws Exception {

- mMockDirectory.tearDown();

- List<WeakReference<Activity>> activities = ApplicationStatus.getRunningActivities();

- for (int i = 0; i < activities.size(); i++) {

- Activity activity = activities.get(i).get();

- if (activity == null) continue;

- ApplicationStatus.onStateChangeForTesting(activity, ActivityState.DESTROYED);

- }

- super.tearDown();

- }

- @Feature("TabPersistentStore")

- @SmallTest

- public void testDeletableMetadataSelection_NoFiles() {

- List<File> deletableFiles = CustomTabTabPersistencePolicy.getMetadataFilesForDeletion(

- System.currentTimeMillis(), new ArrayList<File>());

- assertEmpty(deletableFiles);

- }

- @Feature("TabPersistentStore")

- @SmallTest

- public void testDeletableMetadataSelection_MaximumValidFiles() {

- long currentTime = System.currentTimeMillis();

- // Test the maximum allowed number of state files where they are all valid in terms of age.

- List<File> filesToTest = new ArrayList<>();

- filesToTest.addAll(generateMaximumStateFiles(currentTime));

- List<File> deletableFiles = CustomTabTabPersistencePolicy.getMetadataFilesForDeletion(

- currentTime, filesToTest);

- assertEmpty(deletableFiles);

- }

- @Feature("TabPersistentStore")

- @SmallTest

- public void testDeletableMetadataSelection_ExceedsMaximumValidFiles() {

- long currentTime = System.currentTimeMillis();

- // Test where we exceed the maximum number of allowed state files and ensure it chooses the

- // older file to delete.

- List<File> filesToTest = new ArrayList<>();

- filesToTest.addAll(generateMaximumStateFiles(currentTime));

- File slightlyOlderFile = buildTestFile("slightlyolderfile", currentTime - 1L);

- // Insert it into the middle just to ensure it is not picking the last file.

- filesToTest.add(filesToTest.size() / 2, slightlyOlderFile);

- List<File> deletableFiles = CustomTabTabPersistencePolicy.getMetadataFilesForDeletion(

- currentTime, filesToTest);

- assertContentsInAnyOrder(deletableFiles, slightlyOlderFile);

- }

- @Feature("TabPersistentStore")

- @SmallTest

- public void testDeletableMetadataSelection_ExceedExpiryThreshold() {

- long currentTime = System.currentTimeMillis();

- // Ensure that files that exceed the allowed time threshold are removed regardless of the

- // number of possible files.

- List<File> filesToTest = new ArrayList<>();

- File expiredFile = buildTestFile("expired_file",

- currentTime - CustomTabTabPersistencePolicy.STATE_EXPIRY_THRESHOLD);

- filesToTest.add(expiredFile);

- List<File> deletableFiles = CustomTabTabPersistencePolicy.getMetadataFilesForDeletion(

- currentTime, filesToTest);

- assertContentsInAnyOrder(deletableFiles, expiredFile);

- }

- /**

- * Test to ensure that an existing metadata files are deleted if no restore is requested.

- */

- @Feature("TabPersistentStore")

- @MediumTest

- public void testExistingMetadataFileDeletedIfNoRestore() throws Exception {

- File baseStateDirectory = TabPersistentStore.getOrCreateBaseStateDirectory();

- assertNotNull(baseStateDirectory);

- CustomTabTabPersistencePolicy policy = new CustomTabTabPersistencePolicy(7, false);

- File stateDirectory = policy.getOrCreateStateDirectory();

- assertNotNull(stateDirectory);

- String stateFileName = policy.getStateFileName();

- File existingStateFile = new File(stateDirectory, stateFileName);

- assertTrue(existingStateFile.createNewFile());

- assertTrue(existingStateFile.exists());

- policy.performInitialization(AsyncTask.SERIAL_EXECUTOR);

- policy.waitForInitializationToFinish();

- assertFalse(existingStateFile.exists());

- }

- /**

- * Test the logic that gets all the live tab and task IDs.

- */

- @Feature("TabPersistentStore")

- @SmallTest

- @UiThreadTest

- public void testGettingTabAndTaskIds() {

- Set<Integer> tabIds = new HashSet<>();

- Set<Integer> taskIds = new HashSet<>();

- CustomTabTabPersistencePolicy.getAllLiveTabAndTaskIds(tabIds, taskIds);

- assertEmpty(tabIds);

- assertEmpty(taskIds);

- tabIds.clear();

- taskIds.clear();

- CustomTabActivity cct1 = buildTestCustomTabActivity(1, new int[] {4, 8, 9}, null);

- ApplicationStatus.onStateChangeForTesting(cct1, ActivityState.CREATED);

- CustomTabActivity cct2 = buildTestCustomTabActivity(5, new int[] {458}, new int[] {9878});

- ApplicationStatus.onStateChangeForTesting(cct2, ActivityState.CREATED);

- // Add a tabbed mode activity to ensure that its IDs are not included in the returned CCT

- // ID sets.

- final TabModelSelectorImpl tabbedSelector =

- buildTestTabModelSelector(new int[] {12121212}, new int[] {1515151515});

- ChromeTabbedActivity tabbedActivity = new ChromeTabbedActivity() {

- @Override

- public int getTaskId() {

- return 888;

- }

- @Override

- public TabModelSelector getTabModelSelector() {

- return tabbedSelector;

- }

- };

- ApplicationStatus.onStateChangeForTesting(tabbedActivity, ActivityState.CREATED);

- CustomTabTabPersistencePolicy.getAllLiveTabAndTaskIds(tabIds, taskIds);

- assertContentsInAnyOrder(tabIds, 4, 8, 9, 458, 9878);

- assertContentsInAnyOrder(taskIds, 1, 5);

- }

- /**

- * Test the full cleanup task path that determines what files are eligible for deletion.

- */

- @Feature("TabPersistentStore")

- @MediumTest

- public void testCleanupTask() throws Exception {

- File baseStateDirectory = TabPersistentStore.getOrCreateBaseStateDirectory();

- assertNotNull(baseStateDirectory);

- CustomTabTabPersistencePolicy policy = new CustomTabTabPersistencePolicy(2, false);

- File stateDirectory = policy.getOrCreateStateDirectory();

- assertNotNull(stateDirectory);

- final AtomicReference<List<String>> filesToDelete = new AtomicReference<>();

- final CallbackHelper callbackSignal = new CallbackHelper();

- Callback<List<String>> filesToDeleteCallback = new Callback<List<String>>() {

- @Override

- public void onResult(List<String> fileNames) {

- filesToDelete.set(fileNames);

- callbackSignal.notifyCalled();

- }

- };

- // Test when no files have been created.

- policy.cleanupUnusedFiles(filesToDeleteCallback);

- callbackSignal.waitForCallback(0);

- assertEmpty(filesToDelete.get());

- // Create an unreferenced tab state file and ensure it is marked for deletion.

- File tab999File = TabState.getTabStateFile(stateDirectory, 999, false);

- assertTrue(tab999File.createNewFile());

- policy.cleanupUnusedFiles(filesToDeleteCallback);

- callbackSignal.waitForCallback(1);

- assertContentsInAnyOrder(filesToDelete.get(), tab999File.getName());

- // Reference the tab state file and ensure it is no longer marked for deletion.

- CustomTabActivity cct1 = buildTestCustomTabActivity(1, new int[] {999}, null);

- ApplicationStatus.onStateChangeForTesting(cct1, ActivityState.CREATED);

- policy.cleanupUnusedFiles(filesToDeleteCallback);

- callbackSignal.waitForCallback(2);

- assertEmpty(filesToDelete.get());

- // Create a tab model and associated tabs. Ensure it is not marked for deletion as it is

- // new enough.

- final TabModelSelectorImpl selectorImpl = buildTestTabModelSelector(

- new int[] {111, 222, 333 }, null);

- byte[] data = ThreadUtils.runOnUiThreadBlockingNoException(new Callable<byte[]>() {

- @Override

- public byte[] call() throws Exception {

- return TabPersistentStore.serializeTabModelSelector(selectorImpl, null);

- }

- });

- FileOutputStream fos = null;

- File metadataFile = new File(

- stateDirectory, TabPersistentStore.getStateFileName("3"));

- try {

- fos = new FileOutputStream(metadataFile);

- fos.write(data);

- } finally {

- StreamUtil.closeQuietly(fos);

- }

- File tab111File = TabState.getTabStateFile(stateDirectory, 111, false);

- assertTrue(tab111File.createNewFile());

- File tab222File = TabState.getTabStateFile(stateDirectory, 222, false);

- assertTrue(tab222File.createNewFile());

- File tab333File = TabState.getTabStateFile(stateDirectory, 333, false);

- assertTrue(tab333File.createNewFile());

- policy.cleanupUnusedFiles(filesToDeleteCallback);

- callbackSignal.waitForCallback(3);

- assertEmpty(filesToDelete.get());

- // Set the age of the metadata file to be past the expiration threshold and ensure it along

- // with the associated tab files are marked for deletion.

- assertTrue(metadataFile.setLastModified(1234));

- policy.cleanupUnusedFiles(filesToDeleteCallback);

- callbackSignal.waitForCallback(4);

- assertContentsInAnyOrder(filesToDelete.get(), tab111File.getName(), tab222File.getName(),

- tab333File.getName(), metadataFile.getName());

- }

- /**

- * Ensure that the metadata file's last modified timestamp is updated on initialization.

- */

- @Feature("TabPersistentStore")

- @MediumTest

- public void testMetadataTimestampRefreshed() throws Exception {

- File baseStateDirectory = TabPersistentStore.getOrCreateBaseStateDirectory();

- assertNotNull(baseStateDirectory);

- CustomTabTabPersistencePolicy policy = new CustomTabTabPersistencePolicy(2, true);

- File stateDirectory = policy.getOrCreateStateDirectory();

- assertNotNull(stateDirectory);

- File metadataFile = new File(stateDirectory, policy.getStateFileName());

- assertTrue(metadataFile.createNewFile());

- long previousTimestamp =

- System.currentTimeMillis() - CustomTabTabPersistencePolicy.STATE_EXPIRY_THRESHOLD;

- assertTrue(metadataFile.setLastModified(previousTimestamp));

- policy.performInitialization(AsyncTask.SERIAL_EXECUTOR);

- policy.waitForInitializationToFinish();

- assertTrue(metadataFile.lastModified() > previousTimestamp);

- }

- private static List<File> generateMaximumStateFiles(long currentTime) {

- List<File> validFiles = new ArrayList<>();

- for (int i = 0; i < CustomTabTabPersistencePolicy.MAXIMUM_STATE_FILES; i++) {

- validFiles.add(buildTestFile("testfile" + i, currentTime));

- }

- return validFiles;

- }

- private static File buildTestFile(String filename, final long lastModifiedTime) {

- return new File(filename) {

- @Override

- public long lastModified() {

- return lastModifiedTime;

- }

- };

- }

- private static CustomTabActivity buildTestCustomTabActivity(

- final int taskId, int[] normalTabIds, int[] incognitoTabIds) {

- final TabModelSelectorImpl selectorImpl =

- buildTestTabModelSelector(normalTabIds, incognitoTabIds);

- return new CustomTabActivity() {

- @Override

- public int getTaskId() {

- return taskId;

- }

- @Override

- public TabModelSelectorImpl getTabModelSelector() {

- return selectorImpl;

- }

- };

- }

- private static TabPersistencePolicy buildTestPersistencePolicy() {

- return new TabPersistencePolicy() {

- @Override

- public void waitForInitializationToFinish() {

- }

- @Override

- public void setTabContentManager(TabContentManager cache) {

- }

- @Override

- public void setMergeInProgress(boolean isStarted) {

- }

- @Override

- public boolean performInitialization(Executor executor) {

- return false;

- }

- @Override

- public boolean isMergeInProgress() {

- return false;

- }

- @Override

- @Nullable

- public String getStateToBeMergedFileName() {

- return null;

- }

- @Override

- public String getStateFileName() {

- return "testing_is_niftytown";

- }

- @Override

- public File getOrCreateStateDirectory() {

- return new File(

- TabPersistentStore.getOrCreateBaseStateDirectory(), "cct_tests_zor");

- }

- @Override

- public void destroy() {

- }

- @Override

- public void cleanupUnusedFiles(Callback<List<String>> filesToDelete) {

- }

- @Override

- public void cancelCleanupInProgress() {

- }

- };

- }

- private static TabModelSelectorImpl buildTestTabModelSelector(

- int[] normalTabIds, int[] incognitoTabIds) {

- MockTabModel.MockTabModelDelegate tabModelDelegate =

- new MockTabModel.MockTabModelDelegate() {

- @Override

- public Tab createTab(int id, boolean incognito) {

- return new Tab(id, incognito, null) {

- @Override

- public String getUrl() {

- return "https://www.google.com";

- }

- };

- }

- };

- final MockTabModel normalTabModel = new MockTabModel(false, tabModelDelegate);

- if (normalTabIds != null) {

- for (int tabId : normalTabIds) normalTabModel.addTab(tabId);

- }

- final MockTabModel incognitoTabModel = new MockTabModel(true, tabModelDelegate);

- if (incognitoTabIds != null) {

- for (int tabId : incognitoTabIds) incognitoTabModel.addTab(tabId);

- }

- CustomTabActivity activity = new CustomTabActivity();

- ApplicationStatus.onStateChangeForTesting(activity, ActivityState.CREATED);

- TabModelSelectorImpl selector = new TabModelSelectorImpl(

- activity, buildTestPersistencePolicy(), null, false);

- selector.initializeForTesting(normalTabModel, incognitoTabModel);

- ApplicationStatus.onStateChangeForTesting(activity, ActivityState.DESTROYED);

- return selector;

- }

« no previous file with comments | « chrome/android/java_sources.gni ('k') | no next file » | no next file with comments »