Merge "Cherry-pick: Use getAssetUrl() to access files present in assets folder from master. DO NOT MERGE" into klp-dev
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 25830ad..0b8af7a 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -1161,8 +1161,11 @@
}
public void testRequestFocusNodeHref() throws Throwable {
- final String links = "<DL><p><DT><A HREF=\"" + TestHtmlConstants.HTML_URL1
- + "\">HTML_URL1</A><DT><A HREF=\"" + TestHtmlConstants.HTML_URL2
+ startWebServer(false);
+ String url1 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL1);
+ String url2 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL2);
+ final String links = "<DL><p><DT><A HREF=\"" + url1
+ + "\">HTML_URL1</A><DT><A HREF=\"" + url2
+ "\">HTML_URL2</A></DL><p>";
mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + links + "</body></html>", "text/html", null);
getInstrumentation().waitForIdleSync();
@@ -1192,7 +1195,7 @@
return done;
}
}.run();
- assertEquals(TestHtmlConstants.HTML_URL1, handler.getResultUrl());
+ assertEquals(url1, handler.getResultUrl());
// focus on second link
handler.reset();
@@ -1204,9 +1207,10 @@
@Override
protected boolean check() {
boolean done = false;
+ final String url2 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL2);
if (handler.hasCalledHandleMessage()) {
if (handler.mResultUrl != null &&
- handler.mResultUrl.equals(TestHtmlConstants.HTML_URL2)) {
+ handler.mResultUrl.equals(url2)) {
done = true;
} else {
handler.reset();
@@ -1218,7 +1222,7 @@
return done;
}
}.run();
- assertEquals(TestHtmlConstants.HTML_URL2, handler.getResultUrl());
+ assertEquals(url2, handler.getResultUrl());
mOnUiThread.requestFocusNodeHref(null);
}