Upstream version 10.39.233.0

[platform/framework/web/crosswalk.git] / src / xwalk / test / android / core / javatests / src / org / xwalk / core / xwview / test / CookieManagerTest.java
diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/CookieManagerTest.java b/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/CookieManagerTest.java

index f007464..018778d 100644 (file)
--- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/CookieManagerTest.java
+++ b/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/CookieManagerTest.java
@@ -23,10 +23,9 @@ import java.util.HashSet;
  import java.util.List;
  import java.util.Set;
  
-import org.xwalk.core.XWalkCookieManager;
-import org.xwalk.core.XWalkClient;
-import org.xwalk.core.XWalkContent;
  import org.xwalk.core.XWalkView;
+import org.xwalk.core.internal.XWalkCookieManager;
+import org.xwalk.core.internal.XWalkClient;
  
  /**
   * Tests for the CookieManager.
@@ -40,7 +39,6 @@ public class CookieManagerTest extends XWalkViewTestBase {
          super.setUp();
  
          mCookieManager = new XWalkCookieManager();
-        setXWalkClient(new XWalkViewTestBase.TestXWalkClient());
      }
  
      @SmallTest
@@ -56,9 +54,8 @@ public class CookieManagerTest extends XWalkViewTestBase {
      @MediumTest
      @Feature({"AcceptCookie"})
      public void testAcceptCookie() throws Throwable {
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
          try {
-            webServer = new TestWebServer(false);
              String path = "/cookie_test.html";
              String responseStr =
                      "<html><head><title>TEST!</title></head><body>HELLO!</body></html>";
@@ -105,7 +102,7 @@ public class CookieManagerTest extends XWalkViewTestBase {
              // Clean up all cookies.
              mCookieManager.removeAllCookie();
          } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
          }
      }