diff options
| author | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 12:23:59 +0000 |
|---|---|---|
| committer | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-30 12:23:59 +0000 |
| commit | 031b2e0d15a173857ddf054b12b3d04614eed084 (patch) | |
| tree | 4d2884f7778ea4efc2d857bba1c84b262802931a /android_webview | |
| parent | dd9e7ce7fc9932d775968f0058e2ace867c1e890 (diff) | |
| download | chromium_src-031b2e0d15a173857ddf054b12b3d04614eed084.zip chromium_src-031b2e0d15a173857ddf054b12b3d04614eed084.tar.gz chromium_src-031b2e0d15a173857ddf054b12b3d04614eed084.tar.bz2 | |
Fix Data URIs in tests
Depends on https://codereview.chromium.org/12079009/
BUG=
Review URL: https://chromiumcodereview.appspot.com/12094017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
3 files changed, 11 insertions, 8 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java index 5da6510..fa51c53 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java @@ -10,6 +10,7 @@ import android.webkit.ValueCallback; import org.chromium.android_webview.AwContents; import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.Feature; +import org.chromium.base.test.util.UrlUtils; import java.io.File; import java.util.concurrent.Semaphore; @@ -20,8 +21,8 @@ public class ArchiveTest extends AndroidWebViewTestBase { private static final long TEST_TIMEOUT = 20000L; - private static final String TEST_PAGE = - "data:text/html;utf-8,<html><head></head><body>test</body></html>"; + private static final String TEST_PAGE = UrlUtils.encodeHtmlDataUri( + "<html><head></head><body>test</body></html>"); private TestAwContentsClient mContentsClient = new TestAwContentsClient(); private AwTestContainerView mTestContainerView; diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java index 569a7b8..3f18c2a 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java @@ -8,6 +8,7 @@ import android.test.suitebuilder.annotation.SmallTest; import org.chromium.android_webview.AwContents; import org.chromium.base.test.util.Feature; +import org.chromium.base.test.util.UrlUtils; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.HistoryUtils; import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper; @@ -20,7 +21,8 @@ public class ClearHistoryTest extends AndroidWebViewTestBase { private static final String[] URLS = new String[3]; { for (int i = 0; i < URLS.length; i++) { - URLS[i] = "data:text/html;utf-8,<html><head></head><body>" + i + "</body></html>"; + URLS[i] = UrlUtils.encodeHtmlDataUri( + "<html><head></head><body>" + i + "</body></html>"); } } diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java index 9535814..5db8501 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java @@ -18,6 +18,7 @@ import android.test.suitebuilder.annotation.SmallTest; import org.chromium.android_webview.AwContents; import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; +import org.chromium.base.test.util.UrlUtils; import org.chromium.base.ThreadUtils; import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewStatics; @@ -53,13 +54,12 @@ public class ContentViewMiscTest extends AndroidWebViewTestBase { */ @FlakyTest public void testFlingScroll() throws Throwable { - StringBuffer testPage = new StringBuffer().append("data:text/html;utf-8,") - .append("<html><head><style>body { width: 5000px; height: 5000px; }</head><body>") - .append("</body></html>"); + final String testPage = UrlUtils.encodeHtmlDataUri( + "<html><head><style>body { width: 5000px; height: 5000px; }</head>" + + "<body></body></html>"); // Test flinging in the y axis - loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(), - testPage.toString()); + loadUrlSync(mAwContents , mContentsClient.getOnPageFinishedHelper(), testPage); assertEquals(0, mContentViewCore.getNativeScrollYForTest()); ThreadUtils.runOnUiThread(new Runnable() { @Override |