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

Unified Diff: chrome/test/data/chromeos/virtual_keyboard/virtual_keyboard_test_base.js

Issue 98073012: Add unit test for lock and unlock virtual keyboard feature (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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: chrome/test/data/chromeos/virtual_keyboard/virtual_keyboard_test_base.js
diff --git a/chrome/test/data/chromeos/virtual_keyboard/virtual_keyboard_test_base.js b/chrome/test/data/chromeos/virtual_keyboard/virtual_keyboard_test_base.js
index 93b4f17d501812d714b8f5194ea6d9b5d4fcd68a..248eb6f86cb311b297823de2e81add5cb71e04f8 100644
--- a/chrome/test/data/chromeos/virtual_keyboard/virtual_keyboard_test_base.js
+++ b/chrome/test/data/chromeos/virtual_keyboard/virtual_keyboard_test_base.js
@@ -277,12 +277,19 @@ TestRunner.prototype = {
continueWaiting = false;
this.runNextTest();
}
- } else if (waitCondition.state = 'candidatePopupVisibility') {
+ } else if (waitCondition.state == 'candidatePopupVisibility') {
var popup = keyset.querySelector('kb-altkey-container');
if (popup && popup.hidden == !waitCondition.value) {
continueWaiting = false;
this.runNextTest();
}
+ } else if (waitCondition.state == 'overlayVisibility') {
+ var popup =
+ $('keyboard').shadowRoot.querySelector('kb-keyboard-overlay');
+ if (popup && popup.hidden == !waitCondition.value) {
+ continueWaiting = false;
+ this.runNextTest();
+ }
}
if (continueWaiting) {
Debug('waiting on ' + waitCondition.state + ' = ' +
@@ -346,6 +353,8 @@ function setUp() {
'sendKeyEvent');
mockController.createFunctionMock(chrome.virtualKeyboardPrivate,
+ 'lockKeyboard');
+ mockController.createFunctionMock(chrome.virtualKeyboardPrivate,
'hideKeyboard');
mockController.createFunctionMock(chrome.virtualKeyboardPrivate,
'moveCursor');
@@ -370,15 +379,23 @@ function setUp() {
};
chrome.virtualKeyboardPrivate.sendKeyEvent.validateCall = validateSendCall;
+ var validateLockKeyboard = function(index, expected, observed) {
+ assertEquals(expected[0],
+ observed[0],
+ 'Mismatched keyboard lock/unlock state.');
+ };
+ chrome.virtualKeyboardPrivate.lockKeyboard.validateCall =
+ validateLockKeyboard;
+
chrome.virtualKeyboardPrivate.hideKeyboard.validateCall = function() {
// hideKeyboard has one optional argument for error logging that does not
// matter for the purpose of validating the call.
};
var validateMoveCursor = function(index, expected, observed) {
- assertEquals(expected[0], observed[0], "Mismatched swipe directions.");
- assertEquals(expected[1], observed[1], "Mismatched swipe flags.");
- }
+ assertEquals(expected[0], observed[0], 'Mismatched swipe directions.');
+ assertEquals(expected[1], observed[1], 'Mismatched swipe flags.');
+ };
chrome.virtualKeyboardPrivate.moveCursor.validateCall = validateMoveCursor;
// TODO(kevers): Mock additional extension API calls as required.
« no previous file with comments | « chrome/test/data/chromeos/virtual_keyboard/typing_test.js ('k') | ui/keyboard/resources/elements/kb-key.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698