Move non-chrome-specific web tests to external/wpt

Bug: 935025 Change-Id: Iab1b70463d9d6fe5a5104520160b392f5f17e9de Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1504000Reviewed-by: Brandon Jones <bajones@chromium.org> Commit-Queue: Piotr Bialecki <bialpio@chromium.org> Cr-Commit-Position: refs/heads/master@{#638245}

Move non-chrome-specific web tests to external/wpt
Bug: 935025 Change-Id: Iab1b70463d9d6fe5a5104520160b392f5f17e9de Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1504000Reviewed-by: Brandon Jones <bajones@chromium.org> Commit-Queue: Piotr Bialecki <bialpio@chromium.org> Cr-Commit-Position: refs/heads/master@{#638245}
c881b084 · Piotr Bialecki · Commit Bot · 90832ad1 · c881b084 · c881b084
Commit c881b084 authored Mar 06, 2019 by Piotr Bialecki Committed by Commit Bot Mar 06, 2019
28 changed files
--- a/third_party/blink/web_tests/README
+++ b/third_party/blink/web_tests/README
+This folder is for Chrome-specific tests only. Tests that should work across
+browsers should be placed in third_party/blink/web_tests/external/wpt.
+For more information about blink tests in general, please see:
+https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_tests.md
+For more information about web platform tests, please see:
+https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_platform_tests.md
--- a/third_party/blink/web_tests/xr/resources/xr-test-asserts.js
+++ b/third_party/blink/web_tests/xr/resources/xr-test-asserts.js
--- a/third_party/blink/web_tests/xr/resources/test-constants.js
+++ b/third_party/blink/web_tests/xr/resources/test-constants.js
--- a/third_party/blink/web_tests/xr/xrRay_constructor.html
+++ b/third_party/blink/web_tests/xr/xrRay_constructor.html
 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
+<script src="/resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharnessreport.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
+<script src="resources/webxr_test_constants.js"></script>
-<script src="../xr/resources/xr-test-asserts.js"></script>
+<script src="resources/webxr_test_asserts.js"></script>
 <script>

--- a/third_party/blink/web_tests/xr/xrRay_matrix.html
+++ b/third_party/blink/web_tests/xr/xrRay_matrix.html
 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
+<script src="/resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharnessreport.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
+<script src="resources/webxr_test_constants.js"></script>
-<script src="../xr/resources/xr-test-asserts.js"></script>
+<script src="resources/webxr_test_asserts.js"></script>
 <script>

--- a/third_party/blink/web_tests/xr/xrRigidTransform_constructor.html
+++ b/third_party/blink/web_tests/xr/xrRigidTransform_constructor.html
 <!DOCTYPE html>
-<script src="../resources/testharness.js"></script>
+<script src="/resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
+<script src="/resources/testharnessreport.js"></script>
-<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
+<script src="resources/webxr_util.js"></script>
-<script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
+<script src="resources/webxr_test_constants.js"></script>
-<script src="../external/wpt/resources/chromium/webxr-test.js"></script>
-<script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>
 let testName = "XRRigidTransform constructor works";
 let fakeDeviceInitParams = { supportsImmersive: true };
-let requestSessionOptions =  [{ mode: 'immersive-vr' }];
+let requestSessionOptions =  { mode: 'immersive-vr' };
 let testFunction =
-  (session, t, fakeDeviceController) => new Promise((resolve, reject) => {
+  (session, fakeDeviceController, t) => new Promise((resolve, reject) => {
  let coordDict = function(coords) {
    let tempDict = {
        x : coords[0],
@@ -110,7 +107,7 @@ let testFunction =
  resolve();
 });
-xr_session_promise_test(
+xr_session_promise_test(testName, testFunction, fakeDeviceInitParams,
-  testFunction, fakeDeviceInitParams, requestSessionOptions, testName);
+  requestSessionOptions);
 </script>
--- a/third_party/blink/web_tests/xr/ar_hittest.html
+++ b/third_party/blink/web_tests/xr/ar_hittest.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/events_session_resetpose.html
+++ b/third_party/blink/web_tests/xr/events_session_resetpose.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/events_session_select.html
+++ b/third_party/blink/web_tests/xr/events_session_select.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/events_session_select_subframe.html
+++ b/third_party/blink/web_tests/xr/events_session_select_subframe.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/getInputPose_hand.html
+++ b/third_party/blink/web_tests/xr/getInputPose_hand.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/getInputPose_ray.html
+++ b/third_party/blink/web_tests/xr/getInputPose_ray.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrFrame_getPose.html
+++ b/third_party/blink/web_tests/xr/xrFrame_getPose.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrInputSource_add_remove.html
+++ b/third_party/blink/web_tests/xr/xrInputSource_add_remove.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrSession_environmentBlendMode.html
+++ b/third_party/blink/web_tests/xr/xrSession_environmentBlendMode.html
@@ -5,7 +5,6 @@
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrSession_requestAnimationFrame_timestamp.html
+++ b/third_party/blink/web_tests/xr/xrSession_requestAnimationFrame_timestamp.html
@@ -4,8 +4,8 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrStationaryReferenceSpace_floorlevel_updates.html
+++ b/third_party/blink/web_tests/xr/xrStationaryReferenceSpace_floorlevel_updates.html
@@ -4,9 +4,9 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrView_match.html
+++ b/third_party/blink/web_tests/xr/xrView_match.html
@@ -4,8 +4,8 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrView_oneframeupdate.html
+++ b/third_party/blink/web_tests/xr/xrView_oneframeupdate.html
@@ -4,8 +4,8 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrViewport_valid.html
+++ b/third_party/blink/web_tests/xr/xrViewport_valid.html
@@ -4,8 +4,8 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrWebGLLayer_constructor.html
+++ b/third_party/blink/web_tests/xr/xrWebGLLayer_constructor.html
@@ -5,7 +5,6 @@
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrWebGLLayer_dirty_framebuffer.html
+++ b/third_party/blink/web_tests/xr/xrWebGLLayer_dirty_framebuffer.html
@@ -6,7 +6,6 @@
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
 <script src="../xr/resources/xr-internal-device-mocking.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrWebGLLayer_framebuffer_draw.html
+++ b/third_party/blink/web_tests/xr/xrWebGLLayer_framebuffer_draw.html
@@ -5,7 +5,6 @@
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrWebGLLayer_framebuffer_scale.html
+++ b/third_party/blink/web_tests/xr/xrWebGLLayer_framebuffer_scale.html
@@ -4,8 +4,8 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrWebGLLayer_incompatible_device.html
+++ b/third_party/blink/web_tests/xr/xrWebGLLayer_incompatible_device.html
@@ -5,7 +5,6 @@
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrWebGLLayer_non_exclusive_adjust_size.html
+++ b/third_party/blink/web_tests/xr/xrWebGLLayer_non_exclusive_adjust_size.html
@@ -5,7 +5,6 @@
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrWebGLLayer_opaque_framebuffer.html
+++ b/third_party/blink/web_tests/xr/xrWebGLLayer_opaque_framebuffer.html
@@ -5,7 +5,6 @@
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>

--- a/third_party/blink/web_tests/xr/xrWebGLLayer_viewport_scale.html
+++ b/third_party/blink/web_tests/xr/xrWebGLLayer_viewport_scale.html
@@ -4,8 +4,8 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/device/vr/public/mojom/vr_service.mojom.js"></script>
 <script src="../external/wpt/resources/chromium/webxr-test.js"></script>
+<script src="../external/wpt/webxr/resources/webxr_test_constants.js"></script>
 <script src="../xr/resources/xr-test-utils.js"></script>
-<script src="../xr/resources/test-constants.js"></script>
 <canvas id="webgl-canvas"></canvas>
 <script>