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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java

Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Small fixes and findbugs line update Created 6 years, 11 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 | « content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java b/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
deleted file mode 100644
index 67ec23af8043414cc846c75d31c458f1672959b4..0000000000000000000000000000000000000000
--- a/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
+++ /dev/null
@@ -1,132 +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.content.browser;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.UrlUtils;
-import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
-import org.chromium.content_shell_apk.ContentShellActivity;
-import org.chromium.content_shell_apk.ContentShellTestBase;
-
-/**
- * Tests for various aspects of navigation.
- */
-public class NavigationTest extends ContentShellTestBase {
-
- private static final String URL_1 = UrlUtils.encodeHtmlDataUri("<html>1</html>");
- private static final String URL_2 = UrlUtils.encodeHtmlDataUri("<html>2</html>");
- private static final String URL_3 = UrlUtils.encodeHtmlDataUri("<html>3</html>");
- private static final String URL_4 = UrlUtils.encodeHtmlDataUri("<html>4</html>");
- private static final String URL_5 = UrlUtils.encodeHtmlDataUri("<html>5</html>");
- private static final String URL_6 = UrlUtils.encodeHtmlDataUri("<html>6</html>");
- private static final String URL_7 = UrlUtils.encodeHtmlDataUri("<html>7</html>");
-
- private void goBack(final ContentView contentView,
- TestCallbackHelperContainer testCallbackHelperContainer) throws Throwable {
- handleBlockingCallbackAction(
- testCallbackHelperContainer.getOnPageFinishedHelper(),
- new Runnable() {
- @Override
- public void run() {
- contentView.goBack();
- }
- });
- }
-
- private void reload(final ContentView contentView,
- TestCallbackHelperContainer testCallbackHelperContainer) throws Throwable {
- handleBlockingCallbackAction(
- testCallbackHelperContainer.getOnPageFinishedHelper(),
- new Runnable() {
- @Override
- public void run() {
- contentView.getContentViewCore().reload(true);
- }
- });
- }
-
- @MediumTest
- @Feature({"Navigation"})
- public void testDirectedNavigationHistory() throws Throwable {
- ContentShellActivity activity = launchContentShellWithUrl(URL_1);
- waitForActiveShellToBeDoneLoading();
- ContentView contentView = activity.getActiveContentView();
- TestCallbackHelperContainer testCallbackHelperContainer =
- new TestCallbackHelperContainer(contentView);
-
- loadUrl(contentView, testCallbackHelperContainer, new LoadUrlParams(URL_2));
- loadUrl(contentView, testCallbackHelperContainer, new LoadUrlParams(URL_3));
- loadUrl(contentView, testCallbackHelperContainer, new LoadUrlParams(URL_4));
- loadUrl(contentView, testCallbackHelperContainer, new LoadUrlParams(URL_5));
- loadUrl(contentView, testCallbackHelperContainer, new LoadUrlParams(URL_6));
- loadUrl(contentView, testCallbackHelperContainer, new LoadUrlParams(URL_7));
-
- ContentViewCore contentViewCore = contentView.getContentViewCore();
- NavigationHistory history = contentViewCore
- .getDirectedNavigationHistory(false, 3);
- assertEquals(3, history.getEntryCount());
- assertEquals(URL_6, history.getEntryAtIndex(0).getUrl());
- assertEquals(URL_5, history.getEntryAtIndex(1).getUrl());
- assertEquals(URL_4, history.getEntryAtIndex(2).getUrl());
-
- history = contentView.getContentViewCore()
- .getDirectedNavigationHistory(true, 3);
- assertEquals(history.getEntryCount(), 0);
-
- goBack(contentView, testCallbackHelperContainer);
- goBack(contentView, testCallbackHelperContainer);
- goBack(contentView, testCallbackHelperContainer);
-
- history = contentViewCore.getDirectedNavigationHistory(false, 4);
- assertEquals(3, history.getEntryCount());
- assertEquals(URL_3, history.getEntryAtIndex(0).getUrl());
- assertEquals(URL_2, history.getEntryAtIndex(1).getUrl());
- assertEquals(URL_1, history.getEntryAtIndex(2).getUrl());
-
- history = contentViewCore.getDirectedNavigationHistory(true, 4);
- assertEquals(3, history.getEntryCount());
- assertEquals(URL_5, history.getEntryAtIndex(0).getUrl());
- assertEquals(URL_6, history.getEntryAtIndex(1).getUrl());
- assertEquals(URL_7, history.getEntryAtIndex(2).getUrl());
- }
-
- /**
- * Tests whether a page was successfully reloaded.
- * Checks to make sure that OnPageFinished events were fired and that the timestamps of when
- * the page loaded are different after the reload.
- */
- @MediumTest
- @Feature({"Navigation"})
- public void testPageReload() throws Throwable {
- final String HTML_LOADTIME = "<html><head>" +
- "<script type=\"text/javascript\">var loadTimestamp = new Date().getTime();" +
- "function getLoadtime() { return loadTimestamp; }</script></head></html>";
- final String URL_LOADTIME = UrlUtils.encodeHtmlDataUri(HTML_LOADTIME);
-
- ContentShellActivity activity = launchContentShellWithUrl(URL_LOADTIME);
- waitForActiveShellToBeDoneLoading();
- ContentView contentView = activity.getActiveContentView();
- TestCallbackHelperContainer testCallbackHelperContainer =
- new TestCallbackHelperContainer(contentView);
- TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper javascriptHelper =
- testCallbackHelperContainer.getOnEvaluateJavaScriptResultHelper();
-
- // Grab the first timestamp.
- javascriptHelper.evaluateJavaScript(contentView.getContentViewCore(), "getLoadtime();");
- javascriptHelper.waitUntilHasValue();
- String firstTimestamp = javascriptHelper.getJsonResultAndClear();
- assertNotNull("Timestamp was null.", firstTimestamp);
-
- // Grab the timestamp after a reload and make sure they don't match.
- reload(contentView, testCallbackHelperContainer);
- javascriptHelper.evaluateJavaScript(contentView.getContentViewCore(), "getLoadtime();");
- javascriptHelper.waitUntilHasValue();
- String secondTimestamp = javascriptHelper.getJsonResultAndClear();
- assertNotNull("Timestamp was null.", secondTimestamp);
- assertFalse("Timestamps matched.", firstTimestamp.equals(secondTimestamp));
- }
-}
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698