chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.java - Issue 1688033002: Rename EnhancedBookmarks to Bookmarks, part 1.

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

Issue 1688033002: Rename EnhancedBookmarks to Bookmarks, part 1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comments from #2 Created 4 years, 10 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

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.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/BookmarkModelTest.java

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

similarity index 73%

rename from chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java

rename to chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.java

index 136a4ed20b4b457bb10007374c5f12bd7e8e5590..27cac796d1ed53ba36fd2c0d273490835e931242 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarksModelTest.java

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

@@ -2,7 +2,7 @@

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

+package org.chromium.chrome.browser.bookmarks;

import android.test.UiThreadTest;

import android.test.suitebuilder.annotation.SmallTest;

@@ -13,7 +13,7 @@ import org.chromium.base.test.util.CommandLineFlags;

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

import org.chromium.chrome.browser.ChromeSwitches;

import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkItem;

-import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarksModel.AddBookmarkCallback;

+import org.chromium.chrome.browser.bookmarks.BookmarkModel.AddBookmarkCallback;

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

import org.chromium.components.bookmarks.BookmarkId;

import org.chromium.content.browser.test.NativeLibraryTestBase;

@@ -30,11 +30,11 @@ import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicReference;

/**

- * Tests for {@link EnhancedBookmarksModel}, the data layer of Enhanced Bookmarks.

+ * Tests for {@link BookmarkModel}, the data layer of Enhanced Bookmarks.

-public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

+public class BookmarkModelTest extends NativeLibraryTestBase {

private static final int TIMEOUT_MS = 5000;

- private EnhancedBookmarksModel mBookmarksModel;

+ private BookmarkModel mBookmarkModel;

private BookmarkId mMobileNode;

private BookmarkId mOtherNode;

private BookmarkId mDesktopNode;

@@ -48,24 +48,24 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

@Override

public void run() {

Profile profile = Profile.getLastUsedProfile();

- mBookmarksModel = new EnhancedBookmarksModel(profile);

- mBookmarksModel.loadEmptyPartnerBookmarkShimForTesting();

+ mBookmarkModel = new BookmarkModel(profile);

+ mBookmarkModel.loadEmptyPartnerBookmarkShimForTesting();

}

});

CriteriaHelper.pollForUIThreadCriteria(new Criteria() {

@Override

public boolean isSatisfied() {

- return mBookmarksModel.isBookmarkModelLoaded();

+ return mBookmarkModel.isBookmarkModelLoaded();

}

});

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- mMobileNode = mBookmarksModel.getMobileFolderId();

- mDesktopNode = mBookmarksModel.getDesktopFolderId();

- mOtherNode = mBookmarksModel.getOtherFolderId();

+ mMobileNode = mBookmarkModel.getMobileFolderId();

+ mDesktopNode = mBookmarkModel.getDesktopFolderId();

+ mOtherNode = mBookmarkModel.getOtherFolderId();

}

});

}

@@ -74,8 +74,8 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

@SmallTest

@Feature({"Bookmark"})

public void testGetAllBookmarkIDsOrderedByCreationDate() throws InterruptedException {

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

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

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

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

Stack<BookmarkId> stack = new Stack<BookmarkId>();

stack.push(addBookmark(folderA, 0, "a", "http://www.medium.com"));

@@ -94,7 +94,7 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

Thread.sleep(20);

stack.push(addBookmark(folderB, 0, "g", "http://kkimlabs.com"));

- List<BookmarkId> bookmarks = mBookmarksModel.getAllBookmarkIDsOrderedByCreationDate();

+ List<BookmarkId> bookmarks = mBookmarkModel.getAllBookmarkIDsOrderedByCreationDate();

assertEquals(stack.size(), bookmarks.size());

for (BookmarkId returnedBookmark : bookmarks) {

assertEquals(stack.pop(), returnedBookmark);

@@ -105,30 +105,30 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

@SmallTest

@Feature({"Bookmark"})

public void testBookmarkPropertySetters() {

- BookmarkId folderA = mBookmarksModel.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");

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

- assertEquals("hauri", mBookmarksModel.getBookmarkTitle(folderA));

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

}

@@ -141,12 +141,12 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

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 = mBookmarksModel.addFolder(mOtherNode, 0, "fa");

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

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

+ 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 = mBookmarksModel.addFolder(folderA, 0, "faa");

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

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

movedBookmarks.add(bookmarkA);

@@ -155,10 +155,10 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

movedBookmarks.add(folderC);

movedBookmarks.add(folderB);

movedBookmarks.add(bookmarkAA);

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

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

// Order of the moved bookmarks is not tested.

- verifyBookmarkListNoOrder(mBookmarksModel.getChildIDs(folderAA, true, true),

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

movedBookmarks);

}

@@ -166,22 +166,22 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

@SmallTest

@Feature({"Bookmark"})

public void testGetChildIDs() {

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

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

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

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

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

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

// urls only

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

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

expectedChildren);

// folders only

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

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

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

// folders and urls

expectedChildren.add(folderAA);

- verifyBookmarkListNoOrder(mBookmarksModel.getChildIDs(folderA, true, true),

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

expectedChildren);

}

@@ -199,19 +199,19 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

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

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

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

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

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

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

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

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

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

+ 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 folderAA = mBookmarksModel.addFolder(folderA, 0, "faa");

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

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

}

@@ -220,8 +220,8 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

@CommandLineFlags.Add({ChromeSwitches.ENABLE_OFFLINE_PAGES})

@Feature({"Bookmark"})

public void testOfflineBridgeLoaded() {

- assertTrue(mBookmarksModel.getOfflinePageBridge() != null);

- assertTrue(mBookmarksModel.getOfflinePageBridge().isOfflinePageModelLoaded());

+ assertTrue(mBookmarkModel.getOfflinePageBridge() != null);

+ assertTrue(mBookmarkModel.getOfflinePageBridge().isOfflinePageModelLoaded());

}

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

@@ -231,7 +231,7 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- mBookmarksModel.addBookmarkAsync(

+ mBookmarkModel.addBookmarkAsync(

parent, index, title, url, null, new AddBookmarkCallback() {

@Override

public void onBookmarkAdded(

@@ -256,7 +256,7 @@ public class EnhancedBookmarksModelTest extends NativeLibraryTestBase {

private void verifyBookmark(BookmarkId idToVerify, String expectedTitle,

String expectedUrl, boolean isFolder, BookmarkId expectedParent) {

assertNotNull(idToVerify);

- BookmarkItem item = mBookmarksModel.getBookmarkById(idToVerify);

+ BookmarkItem item = mBookmarkModel.getBookmarkById(idToVerify);

assertEquals(expectedTitle, item.getTitle());

assertEquals(isFolder, item.isFolder());

if (!isFolder) assertEquals(expectedUrl, item.getUrl());