Fix partial issues from web-platform-tests#10198 (web-platform-tests#…

…10962) - `if (testRunner)` should be `if (window.testRunner)` - Use String to pass sensor object param to avoid undefined error
akjk-org · Jun 14, 2018 · 7cbefa7 · 7cbefa7
1 parent 55c9a77
commit 7cbefa7
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 19 deletions.
diff --git a/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html b/ambient-light/AmbientLightSensor-disabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_disabled(AmbientLightSensor);
+run_fp_tests_disabled('AmbientLightSensor');
 </script>
 </body>
diff --git a/...-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/...-light/AmbientLightSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute_redirect_on_load(AmbientLightSensor);
+run_fp_tests_enabled_by_attribute_redirect_on_load('AmbientLightSensor');
 </script>
 </body>
diff --git a/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html b/ambient-light/AmbientLightSensor-enabled-by-feature-policy-attribute.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute(AmbientLightSensor);
+run_fp_tests_enabled_by_attribute('AmbientLightSensor');
 </script>
 </body>
diff --git a/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html b/ambient-light/AmbientLightSensor-enabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled(AmbientLightSensor);
+run_fp_tests_enabled('AmbientLightSensor');
 </script>
 </body>
diff --git a/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html b/ambient-light/AmbientLightSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_on_self_origin(AmbientLightSensor);
+run_fp_tests_enabled_on_self_origin('AmbientLightSensor');
 </script>
 </body>
diff --git a/ambient-light/AmbientLightSensor.https.html b/ambient-light/AmbientLightSensor.https.html
@@ -9,6 +9,6 @@
 <div id="log"></div>
 <script>
 
-runGenericSensorTests(AmbientLightSensor);
+runGenericSensorTests('AmbientLightSensor');
 
 </script>
diff --git a/ambient-light/AmbientLightSensor_onerror-manual.https.html b/ambient-light/AmbientLightSensor_onerror-manual.https.html
@@ -15,6 +15,6 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorOnerror(AmbientLightSensor);
+runGenericSensorOnerror('AmbientLightSensor');
 
 </script>
diff --git a/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html b/geolocation-sensor/GeolocationSensor-disabled-by-feature-policy.https.html
@@ -8,7 +8,7 @@
 <script>
 "use strict";
 
-run_fp_tests_disabled(GeolocationSensor);
+run_fp_tests_disabled('GeolocationSensor');
 
 promise_test(async t => {
   await promise_rejects(t, 'SecurityError', GeolocationSensor.read());

diff --git a/...-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/...-sensor/GeolocationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute_redirect_on_load(GeolocationSensor);
+run_fp_tests_enabled_by_attribute_redirect_on_load('GeolocationSensor');
 </script>
 </body>
diff --git a/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html b/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy-attribute.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute(GeolocationSensor);
+run_fp_tests_enabled_by_attribute('GeolocationSensor');
 </script>
 </body>
diff --git a/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html b/geolocation-sensor/GeolocationSensor-enabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled(GeolocationSensor);
+run_fp_tests_enabled('GeolocationSensor');
 </script>
 </body>
diff --git a/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html b/geolocation-sensor/GeolocationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_on_self_origin(GeolocationSensor);
+run_fp_tests_enabled_on_self_origin('GeolocationSensor');
 </script>
 </body>
diff --git a/geolocation-sensor/GeolocationSensor.https.html b/geolocation-sensor/GeolocationSensor.https.html
@@ -8,6 +8,6 @@
 <script src="/generic-sensor/generic-sensor-tests.js"></script>
 <script>
 
-runGenericSensorTests(GeolocationSensor);
+runGenericSensorTests('GeolocationSensor');
 
 </script>
diff --git a/geolocation-sensor/GeolocationSensor_onerror-manual.https.html b/geolocation-sensor/GeolocationSensor_onerror-manual.https.html
@@ -14,6 +14,6 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorOnerror(GeolocationSensor);
+runGenericSensorOnerror('GeolocationSensor');
 
 </script>
diff --git a/proximity/ProximitySensor.https.html b/proximity/ProximitySensor.https.html
@@ -9,6 +9,6 @@
 <div id="log"></div>
 <script>
 
-runGenericSensorTests(ProximitySensor);
+runGenericSensorTests('ProximitySensor');
 
 </script>
diff --git a/proximity/ProximitySensor_onerror-manual.https.html b/proximity/ProximitySensor_onerror-manual.https.html
@@ -15,6 +15,6 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorOnerror(ProximitySensor);
+runGenericSensorOnerror('ProximitySensor');
 
 </script>
diff --git a/resources/chromium/generic_sensor_mocks.js b/resources/chromium/generic_sensor_mocks.js
@@ -201,11 +201,11 @@ var GenericSensorTest = (() => {
       if (testInternal.initialized)
         throw new Error('Call reset() before initialize().');
 
-      if (testRunner) { // Grant sensor permissions for Chromium testrunner.
+      if (window.testRunner) { // Grant sensor permissions for Chromium testrunner.
         ['accelerometer', 'gyroscope',
          'magnetometer', 'ambient-light-sensor'].forEach((entry) => {
-          testRunner.setPermission(entry, 'granted',
-                                   location.origin, location.origin);
+          window.testRunner.setPermission(entry, 'granted',
+                                          location.origin, location.origin);
         });
       }