Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js

Issue 1948033003: Convert most geolocation layout tests to use a JS mock implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-disconnect
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js
index 0d53f8ae110cdcb72422d130dd6452bbbf4c60f1..95a3daacaed4c23621574253691fa90717391534 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js
+++ b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-success.js
@@ -4,52 +4,52 @@ var mockLatitude = 51.478;
var mockLongitude = -0.166;
var mockAccuracy = 100.0;
-if (!window.testRunner || !window.internals)
- debug('This test can not run without testRunner or internals');
-
-internals.setGeolocationClientMock(document);
-internals.setGeolocationPermission(document, true);
-internals.setGeolocationPosition(document,
- mockLatitude,
- mockLongitude,
- mockAccuracy);
+if (!window.testRunner || !window.mojo)
+ debug('This test can not run without testRunner or mojo');
var position;
-var successCallbackInvoked = false;
-navigator.geolocation.getCurrentPosition(function(p) {
- if (successCallbackInvoked) {
- testFailed('Success callback invoked unexpectedly');
- finishJSTest();
- }
- successCallbackInvoked = true;
-
- position = p;
- shouldBe('position.coords.latitude', 'mockLatitude');
- shouldBe('position.coords.longitude', 'mockLongitude');
- shouldBe('position.coords.accuracy', 'mockAccuracy');
- debug('');
- continueTest();
-}, function(e) {
- testFailed('Error callback invoked unexpectedly');
- finishJSTest();
-});
-function continueTest() {
- internals.setGeolocationPosition(document,
- ++mockLatitude,
- ++mockLongitude,
- ++mockAccuracy);
+geolocationServiceMock.then(mock => {
+ mock.setGeolocationPermission(true);
+ mock.setGeolocationPosition(mockLatitude,
+ mockLongitude,
+ mockAccuracy);
+ var successCallbackInvoked = false;
navigator.geolocation.getCurrentPosition(function(p) {
+ if (successCallbackInvoked) {
+ testFailed('Success callback invoked unexpectedly');
+ finishJSTest();
+ }
+ successCallbackInvoked = true;
+
position = p;
shouldBe('position.coords.latitude', 'mockLatitude');
shouldBe('position.coords.longitude', 'mockLongitude');
shouldBe('position.coords.accuracy', 'mockAccuracy');
- finishJSTest();
+ debug('');
+ continueTest();
}, function(e) {
testFailed('Error callback invoked unexpectedly');
finishJSTest();
});
-}
+
+ function continueTest() {
+ mock.setGeolocationPosition(++mockLatitude,
+ ++mockLongitude,
+ ++mockAccuracy);
+
+ navigator.geolocation.getCurrentPosition(function(p) {
+ position = p;
+ shouldBe('position.coords.latitude', 'mockLatitude');
+ shouldBe('position.coords.longitude', 'mockLongitude');
+ shouldBe('position.coords.accuracy', 'mockAccuracy');
+ finishJSTest();
+ }, function(e) {
+ testFailed('Error callback invoked unexpectedly');
+ finishJSTest();
+ });
+ }
+});
window.jsTestIsAsync = true;

Powered by Google App Engine
This is Rietveld 408576698