OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 package org.chromium.chrome.browser.enhanced_bookmarks; | 5 package org.chromium.chrome.browser.enhanced_bookmarks; |
6 | 6 |
7 import android.test.UiThreadTest; | 7 import android.test.UiThreadTest; |
8 import android.test.suitebuilder.annotation.SmallTest; | 8 import android.test.suitebuilder.annotation.SmallTest; |
9 | 9 |
10 import org.chromium.base.ThreadUtils; | 10 import org.chromium.base.ThreadUtils; |
| 11 import org.chromium.base.annotations.SuppressFBWarnings; |
11 import org.chromium.base.test.util.Feature; | 12 import org.chromium.base.test.util.Feature; |
12 import org.chromium.chrome.browser.BookmarksBridge.BookmarkItem; | 13 import org.chromium.chrome.browser.BookmarksBridge.BookmarkItem; |
13 import org.chromium.chrome.browser.profiles.Profile; | 14 import org.chromium.chrome.browser.profiles.Profile; |
14 import org.chromium.chrome.shell.ChromeShellActivity; | 15 import org.chromium.chrome.shell.ChromeShellActivity; |
15 import org.chromium.chrome.shell.ChromeShellTab; | 16 import org.chromium.chrome.shell.ChromeShellTab; |
16 import org.chromium.chrome.shell.ChromeShellTestBase; | 17 import org.chromium.chrome.shell.ChromeShellTestBase; |
17 import org.chromium.components.bookmarks.BookmarkId; | 18 import org.chromium.components.bookmarks.BookmarkId; |
18 | 19 |
19 import java.util.ArrayList; | 20 import java.util.ArrayList; |
20 import java.util.Arrays; | 21 import java.util.Arrays; |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 mBookmarksModel.setBookmarkUrl(bookmarkC, "http://mauri.org/"); | 112 mBookmarksModel.setBookmarkUrl(bookmarkC, "http://mauri.org/"); |
112 mBookmarksModel.setBookmarkDescription(bookmarkC, "mauri"); | 113 mBookmarksModel.setBookmarkDescription(bookmarkC, "mauri"); |
113 verifyBookmark(bookmarkC, "mauri", "http://mauri.org/", false, mOtherNod
e, "mauri"); | 114 verifyBookmark(bookmarkC, "mauri", "http://mauri.org/", false, mOtherNod
e, "mauri"); |
114 | 115 |
115 mBookmarksModel.setBookmarkTitle(bookmarkD, "kauri"); | 116 mBookmarksModel.setBookmarkTitle(bookmarkD, "kauri"); |
116 mBookmarksModel.setBookmarkUrl(bookmarkD, "http://kauri.org/"); | 117 mBookmarksModel.setBookmarkUrl(bookmarkD, "http://kauri.org/"); |
117 mBookmarksModel.setBookmarkDescription(bookmarkD, "kauri"); | 118 mBookmarksModel.setBookmarkDescription(bookmarkD, "kauri"); |
118 verifyBookmark(bookmarkD, "kauri", "http://kauri.org/", false, folderA,
"kauri"); | 119 verifyBookmark(bookmarkD, "kauri", "http://kauri.org/", false, folderA,
"kauri"); |
119 } | 120 } |
120 | 121 |
| 122 @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE") |
121 @UiThreadTest | 123 @UiThreadTest |
122 @SmallTest | 124 @SmallTest |
123 @Feature({"Bookmark"}) | 125 @Feature({"Bookmark"}) |
124 public void testMoveBookmarks() { | 126 public void testMoveBookmarks() { |
125 BookmarkId bookmarkA = mBookmarksModel.addBookmark(mDesktopNode, 0, "a",
"http://a.com"); | 127 BookmarkId bookmarkA = mBookmarksModel.addBookmark(mDesktopNode, 0, "a",
"http://a.com"); |
126 BookmarkId bookmarkB = mBookmarksModel.addBookmark(mOtherNode, 0, "b", "
http://b.com"); | 128 BookmarkId bookmarkB = mBookmarksModel.addBookmark(mOtherNode, 0, "b", "
http://b.com"); |
127 BookmarkId bookmarkC = mBookmarksModel.addBookmark(mMobileNode, 0, "c",
"http://c.com"); | 129 BookmarkId bookmarkC = mBookmarksModel.addBookmark(mMobileNode, 0, "c",
"http://c.com"); |
128 BookmarkId folderA = mBookmarksModel.addFolder(mOtherNode, 0, "fa"); | 130 BookmarkId folderA = mBookmarksModel.addFolder(mOtherNode, 0, "fa"); |
129 BookmarkId folderB = mBookmarksModel.addFolder(mDesktopNode, 0, "fb"); | 131 BookmarkId folderB = mBookmarksModel.addFolder(mDesktopNode, 0, "fb"); |
130 BookmarkId folderC = mBookmarksModel.addFolder(mMobileNode, 0, "fc"); | 132 BookmarkId folderC = mBookmarksModel.addFolder(mMobileNode, 0, "fc"); |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 HashSet<BookmarkId> expectedIdsCopy = new HashSet<>(expectedIds); | 222 HashSet<BookmarkId> expectedIdsCopy = new HashSet<>(expectedIds); |
221 assertEquals(expectedIdsCopy.size(), listToVerify.size()); | 223 assertEquals(expectedIdsCopy.size(), listToVerify.size()); |
222 for (BookmarkId id : listToVerify) { | 224 for (BookmarkId id : listToVerify) { |
223 assertNotNull(id); | 225 assertNotNull(id); |
224 assertTrue("List contains wrong element: ", expectedIdsCopy.contains
(id)); | 226 assertTrue("List contains wrong element: ", expectedIdsCopy.contains
(id)); |
225 expectedIdsCopy.remove(id); | 227 expectedIdsCopy.remove(id); |
226 } | 228 } |
227 assertTrue("List does not contain some expected bookmarks: ", expectedId
sCopy.isEmpty()); | 229 assertTrue("List does not contain some expected bookmarks: ", expectedId
sCopy.isEmpty()); |
228 } | 230 } |
229 } | 231 } |
OLD | NEW |