chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java - Issue 2954393003: Fix test crashes related to AccountManagerHelper.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java

Issue 2954393003: Fix test crashes related to AccountManagerHelper. (Closed)

Patch Set: . 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

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java

index 2dfcab8023c1dafa7e83559517bfcfdaea68718c..04900696a0d5dd293dfa80c3e7d599a0ebe465f1 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java

@@ -4,6 +4,7 @@

package org.chromium.chrome.browser.bookmarks;

+import android.support.test.annotation.UiThreadTest;

import android.support.test.filters.SmallTest;

import android.support.test.rule.UiThreadTestRule;

@@ -11,6 +12,7 @@ import org.junit.Assert;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

+import org.junit.rules.RuleChain;

import org.junit.runner.RunWith;

import org.chromium.base.ThreadUtils;

@@ -18,9 +20,9 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;

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

import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;

import org.chromium.chrome.browser.profiles.Profile;

+import org.chromium.chrome.browser.test.ChromeBrowserTestRule;

import org.chromium.chrome.test.util.BookmarkTestUtil;

import org.chromium.components.bookmarks.BookmarkId;

-import org.chromium.content.browser.test.NativeLibraryTestRule;

import java.util.ArrayList;

import java.util.Arrays;

@@ -33,10 +35,8 @@ import java.util.List;

@RunWith(BaseJUnit4ClassRunner.class)

