Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #18081 from frsela/STK/Bug989852_v1.4
Browse files Browse the repository at this point in the history 
Bug 989852 - [Sora][STK]'OK ' item is grayed when execute 'Get input' with a default text and user input command., r=vingtetun
  • Loading branch information
@rvandermeulen
rvandermeulen committed Apr 11, 2014
2 parents 41cdaa3 + 57a2d3d commit 96e880e
Show file tree
Hide file tree
Showing 7 changed files with 500 additions and 3 deletions.
3 changes: 3 additions & 0 deletions apps/system/js/icc.js
View file
Expand Up @@ -445,6 +445,9 @@ var icc = {
setTimeout(function workaround_bug818270() {
self.icc_input_box.maxLength = options.maxLength;
self.icc_input_box.value = options.defaultText || '';
self.icc_input_btn.disabled = !checkInputLengthValid(
self.icc_input_box.value.length, options.minLength,
options.maxLength);
}, 500);
this.icc_input_box.placeholder = message;
this.icc_input_box.type = options.isAlphabet ? 'text' : 'tel';
Expand Down
5 changes: 2 additions & 3 deletions apps/system/js/icc_worker.js
View file
Expand Up @@ -275,9 +275,8 @@ var icc_worker = {
icc.hideViews();
}, true);

var timeout = options.duration ||
icc.calculateDurationInMS(options.duration) ||
icc._inputTimeout;
var timeout = (options.duration &&
icc.calculateDurationInMS(options.duration)) || icc._inputTimeout;
icc.input(message, options.text, timeout, options,
function(response, value) {
if (response == null) {
Expand Down
228 changes: 228 additions & 0 deletions apps/system/test/unit/icc_test.js
View file
@@ -0,0 +1,228 @@
/* global MocksHelper, MockNavigatorMozIccManager, icc,
MockNavigatorMozMobileConnections, MockNavigatormozSetMessageHandler,
MockL10n, MockFtuLauncher, MockNavigatorSettings */
'use strict';

requireApp('system/test/unit/mock_l10n.js');
requireApp('system/test/unit/mock_system_icc_worker.js');
requireApp('system/test/unit/mock_ftu_launcher.js');
require('/shared/test/unit/mocks/mock_navigator_moz_icc_manager.js');
require('/shared/test/unit/mocks/mock_navigator_moz_settings.js');
require('/shared/test/unit/mocks/mock_navigator_moz_set_message_handler.js');
require('/shared/test/unit/mocks/mock_navigator_moz_mobile_connections.js');
require('/shared/test/unit/mocks/mock_dump.js');
require('/shared/test/unit/load_body_html_helper.js');


mocha.globals(['FtuLaucher', 'icc_worker', 'icc']);

var mocksForIcc = new MocksHelper([
'Dump',
'FtuLauncher',
'SystemICCWorker'
]).init();

suite('STK (icc) >', function() {
mocksForIcc.attachTestHelpers();
var realMozIccManager, realSettings, realL10n,
realNavigatormozSetMessageHandler, realNavigatormozMobileConnections;
var stkTestCommands = {};

suiteSetup(function() {
loadBodyHTML('/index.html');

realSettings = window.navigator.mozSettings;
window.navigator.mozSettings = MockNavigatorSettings;

realMozIccManager = navigator.mozIccManager;
navigator.mozIccManager = MockNavigatorMozIccManager;

realL10n = navigator.mozL10n;
navigator.mozL10n = MockL10n;

MockNavigatormozSetMessageHandler.mSetup();
realNavigatormozSetMessageHandler = navigator.mozSetMessageHandler;
navigator.mozSetMessageHandler = MockNavigatormozSetMessageHandler;

realNavigatormozMobileConnections = navigator.mozMobileConnections;
navigator.mozMobileConnections = MockNavigatorMozMobileConnections;
});

suiteTeardown(function() {
window.navigator.mozSettings = realSettings;

MockNavigatorMozIccManager.mTeardown();
navigator.mozIccManager = realMozIccManager;

navigator.mozL10n = realL10n;

MockNavigatormozSetMessageHandler.mTeardown();
navigator.mozSetMessageHandler = realNavigatormozSetMessageHandler;

MockNavigatorMozMobileConnections.mTeardown();
navigator.mozMobileConnections = realNavigatormozMobileConnections;
});

setup(function(done) {
MockFtuLauncher.mIsRunning = false;

requireApp('system/js/icc.js', done);
});

function launchStkCommand(cmd) {
icc.handleSTKCommand(cmd);
}

setup(function() {
window.navigator.mozIccManager.addIcc('1010011010');

stkTestCommands.STK_CMD_GET_INPUT = {
iccId: '1010011010',
command: {
commandNumber: 1,
typeOfCommand: navigator.mozIccManager.STK_CMD_GET_INPUT,
commandQualifier: 0,
options: {
text: 'stk Input test text',
duration: {
timeUnit: navigator.mozIccManager.STK_TIME_UNIT_TENTH_SECOND,
timeInterval: 5
},
minLength: 2,
maxLength: 10,
defaultText: 'default'
}
}
};
});

test('getIcc', function() {
assert.isObject(window.icc.getIcc('1010011010'));
});

test('getIccInfo', function(done) {
window.icc.getIccInfo();
setTimeout(function() {
assert.equal(window.icc._defaultURL,
'http://www.mozilla.org/en-US/firefoxos/');
done();
}, 100);
});

test('responseSTKCommand', function(done) {
window.icc.getIcc('1010011010').sendStkResponse = function(msg, res) {
assert.equal(res, 'dummy');
done();
};
icc.responseSTKCommand(stkTestCommands.STK_CMD_GET_INPUT, 'dummy');
});

test('terminateResponse', function(done) {
window.icc.getIcc('1010011010').sendStkResponse = function(msg, res) {
assert.equal(res.resultCode,
navigator.mozIccManager.STK_RESULT_UICC_SESSION_TERM_BY_USER);
done();
};
icc.terminateResponse(stkTestCommands.STK_CMD_GET_INPUT);
});

test('backResponse', function(done) {
window.icc.getIcc('1010011010').sendStkResponse = function(msg, res) {
assert.equal(res.resultCode,
navigator.mozIccManager.STK_RESULT_BACKWARD_MOVE_BY_USER);
done();
};
icc.backResponse(stkTestCommands.STK_CMD_GET_INPUT);
});

test('calculateDurationInMS', function() {
assert.equal(window.icc.calculateDurationInMS(
navigator.mozIccManager.STK_TIME_UNIT_MINUTE, 1), 3600000);
assert.equal(window.icc.calculateDurationInMS(
navigator.mozIccManager.STK_TIME_UNIT_MINUTE, 2), 7200000);
assert.equal(window.icc.calculateDurationInMS(
navigator.mozIccManager.STK_TIME_UNIT_SECOND, 1), 1000);
assert.equal(window.icc.calculateDurationInMS(
navigator.mozIccManager.STK_TIME_UNIT_SECOND, 2), 2000);
assert.equal(window.icc.calculateDurationInMS(
navigator.mozIccManager.STK_TIME_UNIT_TENTH_SECOND, 1), 100);
assert.equal(window.icc.calculateDurationInMS(
navigator.mozIccManager.STK_TIME_UNIT_TENTH_SECOND, 2), 200);
});

test('hideViews', function() {
window.icc.hideViews();
assert.isFalse(document.getElementById('icc-view').classList.contains(
'visible'));
var icc_view_boxes = document.getElementById('icc-view').children;
for (var i = 0; i < icc_view_boxes.length; i++) {
assert.isFalse(icc_view_boxes[i].classList.contains('visible'));
}
});

test('UI: Input (timeout 1sec)', function(done) {
var testCmd = stkTestCommands.STK_CMD_GET_INPUT;
window.icc.input(testCmd, testCmd.command.options.text, 1000,
stkTestCommands.STK_CMD_GET_INPUT.command.options, function(res, value) {
done();
});
});

test('UI: Input (contents)', function(done) {
var testCmd = stkTestCommands.STK_CMD_GET_INPUT;
window.icc.input(testCmd, testCmd.command.options.text, 0,
stkTestCommands.STK_CMD_GET_INPUT.command.options, function() {});

// We need to wait because workaround. See bug #818270. Followup: #895314
// See function workaround_bug818270 in icc.js
setTimeout(function() {
assert.equal(document.getElementById('icc-input-msg').textContent,
testCmd.command.options.text);
assert.equal(document.getElementById('icc-input-btn').textContent, 'OK');
assert.equal(document.getElementById('icc-input-btn').disabled, false);
assert.equal(document.getElementById('icc-input-btn_back').textContent,
'Back');
assert.equal(document.getElementById('icc-input-btn_help').textContent,
'Help');
done();
}, 600);
});

test('UI: Input (checkInputLengthValid)', function() {
var testCmd = stkTestCommands.STK_CMD_GET_INPUT;
window.icc.input(testCmd, testCmd.command.options.text, 0,
stkTestCommands.STK_CMD_GET_INPUT.command.options, function() {});

var button = document.getElementById('icc-input-btn');
var inputbox = document.getElementById('icc-input-box');

// We need to wait because workaround. See bug #818270. Followup: #895314
// See function workaround_bug818270 in icc.js
setTimeout(function() {
// Using default string shall be enabled
assert.equal(button.disabled, false);
// Length between 3 and 10, empty is disabled
inputbox.value = '';
assert.equal(button.disabled, true);
inputbox.value = '1';
assert.equal(button.disabled, true);
inputbox.value = '12';
assert.equal(button.disabled, true);
inputbox.value = '123';
assert.equal(button.disabled, false);
inputbox.value = '1234567890';
assert.equal(button.disabled, false);
inputbox.value = '12345678901';
assert.equal(button.disabled, true);
}, 600);
});

test('launchStkCommand: STK_CMD_GET_INPUT', function(done) {
window.icc_worker.onmessagereceived = function(message) {
assert.equal(message, stkTestCommands.STK_CMD_GET_INPUT);
done();
};
launchStkCommand(stkTestCommands.STK_CMD_GET_INPUT);
});

});
101 changes: 101 additions & 0 deletions apps/system/test/unit/icc_worker_test.js
View file
@@ -0,0 +1,101 @@
'use strict';

/* global MocksHelper, MockNavigatorMozIccManager, MockSystemICC, icc_worker */

requireApp('system/test/unit/mock_l10n.js');
requireApp('system/test/unit/mock_system_icc.js');
require('/shared/test/unit/mocks/mock_navigator_moz_icc_manager.js');
require('/shared/test/unit/mocks/mock_dump.js');
requireApp('system/js/icc_worker.js');

mocha.globals(['icc']);

var mocksForIcc = new MocksHelper([
'L10n',
'Dump'
]).init();

suite('STK (icc_worker) >', function() {
mocksForIcc.attachTestHelpers();
var realMozIccManager, realSystemICC;
var stkTestCommands = {};

suiteSetup(function() {
realMozIccManager = navigator.mozIccManager;
navigator.mozIccManager = MockNavigatorMozIccManager;
realSystemICC = window.icc;
window.icc = MockSystemICC(MockNavigatorMozIccManager);
});

suiteTeardown(function() {
MockNavigatorMozIccManager.mTeardown();
navigator.mozIccManager = realMozIccManager;
MockSystemICC.mTeardown();
window.icc = realSystemICC;
});

setup(function() {
stkTestCommands.STK_CMD_GET_INPUT = {
iccId: '1010011010',
command: {
commandNumber: 1,
typeOfCommand: navigator.mozIccManager.STK_CMD_GET_INPUT,
commandQualifier: 0,
options: {
text: 'stk Input test text',
duration: {
timeUnit: navigator.mozIccManager.STK_TIME_UNIT_TENTH_SECOND,
timeInterval: 5
},
minLength: 2,
maxLength: 10,
defaultText: 'default'
}
}
};
});

function launchStkCommand(cmd) {
function stkCmd(CMD) {
return '0x' + CMD.toString(16);
}
icc_worker[stkCmd(cmd.command.typeOfCommand)](cmd);
}

test('Check Dummy response', function(done) {
window.icc.onresponse = function(message, response) {
assert.equal(response.resultCode, navigator.mozIccManager.STK_RESULT_OK);
done();
};
icc_worker.dummy();
});

test('STK_CMD_GET_INPUT (User response)', function(done) {
var stkResponse = 'stk introduced text';
window.icc.input = function(stkMsg, message, timeout, options, callback) {
setTimeout(function() {
callback(true, stkResponse);
});
};
window.icc.onresponse = function(message, response) {
assert.equal(response.resultCode, navigator.mozIccManager.STK_RESULT_OK);
assert.equal(response.input, stkResponse);
done();
};
launchStkCommand(stkTestCommands.STK_CMD_GET_INPUT);
});

test('STK_CMD_GET_INPUT (Timeout)', function(done) {
window.icc.input = function(stkMsg, message, timeout, options, callback) {
setTimeout(function() {
callback(false);
});
};
window.icc.onresponse = function(message, response) {
assert.equal(response.resultCode,
navigator.mozIccManager.STK_RESULT_NO_RESPONSE_FROM_USER);
done();
};
launchStkCommand(stkTestCommands.STK_CMD_GET_INPUT);
});
});
36 changes: 36 additions & 0 deletions apps/system/test/unit/mock_system_icc.js
View file
@@ -0,0 +1,36 @@
'use strict';

/* exported MockSystemICC */

function MockSystemICC(iccManager) {
return {
onresponse: function() {},
_iccManager: iccManager,
getSIMNumber: function() {
return 1;
},
responseSTKCommand: function(message, response) {
this.onresponse(message, response);
},

calculateDurationInMS: function icc_calculateDurationInMS(timeUnit,
timeInterval) {
var timeout = timeInterval;
switch (timeUnit) {
case this._iccManager.STK_TIME_UNIT_MINUTE:
timeout *= 3600000;
break;
case this._iccManager.STK_TIME_UNIT_SECOND:
timeout *= 1000;
break;
case this._iccManager.STK_TIME_UNIT_TENTH_SECOND:
timeout *= 100;
break;
}
return timeout;
}
};
}

MockSystemICC.mTeardown = function() {
};

0 comments on commit 96e880e

Please sign in to comment.