Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5026)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1708433002: Move BookmarksBridge into package with other bookmarks classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased 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/javatests/src/org/chromium/chrome/browser/bookmark/BookmarksBridgeTest.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') | Show Comments 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/bookmark/BookmarksBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java
similarity index 64%
rename from chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/BookmarksBridgeTest.java
rename to chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java
index c209c635440c7e43219866e4600af4f8866cd475..0907a5cf9ea0d5b1edde406adb6859dd0b189139 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/BookmarksBridgeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java
@@ -2,14 +2,14 @@
// 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.bookmark;
+package org.chromium.chrome.browser.bookmarks;
import android.test.UiThreadTest;
import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.browser.bookmark.BookmarksBridge.BookmarkItem;
+import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.components.bookmarks.BookmarkId;
import org.chromium.content.browser.test.NativeLibraryTestBase;
@@ -24,9 +24,9 @@ import java.util.List;
/**
* Tests for bookmark bridge
*/
-public class BookmarksBridgeTest extends NativeLibraryTestBase {
+public class BookmarkBridgeTest extends NativeLibraryTestBase {
- private BookmarksBridge mBookmarksBridge;
+ private BookmarkBridge mBookmarkBridge;
private BookmarkId mMobileNode;
private BookmarkId mOtherNode;
private BookmarkId mDesktopNode;
@@ -39,24 +39,24 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
@Override
public void run() {
Profile profile = Profile.getLastUsedProfile();
- mBookmarksBridge = new BookmarksBridge(profile);
- mBookmarksBridge.loadEmptyPartnerBookmarkShimForTesting();
+ mBookmarkBridge = new BookmarkBridge(profile);
+ mBookmarkBridge.loadEmptyPartnerBookmarkShimForTesting();
}
});
CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
- return mBookmarksBridge.isBookmarkModelLoaded();
+ return mBookmarkBridge.isBookmarkModelLoaded();
}
});
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
- mMobileNode = mBookmarksBridge.getMobileFolderId();
- mDesktopNode = mBookmarksBridge.getDesktopFolderId();
- mOtherNode = mBookmarksBridge.getOtherFolderId();
+ mMobileNode = mBookmarkBridge.getMobileFolderId();
+ mDesktopNode = mBookmarkBridge.getDesktopFolderId();
+ mOtherNode = mBookmarkBridge.getOtherFolderId();
}
});
}
@@ -65,28 +65,28 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
@SmallTest
@Feature({"Bookmark"})
public void testAddBookmarksAndFolders() {
- BookmarkId bookmarkA = mBookmarksBridge.addBookmark(mDesktopNode, 0, "a", "http://a.com");
+ BookmarkId bookmarkA = mBookmarkBridge.addBookmark(mDesktopNode, 0, "a", "http://a.com");
verifyBookmark(bookmarkA, "a", "http://a.com/", false, mDesktopNode);
- BookmarkId bookmarkB = mBookmarksBridge.addBookmark(mOtherNode, 0, "b", "http://b.com");
+ BookmarkId bookmarkB = mBookmarkBridge.addBookmark(mOtherNode, 0, "b", "http://b.com");
verifyBookmark(bookmarkB, "b", "http://b.com/", false, mOtherNode);
- BookmarkId bookmarkC = mBookmarksBridge.addBookmark(mMobileNode, 0, "c", "http://c.com");
+ BookmarkId bookmarkC = mBookmarkBridge.addBookmark(mMobileNode, 0, "c", "http://c.com");
verifyBookmark(bookmarkC, "c", "http://c.com/", false, mMobileNode);
- BookmarkId folderA = mBookmarksBridge.addFolder(mOtherNode, 0, "fa");
+ BookmarkId folderA = mBookmarkBridge.addFolder(mOtherNode, 0, "fa");
verifyBookmark(folderA, "fa", null, true, mOtherNode);
- BookmarkId folderB = mBookmarksBridge.addFolder(mDesktopNode, 0, "fb");
+ BookmarkId folderB = mBookmarkBridge.addFolder(mDesktopNode, 0, "fb");
verifyBookmark(folderB, "fb", null, true, mDesktopNode);
- BookmarkId folderC = mBookmarksBridge.addFolder(mMobileNode, 0, "fc");
+ BookmarkId folderC = mBookmarkBridge.addFolder(mMobileNode, 0, "fc");
verifyBookmark(folderC, "fc", null, true, mMobileNode);
- BookmarkId bookmarkAA = mBookmarksBridge.addBookmark(folderA, 0, "aa", "http://aa.com");
+ BookmarkId bookmarkAA = mBookmarkBridge.addBookmark(folderA, 0, "aa", "http://aa.com");
verifyBookmark(bookmarkAA, "aa", "http://aa.com/", false, folderA);
- BookmarkId folderAA = mBookmarksBridge.addFolder(folderA, 0, "faa");
+ BookmarkId folderAA = mBookmarkBridge.addFolder(folderA, 0, "faa");
verifyBookmark(folderAA, "faa", null, true, folderA);
}
private void verifyBookmark(BookmarkId idToVerify, String expectedTitle,
String expectedUrl, boolean isFolder, BookmarkId expectedParent) {
assertNotNull(idToVerify);
- BookmarkItem item = mBookmarksBridge.getBookmarkById(idToVerify);
+ BookmarkItem item = mBookmarkBridge.getBookmarkById(idToVerify);
assertEquals(expectedTitle, item.getTitle());
assertEquals(item.isFolder(), isFolder);
if (!isFolder) assertEquals(expectedUrl, item.getUrl());
@@ -97,18 +97,18 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
@SmallTest
@Feature({"Bookmark"})
public void testGetAllFoldersWithDepths() {
- BookmarkId folderA = mBookmarksBridge.addFolder(mMobileNode, 0, "a");
- BookmarkId folderB = mBookmarksBridge.addFolder(mDesktopNode, 0, "b");
- BookmarkId folderC = mBookmarksBridge.addFolder(mOtherNode, 0, "c");
- BookmarkId folderAA = mBookmarksBridge.addFolder(folderA, 0, "aa");
- BookmarkId folderBA = mBookmarksBridge.addFolder(folderB, 0, "ba");
- BookmarkId folderAAA = mBookmarksBridge.addFolder(folderAA, 0, "aaa");
- BookmarkId folderAAAA = mBookmarksBridge.addFolder(folderAAA, 0, "aaaa");
-
- mBookmarksBridge.addBookmark(mMobileNode, 0, "ua", "http://www.google.com");
- mBookmarksBridge.addBookmark(mDesktopNode, 0, "ua", "http://www.google.com");
- mBookmarksBridge.addBookmark(mOtherNode, 0, "ua", "http://www.google.com");
- mBookmarksBridge.addBookmark(folderA, 0, "ua", "http://www.medium.com");
+ 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>();
@@ -125,7 +125,7 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
List<BookmarkId> folderList = new ArrayList<BookmarkId>();
List<Integer> depthList = new ArrayList<Integer>();
- mBookmarksBridge.getAllFoldersWithDepths(folderList, depthList);
+ mBookmarkBridge.getAllFoldersWithDepths(folderList, depthList);
verifyFolderDepths(folderList, depthList, idToDepth);
}
@@ -133,17 +133,17 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
@SmallTest
@Feature({"Bookmark"})
public void testGetMoveDestinations() {
- BookmarkId folderA = mBookmarksBridge.addFolder(mMobileNode, 0, "a");
- BookmarkId folderB = mBookmarksBridge.addFolder(mDesktopNode, 0, "b");
- BookmarkId folderC = mBookmarksBridge.addFolder(mOtherNode, 0, "c");
- BookmarkId folderAA = mBookmarksBridge.addFolder(folderA, 0, "aa");
- BookmarkId folderBA = mBookmarksBridge.addFolder(folderB, 0, "ba");
- BookmarkId folderAAA = mBookmarksBridge.addFolder(folderAA, 0, "aaa");
-
- mBookmarksBridge.addBookmark(mMobileNode, 0, "ua", "http://www.google.com");
- mBookmarksBridge.addBookmark(mDesktopNode, 0, "ua", "http://www.google.com");
- mBookmarksBridge.addBookmark(mOtherNode, 0, "ua", "http://www.google.com");
- mBookmarksBridge.addBookmark(folderA, 0, "ua", "http://www.medium.com");
+ 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");
+
+ 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>();
@@ -151,7 +151,7 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
List<BookmarkId> folderList = new ArrayList<BookmarkId>();
List<Integer> depthList = new ArrayList<Integer>();
- mBookmarksBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderA));
+ mBookmarkBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderA));
idToDepth.put(mMobileNode, 0);
idToDepth.put(mDesktopNode, 0);
idToDepth.put(folderB, 1);
@@ -160,7 +160,7 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
idToDepth.put(folderC, 1);
verifyFolderDepths(folderList, depthList, idToDepth);
- mBookmarksBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderB));
+ mBookmarkBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderB));
idToDepth.put(mMobileNode, 0);
idToDepth.put(folderA, 1);
idToDepth.put(folderAA, 2);
@@ -170,7 +170,7 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
idToDepth.put(folderC, 1);
verifyFolderDepths(folderList, depthList, idToDepth);
- mBookmarksBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderC));
+ mBookmarkBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderC));
idToDepth.put(mMobileNode, 0);
idToDepth.put(folderA, 1);
idToDepth.put(folderAA, 2);
@@ -181,7 +181,7 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
idToDepth.put(mOtherNode, 0);
verifyFolderDepths(folderList, depthList, idToDepth);
- mBookmarksBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderBA));
+ mBookmarkBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderBA));
idToDepth.put(mMobileNode, 0);
idToDepth.put(folderA, 1);
idToDepth.put(folderAA, 2);
@@ -192,7 +192,7 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
idToDepth.put(folderC, 1);
verifyFolderDepths(folderList, depthList, idToDepth);
- mBookmarksBridge.getMoveDestinations(folderList, depthList,
+ mBookmarkBridge.getMoveDestinations(folderList, depthList,
Arrays.asList(folderAA, folderC));
idToDepth.put(mMobileNode, 0);
idToDepth.put(folderA, 1);
@@ -213,7 +213,7 @@ public class BookmarksBridgeTest extends NativeLibraryTestBase {
assertNotNull(folder);
assertNotNull(depthList.get(i));
assertTrue("Folder list contains non-folder elements: ",
- mBookmarksBridge.getBookmarkById(folder).isFolder());
+ mBookmarkBridge.getBookmarkById(folder).isFolder());
assertTrue("Returned list contained unexpected key: ", idToDepth.containsKey(folder));
assertEquals(idToDepth.get(folder), depth);
idToDepth.remove(folder);
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/BookmarksBridgeTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698