Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java |
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java |
index dfdf883bfc66e1a8b821eab23d3b12b9ddd54692..543a437926262f03a68cca3954b52a72b5ea5622 100644 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java |
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java |
@@ -7,13 +7,22 @@ package org.chromium.chrome.browser.tabmodel; |
import android.app.Activity; |
import android.content.SharedPreferences; |
import android.os.AsyncTask; |
+import android.support.test.InstrumentationRegistry; |
import android.support.test.filters.SmallTest; |
import android.util.Pair; |
import android.util.SparseArray; |
+import org.junit.After; |
+import org.junit.Assert; |
+import org.junit.Before; |
+import org.junit.Rule; |
+import org.junit.Test; |
+import org.junit.runner.RunWith; |
+ |
import org.chromium.base.ActivityState; |
import org.chromium.base.ContextUtils; |
import org.chromium.base.ThreadUtils; |
+import org.chromium.base.test.BaseJUnit4ClassRunner; |
import org.chromium.base.test.util.AdvancedMockContext; |
import org.chromium.base.test.util.CallbackHelper; |
import org.chromium.base.test.util.Feature; |
@@ -30,9 +39,9 @@ import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType; |
import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType; |
import org.chromium.chrome.browser.tabmodel.TabPersistentStore.TabPersistentStoreObserver; |
import org.chromium.chrome.browser.tabmodel.TestTabModelDirectory.TabModelMetaDataInfo; |
+import org.chromium.chrome.browser.test.ChromeBrowserTestRule; |
import org.chromium.chrome.browser.widget.OverviewListLayout; |
import org.chromium.chrome.test.util.browser.tabmodel.MockTabModelSelector; |
-import org.chromium.content.browser.test.NativeLibraryTestBase; |
import org.chromium.content_public.browser.LoadUrlParams; |
import org.chromium.content_public.browser.WebContents; |
@@ -41,7 +50,14 @@ import java.util.List; |
import java.util.concurrent.Callable; |
/** Tests for the TabPersistentStore. */ |
-public class TabPersistentStoreTest extends NativeLibraryTestBase { |
+@RunWith(BaseJUnit4ClassRunner.class) |
+public class TabPersistentStoreTest { |
+ @Rule |
+ public final ChromeBrowserTestRule mBrowserTestRule = |
+ new ChromeBrowserTestRule(true /* initBrowserProcess */); |
+ |
+ private ChromeActivity mChromeActivity; |
+ |
private static final int SELECTOR_INDEX = 0; |
private static class TabRestoredDetails { |
@@ -249,28 +265,6 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
} |
} |
- private final ChromeActivity mFakeChromeActivity = new ChromeActivity() { |
- @Override |
- protected boolean handleBackPressed() { |
- return false; |
- } |
- |
- @Override |
- protected Pair<? extends TabCreator, ? extends TabCreator> createTabCreators() { |
- return null; |
- } |
- |
- @Override |
- protected TabModelSelector createTabModelSelector() { |
- return null; |
- } |
- |
- @Override |
- protected ChromeFullscreenManager createFullscreenManager() { |
- return null; |
- } |
- }; |
- |
private final TabWindowManager.TabModelSelectorFactory mMockTabModelSelectorFactory = |
new TabWindowManager.TabModelSelectorFactory() { |
@Override |
@@ -289,13 +283,39 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
private AdvancedMockContext mAppContext; |
private SharedPreferences mPreferences; |
- @Override |
+ @Before |
public void setUp() throws Exception { |
- super.setUp(); |
- loadNativeLibraryAndInitBrowserProcess(); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ mChromeActivity = new ChromeActivity() { |
+ @Override |
+ protected boolean handleBackPressed() { |
+ return false; |
+ } |
+ |
+ @Override |
+ protected Pair<? extends TabCreator, ? extends TabCreator> createTabCreators() { |
+ return null; |
+ } |
+ |
+ @Override |
+ protected TabModelSelector createTabModelSelector() { |
+ return null; |
+ } |
+ |
+ @Override |
+ protected ChromeFullscreenManager createFullscreenManager() { |
+ return null; |
+ } |
+ }; |
+ } |
+ }); |
+ |
// Using an AdvancedMockContext allows us to use a fresh in-memory SharedPreference. |
- mAppContext = new AdvancedMockContext( |
- getInstrumentation().getTargetContext().getApplicationContext()); |
+ mAppContext = new AdvancedMockContext(InstrumentationRegistry.getInstrumentation() |
+ .getTargetContext() |
+ .getApplicationContext()); |
ContextUtils.initApplicationContextForTests(mAppContext); |
mPreferences = ContextUtils.getAppSharedPreferences(); |
mMockDirectory = new TestTabModelDirectory( |
@@ -303,17 +323,16 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
TabPersistentStore.setBaseStateDirectoryForTests(mMockDirectory.getBaseDirectory()); |
} |
- @Override |
+ @After |
public void tearDown() throws Exception { |
ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
@Override |
public void run() { |
TabWindowManager.getInstance().onActivityStateChange( |
- mFakeChromeActivity, ActivityState.DESTROYED); |
+ mChromeActivity, ActivityState.DESTROYED); |
} |
}); |
mMockDirectory.tearDown(); |
- super.tearDown(); |
} |
private TabPersistentStore buildTabPersistentStore(final TabPersistencePolicy persistencePolicy, |
@@ -328,8 +347,9 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
}); |
} |
+ @Test |
@SmallTest |
- @Feature({"TabPersistentStore"}) |
+ @Feature("TabPersistentStore") |
public void testBasic() throws Exception { |
TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V4; |
int numExpectedTabs = info.contents.length; |
@@ -342,41 +362,47 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabCreator regularCreator = mockManager.getTabCreator(false); |
MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver(); |
TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false); |
- TabPersistentStore store = buildTabPersistentStore( |
- persistencePolicy, mockSelector, mockManager, mockObserver); |
+ final TabPersistentStore store = |
+ buildTabPersistentStore(persistencePolicy, mockSelector, mockManager, mockObserver); |
// Should not prefetch with no prior active tab preference stored. |
- assertNull(store.mPrefetchActiveTabTask); |
+ Assert.assertNull(store.mPrefetchActiveTabTask); |
// Make sure the metadata file loads properly and in order. |
store.loadState(false /* ignoreIncognitoFiles */); |
mockObserver.initializedCallback.waitForCallback(0, 1); |
- assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup); |
+ Assert.assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup); |
mockObserver.detailsReadCallback.waitForCallback(0, numExpectedTabs); |
- assertEquals(numExpectedTabs, mockObserver.details.size()); |
+ Assert.assertEquals(numExpectedTabs, mockObserver.details.size()); |
for (int i = 0; i < numExpectedTabs; i++) { |
TabRestoredDetails details = mockObserver.details.get(i); |
- assertEquals(i, details.index); |
- assertEquals(info.contents[i].tabId, details.id); |
- assertEquals(info.contents[i].url, details.url); |
- assertEquals(details.id == info.selectedTabId, details.isStandardActiveIndex); |
- assertEquals(false, details.isIncognitoActiveIndex); |
+ Assert.assertEquals(i, details.index); |
+ Assert.assertEquals(info.contents[i].tabId, details.id); |
+ Assert.assertEquals(info.contents[i].url, details.url); |
+ Assert.assertEquals(details.id == info.selectedTabId, details.isStandardActiveIndex); |
+ Assert.assertEquals(false, details.isIncognitoActiveIndex); |
} |
// Restore the TabStates. The first Tab added should be the most recently selected tab. |
- store.restoreTabs(true); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ store.restoreTabs(true); |
+ } |
+ }); |
regularCreator.callback.waitForCallback(0, 1); |
- assertEquals(info.selectedTabId, regularCreator.idOfFirstCreatedTab); |
+ Assert.assertEquals(info.selectedTabId, regularCreator.idOfFirstCreatedTab); |
// Confirm that all the TabStates were read from storage (i.e. non-null). |
mockObserver.stateLoadedCallback.waitForCallback(0, 1); |
for (int i = 0; i < info.contents.length; i++) { |
int tabId = info.contents[i].tabId; |
- assertNotNull(regularCreator.created.get(tabId)); |
+ Assert.assertNotNull(regularCreator.created.get(tabId)); |
} |
} |
+ @Test |
@SmallTest |
@Feature({"TabPersistentStore"}) |
public void testInterruptedButStillRestoresAllTabs() throws Exception { |
@@ -395,7 +421,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
firstPersistencePolicy, firstSelector, firstManager, firstObserver); |
firstStore.loadState(false /* ignoreIncognitoFiles */); |
firstObserver.initializedCallback.waitForCallback(0, 1); |
- assertEquals(numExpectedTabs, firstObserver.mTabCountAtStartup); |
+ Assert.assertEquals(numExpectedTabs, firstObserver.mTabCountAtStartup); |
firstObserver.detailsReadCallback.waitForCallback(0, numExpectedTabs); |
ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
@@ -412,7 +438,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabPersistentStoreObserver secondObserver = new MockTabPersistentStoreObserver(); |
TabPersistencePolicy secondPersistencePolicy = new TabbedModeTabPersistencePolicy(0, false); |
- TabPersistentStore secondStore = buildTabPersistentStore( |
+ final TabPersistentStore secondStore = buildTabPersistentStore( |
secondPersistencePolicy, secondSelector, secondManager, secondObserver); |
// The second TabPersistentStore reads the file written by the first TabPersistentStore. |
@@ -421,10 +447,10 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
// the TabModels. |
secondStore.loadState(false /* ignoreIncognitoFiles */); |
secondObserver.initializedCallback.waitForCallback(0, 1); |
- assertEquals(numExpectedTabs, secondObserver.mTabCountAtStartup); |
+ Assert.assertEquals(numExpectedTabs, secondObserver.mTabCountAtStartup); |
secondObserver.detailsReadCallback.waitForCallback(0, numExpectedTabs); |
- assertEquals(numExpectedTabs, secondObserver.details.size()); |
+ Assert.assertEquals(numExpectedTabs, secondObserver.details.size()); |
for (int i = 0; i < numExpectedTabs; i++) { |
TabRestoredDetails details = secondObserver.details.get(i); |
@@ -438,22 +464,30 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
} |
// TODO(dfalcantara): This won't be properly set until we have tab ordering preserved. |
- // assertEquals(details.id == TestTabModelDirectory.TAB_MODEL_METADATA_V4_SELECTED_ID, |
+ // Assert.assertEquals(details.id == |
+ // TestTabModelDirectory.TAB_MODEL_METADATA_V4_SELECTED_ID, |
// details.isStandardActiveIndex); |
- assertEquals(currentInfo.url, details.url); |
- assertEquals(false, details.isIncognitoActiveIndex); |
+ Assert.assertEquals(currentInfo.url, details.url); |
+ Assert.assertEquals(false, details.isIncognitoActiveIndex); |
} |
// Restore all of the TabStates. Confirm that all the TabStates were read (i.e. non-null). |
- secondStore.restoreTabs(true); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ secondStore.restoreTabs(true); |
+ } |
+ }); |
+ |
secondObserver.stateLoadedCallback.waitForCallback(0, 1); |
for (int i = 0; i < numExpectedTabs; i++) { |
int tabId = TestTabModelDirectory.TAB_MODEL_METADATA_V4.contents[i].tabId; |
- assertNotNull(secondCreator.created.get(tabId)); |
+ Assert.assertNotNull(secondCreator.created.get(tabId)); |
} |
} |
+ @Test |
@SmallTest |
@Feature({"TabPersistentStore"}) |
public void testMissingTabStateButStillRestoresTab() throws Exception { |
@@ -471,33 +505,39 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabCreatorManager mockManager = new MockTabCreatorManager(mockSelector); |
MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver(); |
TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false); |
- TabPersistentStore store = buildTabPersistentStore( |
- persistencePolicy, mockSelector, mockManager, mockObserver); |
+ final TabPersistentStore store = |
+ buildTabPersistentStore(persistencePolicy, mockSelector, mockManager, mockObserver); |
// Make sure the metadata file loads properly and in order. |
store.loadState(false /* ignoreIncognitoFiles */); |
mockObserver.initializedCallback.waitForCallback(0, 1); |
- assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup); |
+ Assert.assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup); |
mockObserver.detailsReadCallback.waitForCallback(0, numExpectedTabs); |
- assertEquals(numExpectedTabs, mockObserver.details.size()); |
+ Assert.assertEquals(numExpectedTabs, mockObserver.details.size()); |
for (int i = 0; i < numExpectedTabs; i++) { |
TabRestoredDetails details = mockObserver.details.get(i); |
- assertEquals(i, details.index); |
- assertEquals(info.contents[i].tabId, details.id); |
- assertEquals(info.contents[i].url, details.url); |
- assertEquals(details.id == info.selectedTabId, details.isStandardActiveIndex); |
- assertEquals(false, details.isIncognitoActiveIndex); |
+ Assert.assertEquals(i, details.index); |
+ Assert.assertEquals(info.contents[i].tabId, details.id); |
+ Assert.assertEquals(info.contents[i].url, details.url); |
+ Assert.assertEquals(details.id == info.selectedTabId, details.isStandardActiveIndex); |
+ Assert.assertEquals(false, details.isIncognitoActiveIndex); |
} |
- // Restore the TabStates, and confirm that the correct number of tabs is created even with |
- // one missing. |
- store.restoreTabs(true); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ // Restore the TabStates, and confirm that the correct number of tabs is created |
+ // even with one missing. |
+ store.restoreTabs(true); |
+ } |
+ }); |
mockObserver.stateLoadedCallback.waitForCallback(0, 1); |
- assertEquals(numExpectedTabs, mockSelector.getModel(false).getCount()); |
- assertEquals(0, mockSelector.getModel(true).getCount()); |
+ Assert.assertEquals(numExpectedTabs, mockSelector.getModel(false).getCount()); |
+ Assert.assertEquals(0, mockSelector.getModel(true).getCount()); |
} |
+ @Test |
@SmallTest |
@Feature({"TabPersistentStore"}) |
public void testRestoresTabWithMissingTabStateWhileIgnoringIncognitoTab() throws Exception { |
@@ -515,26 +555,32 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabCreatorManager mockManager = new MockTabCreatorManager(mockSelector); |
MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver(); |
TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false); |
- TabPersistentStore store = buildTabPersistentStore( |
- persistencePolicy, mockSelector, mockManager, mockObserver); |
+ final TabPersistentStore store = |
+ buildTabPersistentStore(persistencePolicy, mockSelector, mockManager, mockObserver); |
// Load the TabModel metadata. |
store.loadState(false /* ignoreIncognitoFiles */); |
mockObserver.initializedCallback.waitForCallback(0, 1); |
- assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup); |
+ Assert.assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup); |
mockObserver.detailsReadCallback.waitForCallback(0, numExpectedTabs); |
- assertEquals(numExpectedTabs, mockObserver.details.size()); |
+ Assert.assertEquals(numExpectedTabs, mockObserver.details.size()); |
// TODO(dfalcantara): Expand MockTabModel* to support Incognito Tab decryption. |
// Restore the TabStates, and confirm that the correct number of tabs is created even with |
// one missing. No Incognito tabs should be created because the TabState is missing. |
- store.restoreTabs(true); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ store.restoreTabs(true); |
+ } |
+ }); |
mockObserver.stateLoadedCallback.waitForCallback(0, 1); |
- assertEquals(info.numRegularTabs, mockSelector.getModel(false).getCount()); |
- assertEquals(0, mockSelector.getModel(true).getCount()); |
+ Assert.assertEquals(info.numRegularTabs, mockSelector.getModel(false).getCount()); |
+ Assert.assertEquals(0, mockSelector.getModel(true).getCount()); |
} |
+ @Test |
@SmallTest |
@Feature({"TabPersistentStore"}) |
public void testPrefetchActiveTab() throws Exception { |
@@ -554,31 +600,40 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
persistencePolicy, mockSelector, mockManager, mockObserver); |
store.waitForMigrationToFinish(); |
- assertNotNull(store.mPrefetchActiveTabTask); |
+ Assert.assertNotNull(store.mPrefetchActiveTabTask); |
store.loadState(false /* ignoreIncognitoFiles */); |
- store.restoreTabs(true); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ store.restoreTabs(true); |
+ } |
+ }); |
ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
@Override |
public void run() { |
// Confirm that the pre-fetched active tab state was used, must be done here on the |
// UI thread as the message to finish the task is posted here. |
- assertEquals(AsyncTask.Status.FINISHED, store.mPrefetchActiveTabTask.getStatus()); |
+ Assert.assertEquals( |
+ AsyncTask.Status.FINISHED, store.mPrefetchActiveTabTask.getStatus()); |
// Confirm that the correct active tab ID is updated when saving state. |
mPreferences.edit().putInt(TabPersistentStore.PREF_ACTIVE_TAB_ID, -1).apply(); |
+ |
store.saveState(); |
- assertEquals(info.selectedTabId, |
- mPreferences.getInt(TabPersistentStore.PREF_ACTIVE_TAB_ID, -1)); |
} |
}); |
+ |
+ Assert.assertEquals( |
+ info.selectedTabId, mPreferences.getInt(TabPersistentStore.PREF_ACTIVE_TAB_ID, -1)); |
} |
/** |
* Tests that a real {@link TabModelImpl} will use the {@link TabPersistentStore} to write out |
* an updated metadata file when a closure is undone. |
*/ |
+ @Test |
@SmallTest |
@Feature({"TabPersistentStore"}) |
public void testUndoSingleTabClosureWritesTabListFile() throws Exception { |
@@ -606,6 +661,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
* valid a valid metadata file and the TabModel's associated TabStates after closing and |
* canceling the closure of all the tabs simultaneously. |
*/ |
+ @Test |
@SmallTest |
@Feature({"TabPersistentStore"}) |
@RetryOnFailure |
@@ -619,9 +675,9 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
// Undoing tab closures one-by-one results in the first tab always being selected after |
// the initial restoration. |
if (i == 0) { |
- assertEquals(info.selectedTabId, selector.getCurrentTab().getId()); |
+ Assert.assertEquals(info.selectedTabId, selector.getCurrentTab().getId()); |
} else { |
- assertEquals(info.contents[0].tabId, selector.getCurrentTab().getId()); |
+ Assert.assertEquals(info.contents[0].tabId, selector.getCurrentTab().getId()); |
} |
ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
@@ -638,12 +694,14 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
for (int j = 0; j < info.numRegularTabs; j++) { |
TabState currentState = TabState.restoreTabState( |
mMockDirectory.getDataDirectory(), info.contents[j].tabId); |
- assertEquals(info.contents[j].title, currentState.getDisplayTitleFromState()); |
- assertEquals(info.contents[j].url, currentState.getVirtualUrlFromState()); |
+ Assert.assertEquals( |
+ info.contents[j].title, currentState.getDisplayTitleFromState()); |
+ Assert.assertEquals(info.contents[j].url, currentState.getVirtualUrlFromState()); |
} |
} |
} |
+ @Test |
@SmallTest |
@Feature({"TabPersistentStore", "MultiWindow"}) |
@MinAndroidSdkLevel(24) |
@@ -669,30 +727,36 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
// Clear any existing TestTabModelSelector (required when |
// createAndRestoreRealTabModelImpls is called multiple times in one test). |
tabWindowManager.onActivityStateChange( |
- mFakeChromeActivity, ActivityState.DESTROYED); |
+ mChromeActivity, ActivityState.DESTROYED); |
return (TestTabModelSelector) tabWindowManager.requestSelector( |
- mFakeChromeActivity, mFakeChromeActivity, 0); |
+ mChromeActivity, mChromeActivity, 0); |
} |
}); |
- TabPersistentStore store = selector.mTabPersistentStore; |
+ final TabPersistentStore store = selector.mTabPersistentStore; |
MockTabPersistentStoreObserver mockObserver = selector.mTabPersistentStoreObserver; |
// Load up the TabModel metadata. |
int numExpectedTabs = info.numRegularTabs + info.numIncognitoTabs; |
store.loadState(false /* ignoreIncognitoFiles */); |
mockObserver.initializedCallback.waitForCallback(0, 1); |
- assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup); |
+ Assert.assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup); |
mockObserver.detailsReadCallback.waitForCallback(0, info.contents.length); |
- assertEquals(numExpectedTabs, mockObserver.details.size()); |
+ Assert.assertEquals(numExpectedTabs, mockObserver.details.size()); |
// Restore the TabStates, check that things were restored correctly, in the right tab order. |
- store.restoreTabs(true); |
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
+ @Override |
+ public void run() { |
+ store.restoreTabs(true); |
+ } |
+ }); |
mockObserver.stateLoadedCallback.waitForCallback(0, 1); |
- assertEquals(info.numRegularTabs, selector.getModel(false).getCount()); |
- assertEquals(info.numIncognitoTabs, selector.getModel(true).getCount()); |
+ Assert.assertEquals(info.numRegularTabs, selector.getModel(false).getCount()); |
+ Assert.assertEquals(info.numIncognitoTabs, selector.getModel(true).getCount()); |
for (int i = 0; i < numExpectedTabs; i++) { |
- assertEquals(info.contents[i].tabId, selector.getModel(false).getTabAt(i).getId()); |
+ Assert.assertEquals( |
+ info.contents[i].tabId, selector.getModel(false).getTabAt(i).getId()); |
} |
return selector; |
@@ -716,10 +780,10 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
}; |
regularModel.addObserver(closeObserver); |
regularModel.closeAllTabs(false, false); |
- assertEquals(info.numRegularTabs, closedTabIds.size()); |
+ Assert.assertEquals(info.numRegularTabs, closedTabIds.size()); |
// Cancel closing each tab. |
for (Integer id : closedTabIds) regularModel.cancelTabClosure(id); |
- assertEquals(info.numRegularTabs, regularModel.getCount()); |
+ Assert.assertEquals(info.numRegularTabs, regularModel.getCount()); |
} |
} |