mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 14:55:47 +00:00
Bug 1143628 - Part 1: Remove wrapDomRequestAsPromise defined in MobileMessage marionette test. r=bevis
This commit is contained in:
parent
8a7c1130d3
commit
2d62092c4f
@ -110,33 +110,6 @@ function waitForManagerEvent(aEventName, aMatchFunc) {
|
||||
return deferred.promise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Wrap DOMRequest onsuccess/onerror events to Promise resolve/reject.
|
||||
*
|
||||
* Fulfill params: A DOMEvent.
|
||||
* Reject params: A DOMEvent.
|
||||
*
|
||||
* @param aRequest
|
||||
* A DOMRequest instance.
|
||||
*
|
||||
* @return A deferred promise.
|
||||
*/
|
||||
function wrapDomRequestAsPromise(aRequest) {
|
||||
let deferred = Promise.defer();
|
||||
|
||||
ok(aRequest instanceof DOMRequest,
|
||||
"aRequest is instanceof " + aRequest.constructor);
|
||||
|
||||
aRequest.addEventListener("success", function(aEvent) {
|
||||
deferred.resolve(aEvent);
|
||||
});
|
||||
aRequest.addEventListener("error", function(aEvent) {
|
||||
deferred.reject(aEvent);
|
||||
});
|
||||
|
||||
return deferred.promise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a SMS message to a single receiver. Resolve if it succeeds, reject
|
||||
* otherwise.
|
||||
@ -153,10 +126,7 @@ function wrapDomRequestAsPromise(aRequest) {
|
||||
* @return A deferred promise.
|
||||
*/
|
||||
function sendSmsWithSuccess(aReceiver, aText) {
|
||||
let request = manager.send(aReceiver, aText);
|
||||
return wrapDomRequestAsPromise(request)
|
||||
.then((aEvent) => { return aEvent.target.result; },
|
||||
(aEvent) => { throw aEvent.target.error; });
|
||||
return manager.send(aReceiver, aText);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -180,11 +150,9 @@ function sendSmsWithFailure(aReceiver, aText) {
|
||||
let promises = [];
|
||||
promises.push(waitForManagerEvent("failed")
|
||||
.then((aEvent) => { return aEvent.message; }));
|
||||
|
||||
let request = manager.send(aReceiver, aText);
|
||||
promises.push(wrapDomRequestAsPromise(request)
|
||||
.then((aEvent) => { throw aEvent; },
|
||||
(aEvent) => { return aEvent.target.error; }));
|
||||
promises.push(manager.send(aReceiver, aText)
|
||||
.then((aResult) => { throw aResult; },
|
||||
(aError) => { return aError; }));
|
||||
|
||||
return Promise.all(promises)
|
||||
.then((aResults) => { return { message: aResults[0],
|
||||
@ -213,11 +181,9 @@ function sendMmsWithFailure(aMmsParameters, aSendParameters) {
|
||||
let promises = [];
|
||||
promises.push(waitForManagerEvent("failed")
|
||||
.then((aEvent) => { return aEvent.message; }));
|
||||
|
||||
let request = manager.sendMMS(aMmsParameters, aSendParameters);
|
||||
promises.push(wrapDomRequestAsPromise(request)
|
||||
.then((aEvent) => { throw aEvent; },
|
||||
(aEvent) => { return aEvent.target.error; }));
|
||||
promises.push(manager.sendMMS(aMmsParameters, aSendParameters)
|
||||
.then((aResult) => { throw aResult; },
|
||||
(aError) => { return aError; }));
|
||||
|
||||
return Promise.all(promises)
|
||||
.then((aResults) => { return { message: aResults[0],
|
||||
@ -237,9 +203,7 @@ function sendMmsWithFailure(aMmsParameters, aSendParameters) {
|
||||
* @return A deferred promise.
|
||||
*/
|
||||
function getMessage(aId) {
|
||||
let request = manager.getMessage(aId);
|
||||
return wrapDomRequestAsPromise(request)
|
||||
.then((aEvent) => { return aEvent.target.result; });
|
||||
return manager.getMessage(aId);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -371,14 +335,12 @@ function deleteMessagesById(aMessageIds) {
|
||||
|
||||
let promises = [];
|
||||
promises.push(waitForManagerEvent("deleted"));
|
||||
|
||||
let request = manager.delete(aMessageIds);
|
||||
promises.push(wrapDomRequestAsPromise(request));
|
||||
promises.push(manager.delete(aMessageIds));
|
||||
|
||||
return Promise.all(promises)
|
||||
.then((aResults) => {
|
||||
return { deletedInfo: aResults[0],
|
||||
deletedFlags: aResults[1].target.result };
|
||||
deletedFlags: aResults[1] };
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -13,10 +13,9 @@ function getNonExistentMsg(aId) {
|
||||
return getMessage(aId)
|
||||
.then(function onresolve() {
|
||||
ok(false, "request succeeded when tried to get non-existent sms");
|
||||
}, function onreject(aEvent) {
|
||||
let error = aEvent.target.error;
|
||||
ok(error, "DOMError");
|
||||
is(error.name, "NotFoundError", "error.name");
|
||||
}, function onreject(aError) {
|
||||
ok(aError, "DOMError");
|
||||
is(aError.name, "NotFoundError", "error.name");
|
||||
});
|
||||
}
|
||||
|
||||
@ -27,10 +26,9 @@ function getMsgInvalidId(aId) {
|
||||
.then(function onresolve() {
|
||||
ok(false, "request succeeded when tried to get message with " +
|
||||
"invalid id (id: " + aId + ").");
|
||||
}, function onreject(aEvent) {
|
||||
let error = aEvent.target.error;
|
||||
ok(error, "DOMError");
|
||||
is(error.name, "NotFoundError", "error.name");
|
||||
}, function onreject(aError) {
|
||||
ok(aError, "DOMError");
|
||||
is(aError.name, "NotFoundError", "error.name");
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -13,16 +13,14 @@ function test(text, segments, charsPerSegment, charsAvailableInLastSegment) {
|
||||
let domRequest = manager.getSegmentInfoForText(text);
|
||||
ok(domRequest, "DOMRequest object returned.");
|
||||
|
||||
return wrapDomRequestAsPromise(domRequest)
|
||||
.then(function(aEvent) {
|
||||
let result = aEvent.target.result;
|
||||
ok(result, "aEvent.target.result = " + JSON.stringify(result));
|
||||
return domRequest.then(function(aResult) {
|
||||
ok(aResult, "result = " + JSON.stringify(aResult));
|
||||
|
||||
is(result.segments, segments, "result.segments");
|
||||
is(result.charsPerSegment, charsPerSegment, "result.charsPerSegment");
|
||||
is(result.charsAvailableInLastSegment, charsAvailableInLastSegment,
|
||||
"result.charsAvailableInLastSegment");
|
||||
});
|
||||
is(aResult.segments, segments, "result.segments");
|
||||
is(aResult.charsPerSegment, charsPerSegment, "result.charsPerSegment");
|
||||
is(aResult.charsAvailableInLastSegment, charsAvailableInLastSegment,
|
||||
"result.charsAvailableInLastSegment");
|
||||
});
|
||||
}
|
||||
|
||||
startTestCommon(function() {
|
||||
|
@ -103,24 +103,22 @@ function doSingleRequest(aRequest, aReceiver, aBody, aNow) {
|
||||
sentGot = true;
|
||||
}));
|
||||
|
||||
promises.push(wrapDomRequestAsPromise(aRequest)
|
||||
.then(function(aEvent) {
|
||||
log(" onsuccess event for '" + aReceiver + "' received.");
|
||||
promises.push(aRequest.then(function(aResult) {
|
||||
log(" onsuccess event for '" + aReceiver + "' received.");
|
||||
|
||||
let message = aEvent.target.result;
|
||||
checkMessage(message, "sent", aBody);
|
||||
// Should be mostly identical to sendingMessage.
|
||||
is(message.id, sendingMessage.id, "message.id");
|
||||
is(message.receiver, sendingMessage.receiver, "message.receiver");
|
||||
is(message.body, sendingMessage.body, "message.body");
|
||||
is(message.timestamp, sendingMessage.timestamp, "message.timestamp");
|
||||
checkMessage(aResult, "sent", aBody);
|
||||
// Should be mostly identical to sendingMessage.
|
||||
is(aResult.id, sendingMessage.id, "message.id");
|
||||
is(aResult.receiver, sendingMessage.receiver, "message.receiver");
|
||||
is(aResult.body, sendingMessage.body, "message.body");
|
||||
is(aResult.timestamp, sendingMessage.timestamp, "message.timestamp");
|
||||
|
||||
ok(sendingGot, "sending event should have been triggered");
|
||||
ok(!sentGot, "sent event should not have been triggered");
|
||||
ok(!successGot, "success event should not have been triggered");
|
||||
ok(sendingGot, "sending event should have been triggered");
|
||||
ok(!sentGot, "sent event should not have been triggered");
|
||||
ok(!successGot, "success event should not have been triggered");
|
||||
|
||||
successGot = true;
|
||||
}));
|
||||
successGot = true;
|
||||
}));
|
||||
|
||||
return Promise.all(promises);
|
||||
}
|
||||
|
@ -23,16 +23,14 @@ function test(text, segments, charsPerSegment, charsAvailableInLastSegment) {
|
||||
let domRequest = manager.getSegmentInfoForText(text);
|
||||
ok(domRequest, "DOMRequest object returned.");
|
||||
|
||||
return wrapDomRequestAsPromise(domRequest)
|
||||
.then(function(aEvent) {
|
||||
let result = aEvent.target.result;
|
||||
ok(result, "aEvent.target.result = " + JSON.stringify(result));
|
||||
return domRequest.then(function(aResult) {
|
||||
ok(aResult, "result = " + JSON.stringify(aResult));
|
||||
|
||||
is(result.segments, segments, "result.segments");
|
||||
is(result.charsPerSegment, charsPerSegment, "result.charsPerSegment");
|
||||
is(result.charsAvailableInLastSegment, charsAvailableInLastSegment,
|
||||
"result.charsAvailableInLastSegment");
|
||||
});
|
||||
is(aResult.segments, segments, "result.segments");
|
||||
is(aResult.charsPerSegment, charsPerSegment, "result.charsPerSegment");
|
||||
is(aResult.charsAvailableInLastSegment, charsAvailableInLastSegment,
|
||||
"result.charsAvailableInLastSegment");
|
||||
});
|
||||
}
|
||||
|
||||
startTestCommon(function() {
|
||||
|
Loading…
Reference in New Issue
Block a user