Upstream version 10.39.233.0

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

diff --git a/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/UserAgentTest.java b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/UserAgentTest.java
index 1368831..a7d3df6 100644 (file)
--- a/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/UserAgentTest.java
+++ b/src/xwalk/test/android/core_internal/javatests/src/org/xwalk/core/internal/xwview/test/UserAgentTest.java
@@ -70,10 +70,9 @@ public class UserAgentTest extends XWalkViewInternalTestBase {
         final String customUserAgentString =
                 "testUserAgentWithTestServerUserAgent";
 
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         String fileName = null;
         try {
-            webServer = new TestWebServer(false);
             final String httpPath = "/testUserAgentWithTestServer.html";
             final String url = webServer.setResponse(httpPath, "foo", null);
 
@@ -88,7 +87,7 @@ public class UserAgentTest extends XWalkViewInternalTestBase {
             Header header = matchingHeaders[0];
             assertEquals(customUserAgentString, header.getValue());
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 }