Upstream version 8.37.183.0

[platform/framework/web/crosswalk.git] / src / xwalk / test / android / core_internal / javatests / src / org / xwalk / core / internal / xwview / test / SetAppCacheEnabledTest.java

diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetAppCacheEnabledTest.java b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetAppCacheEnabledTest.java
similarity index 86%
rename from src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetAppCacheEnabledTest.java
rename to src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetAppCacheEnabledTest.java
index e2873f9..72aa9a1 100644 (file)
--- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/SetAppCacheEnabledTest.java
+++ b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/SetAppCacheEnabledTest.java
@@ -1,9 +1,9 @@
 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Copyright (c) 2013 Intel Corporation. All rights reserved.
+// Copyright (c) 2013-2014 Intel Corporation. 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.xwalk.core.xwview.test;
+package org.xwalk.core.internal.xwview.test;
 
 import android.graphics.Bitmap;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -20,18 +20,16 @@ import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.net.test.util.TestWebServer;
-import org.xwalk.core.XWalkView;
+import org.xwalk.core.internal.XWalkViewInternal;
 import org.xwalk.core.internal.XWalkClient;
 import org.xwalk.core.internal.XWalkSettings;
 import org.xwalk.core.internal.XWalkWebChromeClient;
-import org.xwalk.core.xwview.test.util.CommonResources;
+import org.xwalk.core.internal.xwview.test.util.CommonResources;
 
 /**
- * TODO(wang16): This test should be moved to internal test.
- *
  * Test suite for setAppCacheEnabled().
  */
-public class SetAppCacheEnabledTest extends XWalkViewTestBase {
+public class SetAppCacheEnabledTest extends XWalkViewInternalTestBase {
     private static final long TEST_TIMEOUT = 20000L;
     private static final int CHECK_INTERVAL = 100;
     private TestHelperBridge mContentClient;
@@ -89,7 +87,7 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
         }
     }
 
-    private XWalkSettings getXWalkSettings(final XWalkView view) {
+    private XWalkSettings getXWalkSettings(final XWalkViewInternal view) {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
@@ -100,20 +98,20 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
     }
 
     @SmallTest
-    @Feature({"XWalkView", "Preferences", "AppCache"})
+    @Feature({"XWalkViewInternal", "Preferences", "AppCache"})
     public void testAppCache() throws Throwable {
         final TestHelperBridge helperBridge =
                 new TestHelperBridge();
         mContentClient = helperBridge;
-        final XWalkViewTestBase.TestXWalkUIClientBase uiClient =
-                new XWalkViewTestBase.TestXWalkUIClientBase(helperBridge);
-        final XWalkViewTestBase.TestXWalkResourceClientBase resourceClient =
-                new XWalkViewTestBase.TestXWalkResourceClientBase(helperBridge);
-        final XWalkView xWalkView =
+        final XWalkViewInternalTestBase.TestXWalkUIClientInternalBase uiClient =
+                new XWalkViewInternalTestBase.TestXWalkUIClientInternalBase(helperBridge);
+        final XWalkViewInternalTestBase.TestXWalkResourceClientBase resourceClient =
+                new XWalkViewInternalTestBase.TestXWalkResourceClientBase(helperBridge);
+        final XWalkViewInternal xWalkViewInternal =
                 createXWalkViewContainerOnMainSync(getActivity(), uiClient,
                         resourceClient);
 
-        final XWalkSettings settings = getXWalkSettings(xWalkView);
+        final XWalkSettings settings = getXWalkSettings(xWalkViewInternal);
         settings.setJavaScriptEnabled(true);
         settings.setAppCacheEnabled(false);
 
@@ -123,7 +121,7 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
             ManifestTestHelper helper = new ManifestTestHelper(
                     webServer, "testAppCache.html", "appcache.manifest");
             loadUrlSyncByContent(
-                    xWalkView,
+                    xWalkViewInternal,
                     mContentClient,
                     helper.getHtmlUrl());
             helper.waitUntilHtmlIsRequested(0);
@@ -134,7 +132,7 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
             // Enables AppCache. Use the default path if app cache path isn't set.
             settings.setAppCacheEnabled(true);
             loadUrlSyncByContent(
-                    xWalkView,
+                    xWalkViewInternal,
                     mContentClient,
                     helper.getHtmlUrl());
             helper.waitUntilManifestIsRequested(0);
@@ -145,7 +143,7 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
 
     /*
      * @SmallTest
-     * @Feature({"XWalkView", "Preferences", "AppCache"})
+     * @Feature({"XWalkViewInternal", "Preferences", "AppCache"})
      * This test is flaky but the root cause is not found yet. See crbug.com/171765.
      */
     @DisabledTest
@@ -156,12 +154,12 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
         ViewPair views = createViews();
 
         XWalkSettings settings0 = getXWalkSettingsOnUiThreadByContent(
-                views.getContent0());
+                views.getView0());
         settings0.setJavaScriptEnabled(true);
         settings0.setAppCachePath("whatever");
         settings0.setAppCacheEnabled(true);
         XWalkSettings settings1 = getXWalkSettingsOnUiThreadByContent(
-                views.getContent1());
+                views.getView1());
         settings1.setJavaScriptEnabled(true);
         // AppCachePath setting is global, no need to set it for the second view.
         settings1.setAppCacheEnabled(true);
@@ -173,7 +171,7 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
                     webServer, "testAppCache_0.html", "appcache.manifest_0");
             mContentClient = views.getClient0();
             loadUrlSyncByContent(
-                    views.getContent0(),
+                    views.getView0(),
                     mContentClient,
                     helper0.getHtmlUrl());
             int manifestRequests0 = helper0.waitUntilManifestIsRequested(0);
@@ -181,14 +179,14 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
                     webServer, "testAppCache_1.html", "appcache.manifest_1");
             mContentClient = views.getClient1();
             loadUrlSyncByContent(
-                    views.getContent1(),
+                    views.getView1(),
                     mContentClient,
                     helper1.getHtmlUrl());
             helper1.waitUntilManifestIsRequested(0);
             settings1.setAppCacheEnabled(false);
             mContentClient = views.getClient0();
             loadUrlSyncByContent(
-                    views.getContent0(),
+                    views.getView0(),
                     mContentClient,
                     helper0.getHtmlUrl());
             helper0.waitUntilManifestIsRequested(manifestRequests0);
@@ -197,7 +195,7 @@ public class SetAppCacheEnabledTest extends XWalkViewTestBase {
             int htmlRequests1 = webServer.getRequestCount(helper1.getHtmlPath());
             mContentClient = views.getClient1();
             loadUrlSyncByContent(
-                    views.getContent1(),
+                    views.getView1(),
                     mContentClient,
                     helper1.getHtmlUrl());
             helper1.waitUntilHtmlIsRequested(htmlRequests1);