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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 929523002: Add tests to EnhancedBookmarksModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/enhanced_bookmarks/EnhancedBookmarksModel.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/enhanced_bookmarks/EnhancedBookmarksModelTest.java » ('j') | chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java
deleted file mode 100644
index 90e3a9f871f69fdf52c783c2e06ea4a96c341f46..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// 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;
-
-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.BookmarksBridge.BookmarkItem;
-import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.shell.ChromeShellActivity;
-import org.chromium.chrome.shell.ChromeShellTab;
-import org.chromium.chrome.shell.ChromeShellTestBase;
-import org.chromium.components.bookmarks.BookmarkId;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Tests for bookmark bridge
- */
-public class BookmarksBridgeTest extends ChromeShellTestBase {
-
- private ChromeShellActivity mActivity;
- private Profile mProfile;
- private BookmarksBridge mBookmarksBridge;
- private BookmarkId mMobileNode;
- private BookmarkId mOtherNode;
- private BookmarkId mDesktopNode;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mActivity = launchChromeShellWithBlankPage();
- assertTrue(waitForActiveShellToBeDoneLoading());
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- ChromeShellTab tab = mActivity.getActiveTab();
- mProfile = tab.getProfile();
- mBookmarksBridge = new BookmarksBridge(mProfile);
- mBookmarksBridge.loadEmptyPartnerBookmarkShimForTesting();
- mMobileNode = mBookmarksBridge.getMobileFolderId();
- mDesktopNode = mBookmarksBridge.getDesktopFolderId();
- mOtherNode = mBookmarksBridge.getOtherFolderId();
- }
- });
- }
-
- @UiThreadTest
- @SmallTest
- @Feature({"Bookmark"})
- public void testAddBookmarksAndFolders() {
- BookmarkId bookmarkA = mBookmarksBridge.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");
- verifyBookmark(bookmarkB, "b", "http://b.com/", false, mOtherNode);
- BookmarkId bookmarkC = mBookmarksBridge.addBookmark(mMobileNode, 0, "c", "http://c.com");
- verifyBookmark(bookmarkC, "c", "http://c.com/", false, mMobileNode);
- BookmarkId folderA = mBookmarksBridge.addFolder(mOtherNode, 0, "fa");
- verifyBookmark(folderA, "fa", null, true, mOtherNode);
- BookmarkId folderB = mBookmarksBridge.addFolder(mDesktopNode, 0, "fb");
- verifyBookmark(folderB, "fb", null, true, mDesktopNode);
- BookmarkId folderC = mBookmarksBridge.addFolder(mMobileNode, 0, "fc");
- verifyBookmark(folderC, "fc", null, true, mMobileNode);
- BookmarkId bookmarkAA = mBookmarksBridge.addBookmark(folderA, 0, "aa", "http://aa.com");
- verifyBookmark(bookmarkAA, "aa", "http://aa.com/", false, folderA);
- BookmarkId folderAA = mBookmarksBridge.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);
- assertEquals(expectedTitle, item.getTitle());
- assertEquals(item.isFolder(), isFolder);
- if (!isFolder) assertEquals(expectedUrl, item.getUrl());
- assertEquals(item.getParentId(), expectedParent);
- }
-
- @UiThreadTest
- @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");
-
- // 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>();
- mBookmarksBridge.getAllFoldersWithDepths(folderList, depthList);
- verifyFolderDepths(folderList, depthList, idToDepth);
- }
-
- @UiThreadTest
- @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");
-
- // Map folders to depths as expected results
- HashMap<BookmarkId, Integer> idToDepth = new HashMap<BookmarkId, Integer>();
-
- List<BookmarkId> folderList = new ArrayList<BookmarkId>();
- List<Integer> depthList = new ArrayList<Integer>();
-
- mBookmarksBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderA));
- idToDepth.put(mMobileNode, 0);
- idToDepth.put(mDesktopNode, 0);
- idToDepth.put(folderB, 1);
- idToDepth.put(folderBA, 2);
- idToDepth.put(mOtherNode, 0);
- idToDepth.put(folderC, 1);
- verifyFolderDepths(folderList, depthList, idToDepth);
-
- mBookmarksBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderB));
- idToDepth.put(mMobileNode, 0);
- idToDepth.put(folderA, 1);
- idToDepth.put(folderAA, 2);
- idToDepth.put(folderAAA, 3);
- idToDepth.put(mDesktopNode, 0);
- idToDepth.put(mOtherNode, 0);
- idToDepth.put(folderC, 1);
- verifyFolderDepths(folderList, depthList, idToDepth);
-
- mBookmarksBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderC));
- idToDepth.put(mMobileNode, 0);
- idToDepth.put(folderA, 1);
- idToDepth.put(folderAA, 2);
- idToDepth.put(folderAAA, 3);
- idToDepth.put(mDesktopNode, 0);
- idToDepth.put(folderB, 1);
- idToDepth.put(folderBA, 2);
- idToDepth.put(mOtherNode, 0);
- verifyFolderDepths(folderList, depthList, idToDepth);
-
- mBookmarksBridge.getMoveDestinations(folderList, depthList, Arrays.asList(folderBA));
- idToDepth.put(mMobileNode, 0);
- idToDepth.put(folderA, 1);
- idToDepth.put(folderAA, 2);
- idToDepth.put(folderAAA, 3);
- idToDepth.put(mDesktopNode, 0);
- idToDepth.put(folderB, 1);
- idToDepth.put(mOtherNode, 0);
- idToDepth.put(folderC, 1);
- verifyFolderDepths(folderList, depthList, idToDepth);
-
- mBookmarksBridge.getMoveDestinations(folderList, depthList,
- Arrays.asList(folderAA, folderC));
- idToDepth.put(mMobileNode, 0);
- idToDepth.put(folderA, 1);
- idToDepth.put(mDesktopNode, 0);
- idToDepth.put(folderB, 1);
- idToDepth.put(folderBA, 2);
- idToDepth.put(mOtherNode, 0);
- verifyFolderDepths(folderList, depthList, idToDepth);
- }
-
- private void verifyFolderDepths(List<BookmarkId> folderList, List<Integer> depthList,
- HashMap<BookmarkId, Integer> idToDepth) {
- assertEquals(folderList.size(), depthList.size());
- assertEquals(folderList.size(), idToDepth.size());
- for (int i = 0; i < folderList.size(); i++) {
- BookmarkId folder = folderList.get(i);
- Integer depth = depthList.get(i);
- assertNotNull(folder);
- assertNotNull(depthList.get(i));
- assertTrue("Folder list contains non-folder elements: ",
- mBookmarksBridge.getBookmarkById(folder).isFolder());
- assertTrue("Returned list contained unexpected key: ", idToDepth.containsKey(folder));
- assertEquals(idToDepth.get(folder), depth);
- idToDepth.remove(folder);
- }
- assertEquals(idToDepth.size(), 0);
- folderList.clear();
- depthList.clear();
- }
-}
« chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/enhanced_bookmarks/EnhancedBookmarksModel.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/enhanced_bookmarks/EnhancedBookmarksModelTest.java » ('j') | chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698