| Index: chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java
|
| diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java
|
| index 7a136c75103fa25e4555a040198ed15532f0d7a4..e6013d4e4b81a0123c4297c1b2bc22634464eacc 100644
|
| --- a/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java
|
| +++ b/chrome/android/junit/src/org/chromium/chrome/browser/bookmarks/BookmarkUtilsTest.java
|
| @@ -6,24 +6,13 @@ package org.chromium.chrome.browser.bookmarks;
|
|
|
| import static org.junit.Assert.assertEquals;
|
| import static org.junit.Assert.assertFalse;
|
| -import static org.mockito.Mockito.any;
|
| -import static org.mockito.Mockito.doNothing;
|
| -import static org.mockito.Mockito.eq;
|
| -import static org.mockito.Mockito.mock;
|
| import static org.mockito.Mockito.verify;
|
| -import static org.mockito.Mockito.verifyNoMoreInteractions;
|
| -import static org.mockito.Mockito.when;
|
|
|
| -
|
| -import android.app.Activity;
|
| import android.content.Context;
|
| import android.content.Intent;
|
|
|
| -import org.chromium.base.ApplicationStatus;
|
| import org.chromium.base.BaseChromiumApplication;
|
| import org.chromium.base.test.util.Feature;
|
| -import org.chromium.chrome.browser.snackbar.SnackbarManager;
|
| -import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.components.bookmarks.BookmarkId;
|
| import org.chromium.components.bookmarks.BookmarkType;
|
| import org.chromium.content_public.browser.WebContents;
|
| @@ -35,7 +24,6 @@ import org.junit.runner.RunWith;
|
| import org.mockito.ArgumentCaptor;
|
| import org.mockito.Mock;
|
| import org.mockito.MockitoAnnotations;
|
| -import org.robolectric.Robolectric;
|
| import org.robolectric.annotation.Config;
|
|
|
| /**
|
| @@ -80,65 +68,4 @@ public class BookmarkUtilsTest {
|
| assertEquals(mWebContents, intentArgumentCaptor.getValue()
|
| .getParcelableExtra(BookmarkEditActivity.INTENT_WEB_CONTENTS));
|
| }
|
| -
|
| - @Test
|
| - @Feature({"Bookmark"})
|
| - public void testSaveBookmarkOfflineNoBookmark() {
|
| - ApplicationStatus.initialize((BaseChromiumApplication) Robolectric.application);
|
| - Tab tab = new Tab(0, true, null);
|
| - BookmarkModel model = mock(BookmarkModel.class);
|
| - SnackbarManager snackbarManager = mock(SnackbarManager.class);
|
| - Activity activity = mock(Activity.class);
|
| -
|
| - when(model.doesBookmarkExist(new BookmarkId(12345L, BookmarkType.NORMAL)))
|
| - .thenReturn(false);
|
| - BookmarkUtils.saveBookmarkOffline(12345L, model, tab, snackbarManager, activity);
|
| - verify(model).doesBookmarkExist(new BookmarkId(12345L, BookmarkType.NORMAL));
|
| -
|
| - verifyNoMoreInteractions(model);
|
| - verifyNoMoreInteractions(snackbarManager);
|
| - verifyNoMoreInteractions(activity);
|
| - }
|
| -
|
| - @Test
|
| - @Feature({"Bookmark"})
|
| - public void testSaveBookmarkOfflineSadTab() {
|
| - ApplicationStatus.initialize((BaseChromiumApplication) Robolectric.application);
|
| - Tab tab = new Tab(0, true, null);
|
| - BookmarkModel model = mock(BookmarkModel.class);
|
| - SnackbarManager snackbarManager = mock(SnackbarManager.class);
|
| - Activity activity = mock(Activity.class);
|
| -
|
| - tab.setIsShowingErrorPage(true);
|
| -
|
| - when(model.doesBookmarkExist(new BookmarkId(12345L, BookmarkType.NORMAL))).thenReturn(true);
|
| - BookmarkUtils.saveBookmarkOffline(12345L, model, tab, snackbarManager, activity);
|
| - verify(model).doesBookmarkExist(new BookmarkId(12345L, BookmarkType.NORMAL));
|
| -
|
| - verifyNoMoreInteractions(model);
|
| - verifyNoMoreInteractions(snackbarManager);
|
| - verifyNoMoreInteractions(activity);
|
| - }
|
| -
|
| - @Test
|
| - @Feature({"Bookmark"})
|
| - public void testSaveBookmarkOffline() {
|
| - ApplicationStatus.initialize((BaseChromiumApplication) Robolectric.application);
|
| - Tab tab = new Tab(0, true, null);
|
| - BookmarkModel model = mock(BookmarkModel.class);
|
| - SnackbarManager snackbarManager = mock(SnackbarManager.class);
|
| - Activity activity = mock(Activity.class);
|
| - BookmarkId id = new BookmarkId(12345L, BookmarkType.NORMAL);
|
| - when(model.doesBookmarkExist(id)).thenReturn(true);
|
| - doNothing().when(model).saveOfflinePage(eq(id), any(WebContents.class),
|
| - any(BookmarkModel.AddBookmarkCallback.class));
|
| - BookmarkUtils.saveBookmarkOffline(12345L, model, tab, snackbarManager, activity);
|
| - verify(model).doesBookmarkExist(id);
|
| - verify(model).saveOfflinePage(eq(id), any(WebContents.class),
|
| - any(BookmarkModel.AddBookmarkCallback.class));
|
| -
|
| - verifyNoMoreInteractions(model);
|
| - verifyNoMoreInteractions(snackbarManager);
|
| - verifyNoMoreInteractions(activity);
|
| - }
|
| }
|
|
|