From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- .../appcache/online-fallback-layering-expected.txt | 10 +++ .../tests/appcache/online-fallback-layering.html | 97 ++++++++++++++++++++++ .../fallbacknamespace-fallback-resource.txt | 1 + ...mespace-networknamespace-existing-resource.html | 9 ++ .../resources/online-fallback-layering.manifest | 7 ++ .../resources/absolute-url-strip-whitespace.js | 1 + 6 files changed, 125 insertions(+) create mode 100644 LayoutTests/http/tests/appcache/online-fallback-layering-expected.txt create mode 100644 LayoutTests/http/tests/appcache/online-fallback-layering.html create mode 100644 LayoutTests/http/tests/appcache/resources/fallbacknamespace-fallback-resource.txt create mode 100644 LayoutTests/http/tests/appcache/resources/fallbacknamespace-networknamespace-existing-resource.html create mode 100644 LayoutTests/http/tests/appcache/resources/online-fallback-layering.manifest create mode 100644 LayoutTests/http/tests/resources/absolute-url-strip-whitespace.js (limited to 'LayoutTests/http') diff --git a/LayoutTests/http/tests/appcache/online-fallback-layering-expected.txt b/LayoutTests/http/tests/appcache/online-fallback-layering-expected.txt new file mode 100644 index 0000000..00b913c --- /dev/null +++ b/LayoutTests/http/tests/appcache/online-fallback-layering-expected.txt @@ -0,0 +1,10 @@ +Test that a network namespace trumps a fallback namespace where they overlap. + +Sanity check the presence of the fallback namespace, should get the fallback resource. +Getting a network namespace resource that exists on the server, should succeed. +Getting a network namespace resource that does not exist on the server, should get a 404. +Creating two iframes for an existing and non-existing page, one should say "hello" the other should 404. +- hello heard +- 404 detected +PASS + diff --git a/LayoutTests/http/tests/appcache/online-fallback-layering.html b/LayoutTests/http/tests/appcache/online-fallback-layering.html new file mode 100644 index 0000000..bc607ee --- /dev/null +++ b/LayoutTests/http/tests/appcache/online-fallback-layering.html @@ -0,0 +1,97 @@ + + + + + + +

Test that a network namespace trumps a fallback namespace where they overlap.

+ + diff --git a/LayoutTests/http/tests/appcache/resources/fallbacknamespace-fallback-resource.txt b/LayoutTests/http/tests/appcache/resources/fallbacknamespace-fallback-resource.txt new file mode 100644 index 0000000..c8beda4 --- /dev/null +++ b/LayoutTests/http/tests/appcache/resources/fallbacknamespace-fallback-resource.txt @@ -0,0 +1 @@ +This is the fallback resource used for the fallbacknamespace in the online-fallback-layering.html test. diff --git a/LayoutTests/http/tests/appcache/resources/fallbacknamespace-networknamespace-existing-resource.html b/LayoutTests/http/tests/appcache/resources/fallbacknamespace-networknamespace-existing-resource.html new file mode 100644 index 0000000..42362dc --- /dev/null +++ b/LayoutTests/http/tests/appcache/resources/fallbacknamespace-networknamespace-existing-resource.html @@ -0,0 +1,9 @@ + + + +hello + + + diff --git a/LayoutTests/http/tests/appcache/resources/online-fallback-layering.manifest b/LayoutTests/http/tests/appcache/resources/online-fallback-layering.manifest new file mode 100644 index 0000000..d6507ff --- /dev/null +++ b/LayoutTests/http/tests/appcache/resources/online-fallback-layering.manifest @@ -0,0 +1,7 @@ +CACHE MANIFEST + +FALLBACK: +fallbacknamespace- fallbacknamespace-fallback-resource.txt + +NETWORK: +fallbacknamespace-networknamespace- diff --git a/LayoutTests/http/tests/resources/absolute-url-strip-whitespace.js b/LayoutTests/http/tests/resources/absolute-url-strip-whitespace.js new file mode 100644 index 0000000..252a630 --- /dev/null +++ b/LayoutTests/http/tests/resources/absolute-url-strip-whitespace.js @@ -0,0 +1 @@ +document.getElementById("test").innerHTML = "PASS"; -- cgit v1.1