Move most of CSP tests into security/contentSecurityPolicy/
authorjiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Jun 2016 00:45:42 +0000 (00:45 +0000)
committerjiewen_tan@apple.com <jiewen_tan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Jun 2016 00:45:42 +0000 (00:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=158859

Reviewed by Daniel Bates.

* platform/mac-wk1/TestExpectations:
* platform/mac/TestExpectations:
* platform/wk2/TestExpectations:
* security/contentSecurityPolicy/blocks-video-expected.txt: Renamed from LayoutTests/media/csp-blocks-video-expected.txt.
* security/contentSecurityPolicy/blocks-video.html: Renamed from LayoutTests/media/csp-blocks-video.html.
* security/contentSecurityPolicy/font-loading-block-all-expected.txt: Renamed from LayoutTests/fast/text/font-loading-csp-block-all-expected.txt.
* security/contentSecurityPolicy/font-loading-block-all.html: Renamed from LayoutTests/fast/text/font-loading-csp-block-all.html.
* security/contentSecurityPolicy/image-with-blob-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
* security/contentSecurityPolicy/image-with-blob-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
* security/contentSecurityPolicy/image-with-blob-url-blocked-by-img-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-blocked-by-csp-img-src-star-expected.html.
* security/contentSecurityPolicy/image-with-blob-url-blocked-by-img-src-star.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-blocked-by-csp-img-src-star.html.
* security/contentSecurityPolicy/image-with-data-url-allowed-by-img-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-data-url-allowed-by-csp-img-src-star-expected.html.
* security/contentSecurityPolicy/image-with-data-url-allowed-by-img-src-star.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-data-url-allowed-by-csp-img-src-star.html.
* security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
* security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
* security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-blocked-by-csp-img-src-star-expected.html.
* security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-blocked-by-csp-img-src-star.html.
* security/contentSecurityPolicy/link-with-blob-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
* security/contentSecurityPolicy/link-with-blob-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
* security/contentSecurityPolicy/link-with-blob-url-blocked-by-style-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-blocked-by-csp-style-src-star-expected.html.
* security/contentSecurityPolicy/link-with-blob-url-blocked-by-style-src-star.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-blocked-by-csp-style-src-star.html.
* security/contentSecurityPolicy/link-with-data-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
* security/contentSecurityPolicy/link-with-data-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
* security/contentSecurityPolicy/link-with-data-url-blocked-by-style-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-blocked-by-csp-style-src-star-expected.html.
* security/contentSecurityPolicy/link-with-data-url-blocked-by-style-src-star.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-blocked-by-csp-style-src-star.html.
* security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
* security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
* security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-blocked-by-csp-style-src-star-expected.html.
* security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-blocked-by-csp-style-src-star.html.
* security/contentSecurityPolicy/resources/worker-inherits-blocks-eval.js: Renamed from LayoutTests/fast/workers/resources/worker-inherits-csp-blocks-eval.js.
(catch):
* security/contentSecurityPolicy/resources/worker-inherits-blocks-xhr.js: Renamed from LayoutTests/fast/workers/resources/worker-inherits-csp-blocks-xhr.js.
(catch):
* security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star-expected.html: Renamed from LayoutTests/media/video-with-blob-url-allowed-by-csp-media-src-star-expected.html.
* security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star.html: Renamed from LayoutTests/media/video-with-blob-url-allowed-by-csp-media-src-star.html.
* security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star-expected.html: Renamed from LayoutTests/media/video-with-data-url-allowed-by-csp-media-src-star-expected.html.
* security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star.html: Renamed from LayoutTests/media/video-with-data-url-allowed-by-csp-media-src-star.html.
* security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/media/video-with-file-url-allowed-by-csp-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
* security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/media/video-with-file-url-allowed-by-csp-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
* security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html: Renamed from LayoutTests/media/video-with-file-url-blocked-by-csp-media-src-star-expected.html.
* security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html: Renamed from LayoutTests/media/video-with-file-url-blocked-by-csp-media-src-star.html.
* security/contentSecurityPolicy/worker-inherits-blocks-eval-expected.txt: Renamed from LayoutTests/fast/workers/worker-inherits-csp-blocks-eval-expected.txt.
* security/contentSecurityPolicy/worker-inherits-blocks-eval.html: Renamed from LayoutTests/fast/workers/worker-inherits-csp-blocks-eval.html.
* security/contentSecurityPolicy/worker-inherits-blocks-xhr-expected.txt: Renamed from LayoutTests/fast/workers/worker-inherits-csp-blocks-xhr-expected.txt.
* security/contentSecurityPolicy/worker-inherits-blocks-xhr.html: Renamed from LayoutTests/fast/workers/worker-inherits-csp-blocks-xhr.html.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

44 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/mac-wk1/TestExpectations
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/wk2/TestExpectations
LayoutTests/security/contentSecurityPolicy/blocks-video-expected.txt [moved from LayoutTests/media/csp-blocks-video-expected.txt with 100% similarity]
LayoutTests/security/contentSecurityPolicy/blocks-video.html [moved from LayoutTests/media/csp-blocks-video.html with 66% similarity]
LayoutTests/security/contentSecurityPolicy/font-loading-block-all-expected.txt [moved from LayoutTests/fast/text/font-loading-csp-block-all-expected.txt with 100% similarity]
LayoutTests/security/contentSecurityPolicy/font-loading-block-all.html [moved from LayoutTests/fast/text/font-loading-csp-block-all.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-blob-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html with 84% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-blob-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html with 95% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-blob-url-blocked-by-img-src-star-expected.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-blocked-by-csp-img-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-blob-url-blocked-by-img-src-star.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-blocked-by-csp-img-src-star.html with 94% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-data-url-allowed-by-img-src-star-expected.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-data-url-allowed-by-csp-img-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-data-url-allowed-by-img-src-star.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-data-url-allowed-by-csp-img-src-star.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html with 79% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html with 85% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-blocked-by-csp-img-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html [moved from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-blocked-by-csp-img-src-star.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-blob-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-blob-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-blob-url-blocked-by-style-src-star-expected.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-blocked-by-csp-style-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-blob-url-blocked-by-style-src-star.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-blocked-by-csp-style-src-star.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-data-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-data-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-data-url-blocked-by-style-src-star-expected.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-blocked-by-csp-style-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-data-url-blocked-by-style-src-star.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-blocked-by-csp-style-src-star.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html with 87% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-blocked-by-csp-style-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html [moved from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-blocked-by-csp-style-src-star.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/resources/worker-inherits-blocks-eval.js [moved from LayoutTests/fast/workers/resources/worker-inherits-csp-blocks-eval.js with 100% similarity]
LayoutTests/security/contentSecurityPolicy/resources/worker-inherits-blocks-xhr.js [moved from LayoutTests/fast/workers/resources/worker-inherits-csp-blocks-xhr.js with 100% similarity]
LayoutTests/security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star-expected.html [moved from LayoutTests/media/video-with-blob-url-allowed-by-csp-media-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star.html [moved from LayoutTests/media/video-with-blob-url-allowed-by-csp-media-src-star.html with 90% similarity]
LayoutTests/security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star-expected.html [moved from LayoutTests/media/video-with-data-url-allowed-by-csp-media-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star.html [moved from LayoutTests/media/video-with-data-url-allowed-by-csp-media-src-star.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html [moved from LayoutTests/media/video-with-file-url-allowed-by-csp-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html with 87% similarity]
LayoutTests/security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [moved from LayoutTests/media/video-with-file-url-allowed-by-csp-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html with 89% similarity]
LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html [moved from LayoutTests/media/video-with-file-url-blocked-by-csp-media-src-star-expected.html with 100% similarity]
LayoutTests/security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html [moved from LayoutTests/media/video-with-file-url-blocked-by-csp-media-src-star.html with 88% similarity]
LayoutTests/security/contentSecurityPolicy/worker-inherits-blocks-eval-expected.txt [moved from LayoutTests/fast/workers/worker-inherits-csp-blocks-eval-expected.txt with 100% similarity]
LayoutTests/security/contentSecurityPolicy/worker-inherits-blocks-eval.html [moved from LayoutTests/fast/workers/worker-inherits-csp-blocks-eval.html with 92% similarity]
LayoutTests/security/contentSecurityPolicy/worker-inherits-blocks-xhr-expected.txt [moved from LayoutTests/fast/workers/worker-inherits-csp-blocks-xhr-expected.txt with 100% similarity]
LayoutTests/security/contentSecurityPolicy/worker-inherits-blocks-xhr.html [moved from LayoutTests/fast/workers/worker-inherits-csp-blocks-xhr.html with 92% similarity]

index 243c504..4def983 100644 (file)
@@ -1,3 +1,56 @@
+2016-06-16  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Move most of CSP tests into security/contentSecurityPolicy/
+        https://bugs.webkit.org/show_bug.cgi?id=158859
+
+        Reviewed by Daniel Bates.
+
+        * platform/mac-wk1/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/wk2/TestExpectations:
+        * security/contentSecurityPolicy/blocks-video-expected.txt: Renamed from LayoutTests/media/csp-blocks-video-expected.txt.
+        * security/contentSecurityPolicy/blocks-video.html: Renamed from LayoutTests/media/csp-blocks-video.html.
+        * security/contentSecurityPolicy/font-loading-block-all-expected.txt: Renamed from LayoutTests/fast/text/font-loading-csp-block-all-expected.txt.
+        * security/contentSecurityPolicy/font-loading-block-all.html: Renamed from LayoutTests/fast/text/font-loading-csp-block-all.html.
+        * security/contentSecurityPolicy/image-with-blob-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
+        * security/contentSecurityPolicy/image-with-blob-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
+        * security/contentSecurityPolicy/image-with-blob-url-blocked-by-img-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-blocked-by-csp-img-src-star-expected.html.
+        * security/contentSecurityPolicy/image-with-blob-url-blocked-by-img-src-star.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-blob-url-blocked-by-csp-img-src-star.html.
+        * security/contentSecurityPolicy/image-with-data-url-allowed-by-img-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-data-url-allowed-by-csp-img-src-star-expected.html.
+        * security/contentSecurityPolicy/image-with-data-url-allowed-by-img-src-star.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-data-url-allowed-by-csp-img-src-star.html.
+        * security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
+        * security/contentSecurityPolicy/image-with-file-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
+        * security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-blocked-by-csp-img-src-star-expected.html.
+        * security/contentSecurityPolicy/image-with-file-url-blocked-by-img-src-star.html: Renamed from LayoutTests/fast/dom/HTMLImageElement/image-with-file-url-blocked-by-csp-img-src-star.html.
+        * security/contentSecurityPolicy/link-with-blob-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
+        * security/contentSecurityPolicy/link-with-blob-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
+        * security/contentSecurityPolicy/link-with-blob-url-blocked-by-style-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-blocked-by-csp-style-src-star-expected.html.
+        * security/contentSecurityPolicy/link-with-blob-url-blocked-by-style-src-star.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-blob-url-blocked-by-csp-style-src-star.html.
+        * security/contentSecurityPolicy/link-with-data-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
+        * security/contentSecurityPolicy/link-with-data-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
+        * security/contentSecurityPolicy/link-with-data-url-blocked-by-style-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-blocked-by-csp-style-src-star-expected.html.
+        * security/contentSecurityPolicy/link-with-data-url-blocked-by-style-src-star.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-data-url-blocked-by-csp-style-src-star.html.
+        * security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
+        * security/contentSecurityPolicy/link-with-file-url-allowed-by-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-allowed-by-csp-style-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
+        * security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star-expected.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-blocked-by-csp-style-src-star-expected.html.
+        * security/contentSecurityPolicy/link-with-file-url-blocked-by-style-src-star.html: Renamed from LayoutTests/fast/dom/HTMLLinkElement/link-with-file-url-blocked-by-csp-style-src-star.html.
+        * security/contentSecurityPolicy/resources/worker-inherits-blocks-eval.js: Renamed from LayoutTests/fast/workers/resources/worker-inherits-csp-blocks-eval.js.
+        (catch):
+        * security/contentSecurityPolicy/resources/worker-inherits-blocks-xhr.js: Renamed from LayoutTests/fast/workers/resources/worker-inherits-csp-blocks-xhr.js.
+        (catch):
+        * security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star-expected.html: Renamed from LayoutTests/media/video-with-blob-url-allowed-by-csp-media-src-star-expected.html.
+        * security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star.html: Renamed from LayoutTests/media/video-with-blob-url-allowed-by-csp-media-src-star.html.
+        * security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star-expected.html: Renamed from LayoutTests/media/video-with-data-url-allowed-by-csp-media-src-star-expected.html.
+        * security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star.html: Renamed from LayoutTests/media/video-with-data-url-allowed-by-csp-media-src-star.html.
+        * security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html: Renamed from LayoutTests/media/video-with-file-url-allowed-by-csp-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled-expected.html.
+        * security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html: Renamed from LayoutTests/media/video-with-file-url-allowed-by-csp-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html.
+        * security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star-expected.html: Renamed from LayoutTests/media/video-with-file-url-blocked-by-csp-media-src-star-expected.html.
+        * security/contentSecurityPolicy/video-with-file-url-blocked-by-media-src-star.html: Renamed from LayoutTests/media/video-with-file-url-blocked-by-csp-media-src-star.html.
+        * security/contentSecurityPolicy/worker-inherits-blocks-eval-expected.txt: Renamed from LayoutTests/fast/workers/worker-inherits-csp-blocks-eval-expected.txt.
+        * security/contentSecurityPolicy/worker-inherits-blocks-eval.html: Renamed from LayoutTests/fast/workers/worker-inherits-csp-blocks-eval.html.
+        * security/contentSecurityPolicy/worker-inherits-blocks-xhr-expected.txt: Renamed from LayoutTests/fast/workers/worker-inherits-csp-blocks-xhr-expected.txt.
+        * security/contentSecurityPolicy/worker-inherits-blocks-xhr.html: Renamed from LayoutTests/fast/workers/worker-inherits-csp-blocks-xhr.html.
+
 2016-06-16  Simon Fraser  <simon.fraser@apple.com>
 
         Focus event dispatched in iframe causes parent document to scroll incorrectly
index 07cf4a3..ac5182f 100644 (file)
@@ -60,8 +60,8 @@ webkit.org/b/153460 [ Debug ] inspector/codemirror/prettyprinting-css-rules.html
 
 webkit.org/b/154297 [ Debug ] fast/events/keydown-1.html [ Pass Failure ]
 
-webkit.org/b/155196 media/video-with-blob-url-allowed-by-csp-media-src-star.html [ Skip ]
-webkit.org/b/155196 media/video-with-data-url-allowed-by-csp-media-src-star.html [ Skip ]
+webkit.org/b/155196 security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star.html [ Skip ]
+webkit.org/b/155196 security/contentSecurityPolicy/video-with-data-url-allowed-by-media-src-star.html [ Skip ]
 
 webkit.org/b/153143 [ Yosemite ] media/track/track-in-band-style.html [ Pass Crash ]
 
index 71ab698..bf10ffa 100644 (file)
@@ -1355,7 +1355,7 @@ webkit.org/b/156983 media/video-fullscreen-restriction-removed.html [ Pass Failu
 
 webkit.org/b/156320 fast/regions/inline-block-inside-anonymous-overflow.html [ ImageOnlyFailure ]
 
-webkit.org/b/155196 media/video-with-file-url-allowed-by-csp-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [ Skip ]
+webkit.org/b/155196 security/contentSecurityPolicy/video-with-file-url-allowed-by-media-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html [ Skip ]
 
 webkit.org/b/158101 imported/blink/http/tests/plugins/get-url-notify-on-removal.html [ Pass Timeout ]
 
index ea60473..9321917 100644 (file)
@@ -621,8 +621,6 @@ platform/mac/fast/events/objc-event-api.html
 # https://bugs.webkit.org/show_bug.cgi?id=64285
 editing/pasteboard/file-drag-to-editable.html
 editing/pasteboard/file-input-files-access.html
-fast/dom/HTMLImageElement/image-with-blob-url-blocked-by-csp-img-src-star.html
-fast/dom/HTMLImageElement/image-with-blob-url-allowed-by-csp-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html
 fast/dom/Window/window-postmessage-clone-frames.html
 fast/dom/Window/window-postmessage-clone.html
 fast/events/data-transfer-files-attribute-identity.html
@@ -677,8 +675,10 @@ http/tests/local/formdata/upload-events.html
 http/tests/security/clipboard/clipboard-file-access.html
 imported/blink/storage/indexeddb/blob-basics-metadata.html
 imported/blink/storage/indexeddb/empty-blob-file.html
-media/video-with-blob-url-allowed-by-csp-media-src-star.html
 media/video-src-blob.html
+security/contentSecurityPolicy/image-with-blob-url-allowed-by-img-src-star-with-AllowContentSecurityPolicySourceStarToMatchAnyProtocol-enabled.html
+security/contentSecurityPolicy/image-with-blob-url-blocked-by-img-src-star.html
+security/contentSecurityPolicy/video-with-blob-url-allowed-by-media-src-star.html
 storage/indexeddb/structured-clone.html
 storage/indexeddb/structured-clone-private.html
 
@@ -1,10 +1,10 @@
 <meta http-equiv="Content-Security-Policy" content="media-src 'none'">
 <video controls></video>
-<script src=media-file.js></script>
-<script src=video-test.js></script>
+<script src=../../media/media-file.js></script>
+<script src=../../media/video-test.js></script>
 <p>This test passes if it doesn't alert failure.</p>
 <script>
-var mediaFile = findMediaFile("video", "content/test");
+var mediaFile = "../../media/" + findMediaFile("video", "content/test");
 video.src = mediaFile;
 
 waitForEvent('loadedmetadata', function () { 
@@ -2,6 +2,6 @@
 <html>
 <body>
 <p>This tests that loading image with a blob URL is allowed when the page has Content Security Policy &quot;image-src *&quot; and the WebKit setting AllowContentSecurityPolicySourceStarToMatchAnyProtocol is enabled. To run this test by hand, select an image file. This test PASSED if the image loads. Otherwise, it FAILED.</p>
-<img width="128" height="128" src="../resources/abe.png">
+<img width="128" height="128" src="../../fast/dom/resources/abe.png">
 </body>
 </html>
@@ -37,7 +37,7 @@ function runTest()
     var x = fileInput.offsetLeft + fileInput.offsetWidth / 2;
     var y = fileInput.offsetTop + fileInput.offsetHeight / 2;
 
-    eventSender.beginDragWithFiles(["../resources/abe.png"]);
+    eventSender.beginDragWithFiles(["../../fast/dom/resources/abe.png"]);
     eventSender.mouseMoveTo(x, y);
     eventSender.mouseUp();
 }
@@ -2,6 +2,6 @@
 <html>
 <body>
 <p>This tests that loading image with a file URL is allowed when the page has Content Security Policy &quot;image-src *&quot; and the WebKit setting AllowContentSecurityPolicySourceStarToMatchAnyProtocol is enabled. This test PASSED if you see a green square below. Otherwise, it FAILED.</p>
-<img src="resources/green.png" width="128" height="128">
+<img src="../../fast/dom/HTMLImageElement/resources/green.png" width="128" height="128">
 </body>
 </html>
@@ -9,6 +9,6 @@ if (window.internals && window.internals.settings)
 </head>
 <body>
 <p>This tests that loading image with a file URL is allowed when the page has Content Security Policy &quot;image-src *&quot; and the WebKit setting AllowContentSecurityPolicySourceStarToMatchAnyProtocol is enabled. This test PASSED if you see a green square below. Otherwise, it FAILED.</p>
-<img src="resources/green.png" width="128" height="128" alt="FAIL">
+<img src="../../fast/dom/HTMLImageElement/resources/green.png" width="128" height="128" alt="FAIL">
 </body>
 </html>
@@ -13,7 +13,7 @@
 if (window.internals && window.internals.settings)
     internals.settings.setAllowContentSecurityPolicySourceStarToMatchAnyProtocol(true);
 </script>
-<link rel="stylesheet" href="resources/green-background-color.css">
+<link rel="stylesheet" href="../../fast/dom/HTMLLinkElement/resources/green-background-color.css">
 </head>
 <body>
 <p>This tests that loading a stylesheet with a file URL is allowed when the page has Content Security Policy &quot;style-src *&quot; and the WebKit setting AllowContentSecurityPolicySourceStarToMatchAnyProtocol is enabled. This test PASSED if you see a green square below. Otherwise, it FAILED.</p>
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Security-Policy" content="media-src *">
-<script src="media-file.js"></script>
+<script src="../../media/media-file.js"></script>
 <script>
 if (window.testRunner)
     testRunner.waitUntilDone();
@@ -34,7 +34,7 @@ function runTest()
     var x = fileInput.offsetLeft + fileInput.offsetWidth / 2;
     var y = fileInput.offsetTop + fileInput.offsetHeight / 2;
 
-    eventSender.beginDragWithFiles([findMediaFile("video", "content/test")]);
+    eventSender.beginDragWithFiles(["../../media/" + findMediaFile("video", "content/test")]);
     eventSender.mouseMoveTo(x, y);
     eventSender.mouseUp();
 }
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="media-file.js"></script>
+<script src="../../media/media-file.js"></script>
 <script>
 if (window.testRunner)
     testRunner.waitUntilDone();
@@ -20,7 +20,7 @@ window.onload = function ()
         window.setTimeout(testFinished, 0);
     }
     video.onerror = testFinished;
-    video.src = findMediaFile("video", "content/test");
+    video.src = "../../media/" + findMediaFile("video", "content/test");
 }
 </script>
 </head>
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Security-Policy" content="media-src *">
-<script src="media-file.js"></script>
+<script src="../../media/media-file.js"></script>
 <script>
 if (window.testRunner)
     testRunner.waitUntilDone();
@@ -24,7 +24,7 @@ window.onload = function ()
         window.setTimeout(testFinished, 0);
     }
     video.onerror = testFinished;
-    video.src = findMediaFile("video", "content/test");
+    video.src = "../../media/" + findMediaFile("video", "content/test");
 }
 </script>
 </head>
@@ -9,7 +9,7 @@ video {
     height: 128px;
 }
 </style>
-<script src="media-file.js"></script>
+<script src="../../media/media-file.js"></script>
 <script>
 if (window.testRunner)
     testRunner.waitUntilDone();
@@ -28,7 +28,7 @@ window.onload = function ()
         window.setTimeout(testFinished, 0);
     }
     video.onerror = testFinished;
-    video.src = findMediaFile("video", "content/test");
+    video.src = "../../media/" + findMediaFile("video", "content/test");
 }
 </script>
 </head>
@@ -22,7 +22,7 @@ window.onmessage = function (event)
 
 var worker;
 try {
-    worker = new Worker("resources/worker-inherits-csp-blocks-eval.js");
+    worker = new Worker("resources/worker-inherits-blocks-eval.js");
     worker.onmessage = function (event) { window.postMessage(event.data, "*") };
 } catch (exception) {
     window.postMessage("FAIL should not have thrown an exception when creating worker. Threw exception " + exception + ".", "*");
@@ -22,7 +22,7 @@ window.onmessage = function (event)
 
 var worker;
 try {
-    worker = new Worker("resources/worker-inherits-csp-blocks-xhr.js");
+    worker = new Worker("resources/worker-inherits-blocks-xhr.js");
     worker.onmessage = function (event) { window.postMessage(event.data, "*") };
 } catch (exception) {
     window.postMessage("FAIL should not have thrown an exception when creating worker. Threw exception " + exception + ".", "*");