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

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

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

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

« chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/dom_distiller/DistilledPagePrefsTest.java » ('j') | chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheLauncherTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8fc4295ea93b50647ad5aa8a2581236361115af4..02a9bc75906feda81e904faf93d8a2a4ae659b26 100644

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

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.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,17 +12,17 @@ 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;

-import org.chromium.base.annotations.SuppressFBWarnings;

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;

@@ -36,11 +37,11 @@ import java.util.concurrent.atomic.AtomicReference;

@RunWith(BaseJUnit4ClassRunner.class)

public class BookmarkModelTest {

- @Rule

- public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();

+ private final ChromeBrowserTestRule mBrowserTestRule = new ChromeBrowserTestRule();

@Rule

- public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule();

+ public final RuleChain mChain =

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

Ted C 2017/06/29 20:20:55 same comment as before...I would be consistent wit

troyhildebrandt 2017/06/29 20:43:47 Done.

private static final int TIMEOUT_MS = 5000;

private BookmarkModel mBookmarkModel;

@@ -50,8 +51,6 @@ public class BookmarkModelTest {

@Before

public void setUp() throws Exception {

- mActivityTestRule.loadNativeLibraryAndInitBrowserProcess();

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

@@ -74,135 +73,116 @@ public class BookmarkModelTest {

@Test

@SmallTest

+ @UiThreadTest

@Feature({"Bookmark"})

public void testBookmarkPropertySetters() throws Throwable {

- mUiThreadTestRule.runOnUiThread(new Runnable() {

- @Override

- public void run() {

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

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

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

- BookmarkId bookmarkB = addBookmark(mMobileNode, 0, "a", "http://a.com");

- BookmarkId bookmarkC = addBookmark(mOtherNode, 0, "a", "http://a.com");

- BookmarkId bookmarkD = addBookmark(folderA, 0, "a", "http://a.com");

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

+ BookmarkId bookmarkB = addBookmark(mMobileNode, 0, "a", "http://a.com");

+ BookmarkId bookmarkC = addBookmark(mOtherNode, 0, "a", "http://a.com");

+ BookmarkId bookmarkD = addBookmark(folderA, 0, "a", "http://a.com");

- mBookmarkModel.setBookmarkTitle(folderA, "hauri");

- Assert.assertEquals("hauri", mBookmarkModel.getBookmarkTitle(folderA));

+ mBookmarkModel.setBookmarkTitle(folderA, "hauri");

+ Assert.assertEquals("hauri", mBookmarkModel.getBookmarkTitle(folderA));

- mBookmarkModel.setBookmarkTitle(bookmarkA, "auri");

- mBookmarkModel.setBookmarkUrl(bookmarkA, "http://auri.org/");

- verifyBookmark(bookmarkA, "auri", "http://auri.org/", false, mDesktopNode);

+ mBookmarkModel.setBookmarkTitle(bookmarkA, "auri");

+ mBookmarkModel.setBookmarkUrl(bookmarkA, "http://auri.org/");

+ verifyBookmark(bookmarkA, "auri", "http://auri.org/", false, mDesktopNode);

- mBookmarkModel.setBookmarkTitle(bookmarkB, "lauri");

- mBookmarkModel.setBookmarkUrl(bookmarkB, "http://lauri.org/");

- verifyBookmark(bookmarkB, "lauri", "http://lauri.org/", false, mMobileNode);

+ mBookmarkModel.setBookmarkTitle(bookmarkB, "lauri");

+ mBookmarkModel.setBookmarkUrl(bookmarkB, "http://lauri.org/");

+ verifyBookmark(bookmarkB, "lauri", "http://lauri.org/", false, mMobileNode);

- mBookmarkModel.setBookmarkTitle(bookmarkC, "mauri");

- mBookmarkModel.setBookmarkUrl(bookmarkC, "http://mauri.org/");

- verifyBookmark(bookmarkC, "mauri", "http://mauri.org/", false, mOtherNode);

+ mBookmarkModel.setBookmarkTitle(bookmarkC, "mauri");

+ mBookmarkModel.setBookmarkUrl(bookmarkC, "http://mauri.org/");

+ verifyBookmark(bookmarkC, "mauri", "http://mauri.org/", false, mOtherNode);

- mBookmarkModel.setBookmarkTitle(bookmarkD, "kauri");

- mBookmarkModel.setBookmarkUrl(bookmarkD, "http://kauri.org/");

- verifyBookmark(bookmarkD, "kauri", "http://kauri.org/", false, folderA);

- }

- });

+ mBookmarkModel.setBookmarkTitle(bookmarkD, "kauri");

+ mBookmarkModel.setBookmarkUrl(bookmarkD, "http://kauri.org/");

+ verifyBookmark(bookmarkD, "kauri", "http://kauri.org/", false, folderA);

}

@Test

@SmallTest

+ @UiThreadTest

@Feature({"Bookmark"})

public void testMoveBookmarks() throws Throwable {

- mUiThreadTestRule.runOnUiThread(new Runnable() {

- @Override

- @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE")

- public void run() {

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

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

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

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

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

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

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

- BookmarkId bookmarkCA = addBookmark(folderC, 0, "ca", "http://ca.com");

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

- HashSet<BookmarkId> movedBookmarks = new HashSet<BookmarkId>(6);

- movedBookmarks.add(bookmarkA);

- movedBookmarks.add(bookmarkB);

- movedBookmarks.add(bookmarkC);

- movedBookmarks.add(folderC);

- movedBookmarks.add(folderB);

- movedBookmarks.add(bookmarkAA);

- mBookmarkModel.moveBookmarks(new ArrayList<BookmarkId>(movedBookmarks), folderAA);

- // Order of the moved bookmarks is not tested.

- verifyBookmarkListNoOrder(

- mBookmarkModel.getChildIDs(folderAA, true, true), movedBookmarks);

- }

- });

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

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

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

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

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

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

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

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

+ HashSet<BookmarkId> movedBookmarks = new HashSet<BookmarkId>(6);

+ movedBookmarks.add(bookmarkA);

+ movedBookmarks.add(bookmarkB);

+ movedBookmarks.add(bookmarkC);

+ movedBookmarks.add(folderC);

+ movedBookmarks.add(folderB);

+ movedBookmarks.add(bookmarkAA);

+ mBookmarkModel.moveBookmarks(new ArrayList<BookmarkId>(movedBookmarks), folderAA);

+ // Order of the moved bookmarks is not tested.

+ verifyBookmarkListNoOrder(mBookmarkModel.getChildIDs(folderAA, true, true), movedBookmarks);

}

@Test

@SmallTest

+ @UiThreadTest

@Feature({"Bookmark"})

public void testGetChildIDs() throws Throwable {

- mUiThreadTestRule.runOnUiThread(new Runnable() {

- @Override

- public void run() {

- BookmarkId folderA = mBookmarkModel.addFolder(mMobileNode, 0, "fa");

- HashSet<BookmarkId> expectedChildren = new HashSet<>();

- expectedChildren.add(addBookmark(folderA, 0, "a", "http://a.com"));

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

- // urls only

- verifyBookmarkListNoOrder(

- mBookmarkModel.getChildIDs(folderA, false, true), expectedChildren);

- // folders only

- verifyBookmarkListNoOrder(mBookmarkModel.getChildIDs(folderA, true, false),

- new HashSet<BookmarkId>(Arrays.asList(folderAA)));

- // folders and urls

- expectedChildren.add(folderAA);

- verifyBookmarkListNoOrder(

- mBookmarkModel.getChildIDs(folderA, true, true), expectedChildren);

- }

- });

+ BookmarkId folderA = mBookmarkModel.addFolder(mMobileNode, 0, "fa");

+ HashSet<BookmarkId> expectedChildren = new HashSet<>();

+ expectedChildren.add(addBookmark(folderA, 0, "a", "http://a.com"));

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

+ // urls only

+ verifyBookmarkListNoOrder(

+ mBookmarkModel.getChildIDs(folderA, false, true), expectedChildren);

+ // folders only

+ verifyBookmarkListNoOrder(mBookmarkModel.getChildIDs(folderA, true, false),

+ new HashSet<BookmarkId>(Arrays.asList(folderAA)));

+ // folders and urls

+ expectedChildren.add(folderAA);

+ verifyBookmarkListNoOrder(

+ mBookmarkModel.getChildIDs(folderA, true, true), expectedChildren);

}

// Moved from BookmarkBridgeTest

@Test

@SmallTest

+ @UiThreadTest

@Feature({"Bookmark"})

public void testAddBookmarksAndFolders() throws Throwable {

- mUiThreadTestRule.runOnUiThread(new Runnable() {

- @Override

- public void run() {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

- }

- });

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

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

}

private BookmarkId addBookmark(final BookmarkId parent, final int index, final String title,