public class BookmarkBridgeTest {

@Rule

- public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();

- @Rule

- public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule();

+ public final RuleChain mChain =

+ RuleChain.outerRule(new ChromeBrowserTestRule()).around(new UiThreadTestRule());

private BookmarkBridge mBookmarkBridge;

private BookmarkId mMobileNode;

@@ -45,8 +45,6 @@ public class BookmarkBridgeTest {

@Before

public void setUp() throws Exception {

- mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

@@ -69,33 +67,25 @@ public class BookmarkBridgeTest {

@Test

@SmallTest

+ @UiThreadTest

@Feature({"Bookmark"})

public void testAddBookmarksAndFolders() throws Throwable {

- mUiThreadTestRule.runOnUiThread(new Runnable() {

- @Override

- public void run() {

- BookmarkId bookmarkA =

- mBookmarkBridge.addBookmark(mDesktopNode, 0, "a", "http://a.com");

- verifyBookmark(bookmarkA, "a", "http://a.com/", false, mDesktopNode);

- BookmarkId bookmarkB =

- mBookmarkBridge.addBookmark(mOtherNode, 0, "b", "http://b.com");

- verifyBookmark(bookmarkB, "b", "http://b.com/", false, mOtherNode);

- BookmarkId bookmarkC =

- mBookmarkBridge.addBookmark(mMobileNode, 0, "c", "http://c.com");

- verifyBookmark(bookmarkC, "c", "http://c.com/", false, mMobileNode);

- BookmarkId folderA = mBookmarkBridge.addFolder(mOtherNode, 0, "fa");

- verifyBookmark(folderA, "fa", null, true, mOtherNode);

- BookmarkId folderB = mBookmarkBridge.addFolder(mDesktopNode, 0, "fb");

- verifyBookmark(folderB, "fb", null, true, mDesktopNode);

- BookmarkId folderC = mBookmarkBridge.addFolder(mMobileNode, 0, "fc");

- verifyBookmark(folderC, "fc", null, true, mMobileNode);

- BookmarkId bookmarkAA =

- mBookmarkBridge.addBookmark(folderA, 0, "aa", "http://aa.com");

- verifyBookmark(bookmarkAA, "aa", "http://aa.com/", false, folderA);

- BookmarkId folderAA = mBookmarkBridge.addFolder(folderA, 0, "faa");

- verifyBookmark(folderAA, "faa", null, true, folderA);

- }

- });

+ BookmarkId bookmarkA = mBookmarkBridge.addBookmark(mDesktopNode, 0, "a", "http://a.com");

+ verifyBookmark(bookmarkA, "a", "http://a.com/", false, mDesktopNode);

+ BookmarkId bookmarkB = mBookmarkBridge.addBookmark(mOtherNode, 0, "b", "http://b.com");

+ verifyBookmark(bookmarkB, "b", "http://b.com/", false, mOtherNode);

+ BookmarkId bookmarkC = mBookmarkBridge.addBookmark(mMobileNode, 0, "c", "http://c.com");

+ verifyBookmark(bookmarkC, "c", "http://c.com/", false, mMobileNode);

+ BookmarkId folderA = mBookmarkBridge.addFolder(mOtherNode, 0, "fa");

+ verifyBookmark(folderA, "fa", null, true, mOtherNode);

+ BookmarkId folderB = mBookmarkBridge.addFolder(mDesktopNode, 0, "fb");

+ verifyBookmark(folderB, "fb", null, true, mDesktopNode);

+ BookmarkId folderC = mBookmarkBridge.addFolder(mMobileNode, 0, "fc");

+ verifyBookmark(folderC, "fc", null, true, mMobileNode);

+ BookmarkId bookmarkAA = mBookmarkBridge.addBookmark(folderA, 0, "aa", "http://aa.com");

+ verifyBookmark(bookmarkAA, "aa", "http://aa.com/", false, folderA);

+ BookmarkId folderAA = mBookmarkBridge.addFolder(folderA, 0, "faa");

+ verifyBookmark(folderAA, "faa", null, true, folderA);

}

private void verifyBookmark(BookmarkId idToVerify, String expectedTitle,

@@ -110,122 +100,114 @@ public class BookmarkBridgeTest {

@Test

@SmallTest

+ @UiThreadTest

@Feature({"Bookmark"})

public void testGetAllFoldersWithDepths() throws Throwable {

- mUiThreadTestRule.runOnUiThread(new Runnable() {

- @Override

- public void run() {

- BookmarkId folderA = mBookmarkBridge.addFolder(mMobileNode, 0, "a");

- BookmarkId folderB = mBookmarkBridge.addFolder(mDesktopNode, 0, "b");

- BookmarkId folderC = mBookmarkBridge.addFolder(mOtherNode, 0, "c");

- BookmarkId folderAA = mBookmarkBridge.addFolder(folderA, 0, "aa");

- BookmarkId folderBA = mBookmarkBridge.addFolder(folderB, 0, "ba");

- BookmarkId folderAAA = mBookmarkBridge.addFolder(folderAA, 0, "aaa");

- BookmarkId folderAAAA = mBookmarkBridge.addFolder(folderAAA, 0, "aaaa");

- mBookmarkBridge.addBookmark(mMobileNode, 0, "ua", "http://www.google.com");

- mBookmarkBridge.addBookmark(mDesktopNode, 0, "ua", "http://www.google.com");

- mBookmarkBridge.addBookmark(mOtherNode, 0, "ua", "http://www.google.com");

- mBookmarkBridge.addBookmark(folderA, 0, "ua", "http://www.medium.com");

- // Map folders to depths as expected results

- HashMap<BookmarkId, Integer> idToDepth = new HashMap<BookmarkId, Integer>();

- idToDepth.put(mMobileNode, 0);

- idToDepth.put(folderA, 1);

- idToDepth.put(folderAA, 2);

- idToDepth.put(folderAAA, 3);

- idToDepth.put(folderAAAA, 4);

- idToDepth.put(mDesktopNode, 0);

- idToDepth.put(folderB, 1);

- idToDepth.put(folderBA, 2);

- idToDepth.put(mOtherNode, 0);

- idToDepth.put(folderC, 1);

- List<BookmarkId> folderList = new ArrayList<BookmarkId>();

- List<Integer> depthList = new ArrayList<Integer>();

- mBookmarkBridge.getAllFoldersWithDepths(folderList, depthList);

- verifyFolderDepths(folderList, depthList, idToDepth);

- }

- });

+ BookmarkId folderA = mBookmarkBridge.addFolder(mMobileNode, 0, "a");

+ BookmarkId folderB = mBookmarkBridge.addFolder(mDesktopNode, 0, "b");

+ BookmarkId folderC = mBookmarkBridge.addFolder(mOtherNode, 0, "c");

+ BookmarkId folderAA = mBookmarkBridge.addFolder(folderA, 0, "aa");

+ BookmarkId folderBA = mBookmarkBridge.addFolder(folderB, 0, "ba");

+ BookmarkId folderAAA = mBookmarkBridge.addFolder(folderAA, 0, "aaa");

+ BookmarkId folderAAAA = mBookmarkBridge.addFolder(folderAAA, 0, "aaaa");

+ mBookmarkBridge.addBookmark(mMobileNode, 0, "ua", "http://www.google.com");

+ mBookmarkBridge.addBookmark(mDesktopNode, 0, "ua", "http://www.google.com");

+ mBookmarkBridge.addBookmark(mOtherNode, 0, "ua", "http://www.google.com");

+ mBookmarkBridge.addBookmark(folderA, 0, "ua", "http://www.medium.com");

+ // Map folders to depths as expected results

+ HashMap<BookmarkId, Integer> idToDepth = new HashMap<BookmarkId, Integer>();

+ idToDepth.put(mMobileNode, 0);

+ idToDepth.put(folderA, 1);

+ idToDepth.put(folderAA, 2);

+ idToDepth.put(folderAAA, 3);

+ idToDepth.put(folderAAAA, 4);

+ idToDepth.put(mDesktopNode, 0);

+ idToDepth.put(folderB, 1);

+ idToDepth.put(folderBA, 2);

+ idToDepth.put(mOtherNode, 0);

+ idToDepth.put(folderC, 1);

+ List<BookmarkId> folderList = new ArrayList<BookmarkId>();

+ List<Integer> depthList = new ArrayList<Integer>();

+ mBookmarkBridge.getAllFoldersWithDepths(folderList, depthList);

+ verifyFolderDepths(folderList, depthList, idToDepth);

}

@Test

@SmallTest

+ @UiThreadTest

@Feature({"Bookmark"})

public void testGetMoveDestinations() throws Throwable {