| Index: chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
|
| deleted file mode 100644
|
| index 7c15b6142c2f653457cebe91e6e175bb359bf464..0000000000000000000000000000000000000000
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
|
| +++ /dev/null
|
| @@ -1,261 +0,0 @@
|
| -// Copyright 2013 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.graphics.Bitmap;
|
| -import android.test.suitebuilder.annotation.MediumTest;
|
| -import android.test.suitebuilder.annotation.SmallTest;
|
| -
|
| -import org.chromium.base.ThreadUtils;
|
| -import org.chromium.base.test.util.Feature;
|
| -import org.chromium.base.test.util.UrlUtils;
|
| -import org.chromium.chrome.shell.ChromeShellActivity;
|
| -import org.chromium.chrome.shell.ChromeShellTestBase;
|
| -import org.chromium.content.browser.test.util.Criteria;
|
| -import org.chromium.content.browser.test.util.CriteriaHelper;
|
| -import org.chromium.content_public.browser.LoadUrlParams;
|
| -import org.chromium.content_public.browser.NavigationController;
|
| -import org.chromium.content_public.browser.NavigationEntry;
|
| -import org.chromium.content_public.browser.NavigationHistory;
|
| -
|
| -import java.util.concurrent.Callable;
|
| -import java.util.concurrent.ExecutionException;
|
| -
|
| -/**
|
| - * Tests for the navigation popup.
|
| - */
|
| -public class NavigationPopupTest extends ChromeShellTestBase {
|
| -
|
| - private static final int INVALID_NAVIGATION_INDEX = -1;
|
| -
|
| - private ChromeShellActivity mActivity;
|
| -
|
| - @Override
|
| - public void setUp() throws Exception {
|
| - super.setUp();
|
| -
|
| - mActivity = launchChromeShellWithBlankPage();
|
| - }
|
| -
|
| - // Exists solely to expose protected methods to this test.
|
| - private static class TestNavigationHistory extends NavigationHistory {
|
| - @Override
|
| - public void addEntry(NavigationEntry entry) {
|
| - super.addEntry(entry);
|
| - }
|
| - }
|
| -
|
| - // Exists solely to expose protected methods to this test.
|
| - private static class TestNavigationEntry extends NavigationEntry {
|
| - public TestNavigationEntry(int index, String url, String virtualUrl, String originalUrl,
|
| - String title, Bitmap favicon, int transition) {
|
| - super(index, url, virtualUrl, originalUrl, title, favicon, transition);
|
| - }
|
| - }
|
| -
|
| - private static class TestNavigationController implements NavigationController {
|
| - private final TestNavigationHistory mHistory;
|
| - private int mNavigatedIndex = INVALID_NAVIGATION_INDEX;
|
| -
|
| - public TestNavigationController() {
|
| - mHistory = new TestNavigationHistory();
|
| - mHistory.addEntry(new TestNavigationEntry(
|
| - 1, "about:blank", null, null, "About Blank", null, 0));
|
| - mHistory.addEntry(new TestNavigationEntry(
|
| - 5, UrlUtils.encodeHtmlDataUri("<html>1</html>"), null, null, null, null, 0));
|
| - }
|
| -
|
| - @Override
|
| - public boolean canGoBack() {
|
| - return false;
|
| - }
|
| -
|
| - @Override
|
| - public boolean canGoForward() {
|
| - return false;
|
| - }
|
| -
|
| - @Override
|
| - public boolean canGoToOffset(int offset) {
|
| - return false;
|
| - }
|
| -
|
| - @Override
|
| - public void goToOffset(int offset) {
|
| - }
|
| -
|
| - @Override
|
| - public void goBack() {
|
| - }
|
| -
|
| - @Override
|
| - public void goForward() {
|
| - }
|
| -
|
| - @Override
|
| - public boolean isInitialNavigation() {
|
| - return false;
|
| - }
|
| -
|
| - @Override
|
| - public void loadIfNecessary() {
|
| - }
|
| -
|
| - @Override
|
| - public void requestRestoreLoad() {
|
| - }
|
| -
|
| - @Override
|
| - public void reload(boolean checkForRepost) {
|
| - }
|
| -
|
| - @Override
|
| - public void reloadIgnoringCache(boolean checkForRepost) {
|
| - }
|
| -
|
| - @Override
|
| - public void cancelPendingReload() {
|
| - }
|
| -
|
| - @Override
|
| - public void continuePendingReload() {
|
| - }
|
| -
|
| - @Override
|
| - public void loadUrl(LoadUrlParams params) {
|
| - }
|
| -
|
| - @Override
|
| - public void clearHistory() {
|
| - }
|
| -
|
| - @Override
|
| - public NavigationHistory getNavigationHistory() {
|
| - return null;
|
| - }
|
| -
|
| - @Override
|
| - public String getOriginalUrlForVisibleNavigationEntry() {
|
| - return null;
|
| - }
|
| -
|
| - @Override
|
| - public void clearSslPreferences() {
|
| - }
|
| -
|
| - @Override
|
| - public boolean getUseDesktopUserAgent() {
|
| - return false;
|
| - }
|
| -
|
| - @Override
|
| - public void setUseDesktopUserAgent(boolean override, boolean reloadOnChange) {
|
| - }
|
| -
|
| - @Override
|
| - public NavigationEntry getEntryAtIndex(int index) {
|
| - return null;
|
| - }
|
| -
|
| - @Override
|
| - public NavigationEntry getPendingEntry() {
|
| - return null;
|
| - }
|
| -
|
| - @Override
|
| - public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit) {
|
| - return mHistory;
|
| - }
|
| -
|
| - @Override
|
| - public void goToNavigationIndex(int index) {
|
| - mNavigatedIndex = index;
|
| - }
|
| -
|
| - @Override
|
| - public int getLastCommittedEntryIndex() {
|
| - return -1;
|
| - }
|
| -
|
| - @Override
|
| - public boolean removeEntryAtIndex(int index) {
|
| - return false;
|
| - }
|
| - }
|
| -
|
| - @MediumTest
|
| - @Feature({"Navigation"})
|
| - public void testFaviconFetching() throws InterruptedException {
|
| - final TestNavigationController controller = new TestNavigationController();
|
| - final NavigationPopup popup = new NavigationPopup(
|
| - mActivity, controller, true);
|
| - popup.setWidth(300);
|
| - popup.setAnchorView(mActivity.getActiveContentViewCore().getContainerView());
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| - @Override
|
| - public void run() {
|
| - popup.show();
|
| - }
|
| - });
|
| -
|
| - assertTrue("All favicons did not get updated.",
|
| - CriteriaHelper.pollForCriteria(new Criteria() {
|
| - @Override
|
| - public boolean isSatisfied() {
|
| - try {
|
| - return ThreadUtils.runOnUiThreadBlocking(new Callable<Boolean>() {
|
| - @Override
|
| - public Boolean call() throws Exception {
|
| - NavigationHistory history = controller.mHistory;
|
| - for (int i = 0; i < history.getEntryCount(); i++) {
|
| - if (history.getEntryAtIndex(i).getFavicon() == null) {
|
| - return false;
|
| - }
|
| - }
|
| - return true;
|
| - }
|
| - });
|
| - } catch (ExecutionException e) {
|
| - return false;
|
| - }
|
| - }
|
| - }));
|
| -
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| - @Override
|
| - public void run() {
|
| - popup.dismiss();
|
| - }
|
| - });
|
| - }
|
| -
|
| - @SmallTest
|
| - @Feature({"Navigation"})
|
| - public void testItemSelection() {
|
| - final TestNavigationController controller = new TestNavigationController();
|
| - final NavigationPopup popup = new NavigationPopup(
|
| - mActivity, controller, true);
|
| - popup.setWidth(300);
|
| - popup.setAnchorView(mActivity.getActiveContentViewCore().getContainerView());
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| - @Override
|
| - public void run() {
|
| - popup.show();
|
| - }
|
| - });
|
| -
|
| - ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| - @Override
|
| - public void run() {
|
| - popup.performItemClick(1);
|
| - }
|
| - });
|
| -
|
| - assertFalse("Popup did not hide as expected.", popup.isShowing());
|
| - assertEquals("Popup attempted to navigate to the wrong index", 5,
|
| - controller.mNavigatedIndex);
|
| - }
|
| -
|
| -}
|
|
|