From a02558626a2d2248c13427b83fd5247eb72028ef Mon Sep 17 00:00:00 2001 From: Kevin Grandon Date: Tue, 28 Oct 2014 23:04:00 -0700 Subject: [PATCH] Revert " - Amend the test cases." This reverts commit 733f17c2a4a9ac954b89f625f5ec5d154610af8b. Reverted for not containing the proper bug number. See bug 985853. --- .../js/keyboard/active_targets_manager.js | 8 +- .../keyboard/active_targets_manager_test.js | 16 ++-- .../keyboard/target_handlers_manager_test.js | 25 +----- .../unit/keyboard/target_handlers_test.js | 84 ++++++++++--------- 4 files changed, 60 insertions(+), 73 deletions(-) diff --git a/apps/keyboard/js/keyboard/active_targets_manager.js b/apps/keyboard/js/keyboard/active_targets_manager.js index 42c2fb25f121..0c6360f35610 100644 --- a/apps/keyboard/js/keyboard/active_targets_manager.js +++ b/apps/keyboard/js/keyboard/active_targets_manager.js @@ -101,11 +101,11 @@ ActiveTargetsManager.prototype._handlePressStart = function(press, id) { } // Notify current targets about the new touch. - if (typeof this.onnewtargetwillactivate === 'function') { - this.activeTargets.forEach(function(target, id) { + this.activeTargets.forEach(function(target, id) { + if (typeof this.onnewtargetwillactivate === 'function') { this.onnewtargetwillactivate(target); - }, this); - } + } + }, this); var target = press.target; this.activeTargets.set(id, target); diff --git a/apps/keyboard/test/unit/keyboard/active_targets_manager_test.js b/apps/keyboard/test/unit/keyboard/active_targets_manager_test.js index c8b74477e34b..415eb600d32e 100644 --- a/apps/keyboard/test/unit/keyboard/active_targets_manager_test.js +++ b/apps/keyboard/test/unit/keyboard/active_targets_manager_test.js @@ -38,7 +38,6 @@ suite('ActiveTargetsManager', function() { manager.ontargetcommitted = this.sinon.stub(); manager.ontargetcancelled = this.sinon.stub(); manager.ontargetdoubletapped = this.sinon.stub(); - manager.onnewtargetwillactivate = this.sinon.stub(); manager.start(); assert.isTrue(window.UserPressManager.calledWithNew()); @@ -453,12 +452,15 @@ suite('ActiveTargetsManager', function() { userPressManagerStub.onpressstart(press1, id1); assert.isTrue(manager.onnewtargetwillactivate.calledWith(press0.target), - 'onnewtargetwillactivate called.'); + 'Determine commit the first press or not' + + ' when the second press starts.'); + assert.isTrue(alternativesCharMenuManagerStub.hide.calledOnce); - assert.isTrue(manager.ontargetactivated.calledWith(press1.target)); + assert.isTrue( + manager.ontargetactivated.calledWith(press1.target)); - assert.equal(window.clearTimeout.callCount, 2); - assert.equal(window.setTimeout.callCount, 1); + assert.equal(window.clearTimeout.callCount, 3); + assert.equal(window.setTimeout.callCount, 3); }); test('press end second press, and first press', function() { @@ -469,10 +471,10 @@ suite('ActiveTargetsManager', function() { }; userPressManagerStub.onpressend(pressEnd, id1); - assert.isTrue(alternativesCharMenuManagerStub.hide.calledOnce); + assert.isTrue(alternativesCharMenuManagerStub.hide.calledTwice); assert.isTrue( manager.ontargetcommitted.calledWith(press1.target)); - assert.equal(window.clearTimeout.callCount, 3); + assert.equal(window.clearTimeout.callCount, 4); var pressEnd2 = { target: { diff --git a/apps/keyboard/test/unit/keyboard/target_handlers_manager_test.js b/apps/keyboard/test/unit/keyboard/target_handlers_manager_test.js index 1cd20a871b4a..13373cb930bb 100644 --- a/apps/keyboard/test/unit/keyboard/target_handlers_manager_test.js +++ b/apps/keyboard/test/unit/keyboard/target_handlers_manager_test.js @@ -99,12 +99,6 @@ suite('TargetHandlersManager', function() { assert.isTrue(handlerStub.doubleTap.calledOnce); }); - test('New Target activated', function() { - activeTargetsManagerStub.onnewtargetwillactivate(target); - - assert.isTrue(handlerStub.newTargetActivate.calledOnce); - }); - suite('longPress', function() { setup(function() { activeTargetsManagerStub.ontargetlongpressed(target); @@ -135,12 +129,6 @@ suite('TargetHandlersManager', function() { assert.isTrue(handlerStub.doubleTap.calledOnce); }); - - test('New target activated', function() { - activeTargetsManagerStub.onnewtargetwillactivate(target); - - assert.isTrue(handlerStub.newTargetActivate.calledOnce); - }); }); }); @@ -187,12 +175,6 @@ suite('TargetHandlersManager', function() { assert.isTrue(handlerStub.doubleTap.calledOnce); }); - test('New target activated', function() { - activeTargetsManagerStub.onnewtargetwillactivate(target); - - assert.isTrue(handlerStub.newTargetActivate.calledOnce); - }); - suite('longPress', function() { setup(function() { activeTargetsManagerStub.ontargetlongpressed(target); @@ -223,12 +205,6 @@ suite('TargetHandlersManager', function() { assert.isTrue(handlerStub.doubleTap.calledOnce); }); - - test('New target activated', function() { - activeTargetsManagerStub.onnewtargetwillactivate(target); - - assert.isTrue(handlerStub.newTargetActivate.calledOnce); - }); }); }); @@ -285,6 +261,7 @@ suite('TargetHandlersManager', function() { assert.isTrue(handlerStub.activate.calledOnce); }); + test('SpaceKeyTargetHandler', function() { var target = { keyCode: KeyEvent.DOM_VK_SPACE diff --git a/apps/keyboard/test/unit/keyboard/target_handlers_test.js b/apps/keyboard/test/unit/keyboard/target_handlers_test.js index b9672c65465a..add1abf537d4 100644 --- a/apps/keyboard/test/unit/keyboard/target_handlers_test.js +++ b/apps/keyboard/test/unit/keyboard/target_handlers_test.js @@ -131,21 +131,6 @@ suite('target handlers', function() { assert.isTrue(app.visualHighlightManager.hide.calledOnce); }); - test('new target activated', function() { - handler.newTargetActivate(); - - assert.isTrue( - app.inputMethodManager.currentIMEngine.click.calledWith(99)); - assert.isTrue(app.inputMethodManager.currentIMEngine.click.calledOnce); - - assert.isTrue(app.visualHighlightManager.hide.calledWith(target)); - assert.isTrue(app.visualHighlightManager.hide.calledOnce); - - handler.commit(); - // Won't commit again - assert.isTrue(app.inputMethodManager.currentIMEngine.click.calledOnce); - }); - suite('longPress', function() { setup(function() { handler.longPress(); @@ -737,22 +722,59 @@ suite('target handlers', function() { var target; setup(function() { target = {}; + handler = new CapsLockTargetHandler(target, app); }); test('activate', function() { - handler.activate(); + setup(function() { + handler.activate(); - assert.isTrue(app.upperCaseStateManager.switchUpperCaseState - .calledWith({ - isUpperCaseLocked: true - })); + assert.isTrue(app.feedbackManager.triggerFeedback.calledWith(target)); + assert.isTrue(app.feedbackManager.triggerFeedback.calledOnce); + + assert.isTrue(app.visualHighlightManager.show.calledWith(target)); + assert.isTrue(app.visualHighlightManager.show.calledOnce); + }); + + test('commit', function() { + handler.commit(); + + assert.isTrue(app.upperCaseStateManager.switchUpperCaseState + .calledWith({ + isUpperCase: true, + isUpperCaseLocked: false + })); + + assert.isTrue(app.visualHighlightManager.hide.calledWith(target)); + assert.isTrue(app.visualHighlightManager.hide.calledOnce); + }); + + test('moveOut', function() { + handler.moveOut(); + + assert.isTrue(app.visualHighlightManager.hide.calledWith(target)); + assert.isTrue(app.visualHighlightManager.hide.calledOnce); + }); - assert.isTrue(app.feedbackManager.triggerFeedback.calledWith(target)); - assert.isTrue(app.feedbackManager.triggerFeedback.calledOnce); + test('cancel', function() { + handler.cancel(); + + assert.isTrue(app.visualHighlightManager.hide.calledWith(target)); + assert.isTrue(app.visualHighlightManager.hide.calledOnce); + }); - assert.isTrue(app.visualHighlightManager.show.calledWith(target)); - assert.isTrue(app.visualHighlightManager.show.calledOnce); + test('doubleTap', function() { + handler.doubleTap(); + + assert.isTrue(app.upperCaseStateManager.switchUpperCaseState + .calledWith({ + isUpperCaseLocked: true + })); + + assert.isTrue(app.visualHighlightManager.hide.calledWith(target)); + assert.isTrue(app.visualHighlightManager.hide.calledOnce); + }); }); test('longPress', function() { @@ -782,20 +804,6 @@ suite('target handlers', function() { assert.isTrue(app.visualHighlightManager.hide.calledOnce); }); - test('combo key - activate and then with new arget activated', function() { - handler.newTargetActivate(); - handler.commit(); - - assert.isTrue(app.upperCaseStateManager.switchUpperCaseState - .calledWith({ - isUpperCase: false, - isUpperCaseLocked: false - })); - - assert.isTrue(app.visualHighlightManager.hide.calledWith(target)); - assert.isTrue(app.visualHighlightManager.hide.calledOnce); - }); - test('cancel', function() { assert.equal(handler.cancel, DefaultTargetHandler.prototype.cancel, 'function not overwritten');