projects / platform / framework / web / crosswalk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git] / src / content / public / android / javatests / src / org / chromium / content / browser / NavigationTest.java
diff --git a/src/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java b/src/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
index 67ec23a..f15c4e6 100644 (file)
--- a/src/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
+++ b/src/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
@@ -9,6 +9,7 @@ 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.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper;
 import org.chromium.content_shell_apk.ContentShellActivity;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 
@@ -25,26 +26,26 @@ public class NavigationTest extends ContentShellTestBase {
     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,
+    private void goBack(final ContentViewCore contentViewCore,
             TestCallbackHelperContainer testCallbackHelperContainer) throws Throwable {
         handleBlockingCallbackAction(
                 testCallbackHelperContainer.getOnPageFinishedHelper(),
                 new Runnable() {
                     @Override
                     public void run() {
-                        contentView.goBack();
+                        contentViewCore.goBack();
                     }
                 });
     }
 
-    private void reload(final ContentView contentView,
+    private void reload(final ContentViewCore contentViewCore,
             TestCallbackHelperContainer testCallbackHelperContainer) throws Throwable {
         handleBlockingCallbackAction(
                 testCallbackHelperContainer.getOnPageFinishedHelper(),
                 new Runnable() {
                     @Override
                     public void run() {
-                        contentView.getContentViewCore().reload(true);
+                        contentViewCore.reload(true);
                     }
                 });
     }
@@ -54,32 +55,29 @@ public class NavigationTest extends ContentShellTestBase {
     public void testDirectedNavigationHistory() throws Throwable {
         ContentShellActivity activity = launchContentShellWithUrl(URL_1);
         waitForActiveShellToBeDoneLoading();
-        ContentView contentView = activity.getActiveContentView();
+        ContentViewCore contentViewCore = activity.getActiveContentViewCore();
         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);
+                new TestCallbackHelperContainer(contentViewCore);
+
+        loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_2));
+        loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_3));
+        loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_4));
+        loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_5));
+        loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_6));
+        loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_7));
+
+        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);
+        history = contentViewCore.getDirectedNavigationHistory(true, 3);
         assertEquals(history.getEntryCount(), 0);
 
-        goBack(contentView, testCallbackHelperContainer);
-        goBack(contentView, testCallbackHelperContainer);
-        goBack(contentView, testCallbackHelperContainer);
+        goBack(contentViewCore, testCallbackHelperContainer);
+        goBack(contentViewCore, testCallbackHelperContainer);
+        goBack(contentViewCore, testCallbackHelperContainer);
 
         history = contentViewCore.getDirectedNavigationHistory(false, 4);
         assertEquals(3, history.getEntryCount());
@@ -109,21 +107,20 @@ public class NavigationTest extends ContentShellTestBase {
 
         ContentShellActivity activity = launchContentShellWithUrl(URL_LOADTIME);
         waitForActiveShellToBeDoneLoading();
-        ContentView contentView = activity.getActiveContentView();
+        ContentViewCore contentViewCore = activity.getActiveContentViewCore();
         TestCallbackHelperContainer testCallbackHelperContainer =
-                new TestCallbackHelperContainer(contentView);
-        TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper javascriptHelper =
-                testCallbackHelperContainer.getOnEvaluateJavaScriptResultHelper();
+                new TestCallbackHelperContainer(contentViewCore);
+        OnEvaluateJavaScriptResultHelper javascriptHelper = new OnEvaluateJavaScriptResultHelper();
 
         // Grab the first timestamp.
-        javascriptHelper.evaluateJavaScript(contentView.getContentViewCore(), "getLoadtime();");
+        javascriptHelper.evaluateJavaScript(contentViewCore, "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();");
+        reload(contentViewCore, testCallbackHelperContainer);
+        javascriptHelper.evaluateJavaScript(contentViewCore, "getLoadtime();");
         javascriptHelper.waitUntilHasValue();
         String secondTimestamp = javascriptHelper.getJsonResultAndClear();
         assertNotNull("Timestamp was null.", secondTimestamp);
Domain: Web Framework / Uncategorized;