Bug 819213 - Change filter tests to use international format and reenable on TBPL, also remove previous changes by gwagner. r=gwagner

This commit is contained in:
Rob Wood 2012-12-13 13:39:02 -08:00
parent 3df60c245d
commit 427dcb4cc4
3 changed files with 8 additions and 9 deletions

View File

@ -15,8 +15,8 @@ qemu = true
[test_getmessages.js]
[test_filter_date.js]
[test_filter_date_notfound.js]
;[test_filter_number_single.js]
;[test_filter_number_multiple.js]
[test_filter_number_single.js]
[test_filter_number_multiple.js]
[test_filter_received.js]
[test_filter_sent.js]
[test_filter_read.js]

View File

@ -9,7 +9,7 @@ SpecialPowers.setBoolPref("dom.sms.enabled", true);
let sms = window.navigator.mozSms;
let numberMsgs = 10;
let smsList = new Array();
let defaultRemoteNumber = "5552227777";
let defaultRemoteNumber = "+15552227777";
function verifyInitialState() {
log("Verifying initial state.");
@ -95,7 +95,7 @@ function sendSms() {
// Send an SMS to a unique number that will fall outside of the filter
let gotSmsSent = false;
let gotRequestSuccess = false;
let remoteNumber = "5558120649";
let remoteNumber = "+15558120649";
let text = "Outgoing SMS brought to you by Firefox OS!";
log("Sending an SMS.");
@ -169,7 +169,7 @@ sms.onreceived = function onreceived(event) {
function nextRep() {
// Keep simulating incoming messages until have received specified number
let secondNumber = "5559990000";
let secondNumber = "+15559990000";
if (smsList.length < (numberMsgs - 1)) {
// Have every other SMS be from different number, so filter won't find all
if (smsList.length % 2) {

View File

@ -9,8 +9,7 @@ SpecialPowers.setBoolPref("dom.sms.enabled", true);
let sms = window.navigator.mozSms;
let numberMsgs = 10;
let smsList = new Array();
let defaultRemoteNumber = "5552227777";
let defaultRemoteNumberFormats = ["5552227777", "+15552227777"];
let defaultRemoteNumber = "+15552227777";
function verifyInitialState() {
log("Verifying initial state.");
@ -128,7 +127,7 @@ function nextRep() {
if (smsList.length < numberMsgs) {
// Have every other sms be from different number, so filter won't find all
if (smsList.length % 2) {
simulateIncomingSms("5559990000");
simulateIncomingSms("+15559990000");
} else {
simulateIncomingSms();
}
@ -144,7 +143,7 @@ function getMsgs() {
// Going to filter for one number only, so set our expected SMS array
smsList = smsList.filter(function(i) {
return defaultRemoteNumberFormats.indexOf(i.sender) >= 0 ? true : false;
return i.sender != defaultRemoteNumber ? false: true;
});
// Set filter for default remote number