wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1085765 - Part 2: Add test case to verify MWI without text body. r=htsai

Browse Source
This commit is contained in:
Bevis Tseng 2014-10-21 17:25:32 +08:00
parent 008ca8217a
commit 3e0d835bfd
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/voicemail/test/marionette/head.js
View File

@ -136,7 +136,7 @@ let PDUBuilder = {
};
}
let encodedBodyLength = options.body.length;
let encodedBodyLength = (options.body) ? options.body.length : 0;
let headerOctets = (headerLength ? headerLength + 1 : 0);
let paddingBits;
@ -161,9 +161,11 @@ let PDUBuilder = {
}
}
this.writeStringAsSeptets(options.body, paddingBits,
RIL.PDU_NL_IDENTIFIER_DEFAULT,
RIL.PDU_NL_IDENTIFIER_DEFAULT);
if (encodedBodyLength > 0) {
this.writeStringAsSeptets(options.body, paddingBits,
RIL.PDU_NL_IDENTIFIER_DEFAULT,
RIL.PDU_NL_IDENTIFIER_DEFAULT);
}
return this.buf;
},

21
dom/voicemail/test/marionette/test_voicemail_statuschanged.js
View File

@ -20,7 +20,7 @@ function checkEventStatus(aEvent, aServiceId, aHasMessages, aMessageCount,
compareVoicemailStatus(voicemail.getStatus(), status);
}
function testLevel2DiscardActive(aActive) {
function testLevel2Discard(aActive) {
log(" Active: " + aActive);
let sender = "+15125551235";
@ -32,15 +32,14 @@ function testLevel2DiscardActive(aActive) {
}
// Tests for Level 3 MWI with a message count in the User Data Header
function testLevel3DiscardActive(aMessageCount) {
log(" Message Count: " + aMessageCount);
function testLevel3Discard(aMessageCount, aBody) {
log(" Message Count: " + aMessageCount + ", Body: " + aBody);
let sender = "+15125551236";
let body = aMessageCount + " voicemails";
let pdu = PDUBuilder.buildLevel3DiscardMwi(aMessageCount, sender, body);
let pdu = PDUBuilder.buildLevel3DiscardMwi(aMessageCount, sender, aBody);
return sendIndicatorPDUAndWait(pdu)
.then((aResults) => checkEventStatus(aResults[0], 0, !!aMessageCount,
aMessageCount, sender, body));
aMessageCount, sender, aBody));
}
startTestCommon(function() {
@ -49,12 +48,14 @@ startTestCommon(function() {
.then(() => log("Testing Message Waiting Indication Group"))
// Level 2 discarded active/inactive MWI.
.then(() => log(" Discard Message"))
.then(() => testLevel2DiscardActive(true))
.then(() => testLevel2DiscardActive(false))
.then(() => testLevel2Discard(true))
.then(() => testLevel2Discard(false))
.then(() => log("Testing Special SMS Message Indication"))
.then(() => log(" Discard Message"))
// Level 3 discarded active/inactive MWI.
.then(() => testLevel3DiscardActive(3))
.then(() => testLevel3DiscardActive(0));
.then(() => testLevel3Discard(3, "3 voicemails"))
.then(() => testLevel3Discard(0, "0 voicemail"))
.then(() => testLevel3Discard(3, null))
.then(() => testLevel3Discard(0, null));
});