Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js21
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js72
2 files changed, 88 insertions, 5 deletions
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
index 16f33c6761..8ecdd68d10 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
@@ -324,14 +324,17 @@ qx.Class.define( "org.eclipse.rwt.test.fixture.TestUtil", {
_printableIdentifierToKeycodeMap : {
"Backspace" : 8,
"Tab" : 9,
- "Escape" : 27,
+ "Escape" : qx.core.Variant.select("qx.client", {
+ "default" : 27,
+ "webkit" : null
+ } ),
"Space" : 32,
"Enter" : qx.core.Variant.select("qx.client", {
"default" : 13,
"gecko" : null
} )
},
-
+
pressOnce : function( target, key, mod ) {
this.keyDown( target, key, mod );
this.keyUp( target, key, mod );
@@ -439,7 +442,19 @@ qx.Class.define( "org.eclipse.rwt.test.fixture.TestUtil", {
&& keyCodeMap[ stringOrKeyCode ] === undefined;
var isPrintableIdentifier = typeof stringOrKeyCode === "string"
&& idMap[ stringOrKeyCode ] != null;
- return isChar || isPrintableKeyCode || isPrintableIdentifier;
+ var result = isChar || isPrintableKeyCode || isPrintableIdentifier;
+
+ if( org.eclipse.rwt.Client.isWebkit() ) {
+ if( stringOrKeyCode === 27 || stringOrKeyCode === "Escape" ) {
+ result = false;
+ }
+ }
+ if( ( stringOrKeyCode === 9 || stringOrKeyCode === "Tab" )
+ || ( stringOrKeyCode === 8 || stringOrKeyCode === "Backspace") )
+ {
+ result = false;
+ }
+ return result;
},
_isModifier : function( key ) {
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
index dfcffe0965..da0720cca0 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
@@ -393,6 +393,75 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
assertEquals( [ "click", "click", "dblclick" ], log );
widget.destroy();
},
+
+ testSendKeyPress : qx.core.Variant.select("qx.client", {
+ "gecko|opera" : function() {
+ var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
+ assertTrue( testUtil._sendKeyPress( "a" ) );
+ assertTrue( testUtil._sendKeyPress( "A" ) );
+ assertTrue( testUtil._sendKeyPress( 65 ) );
+ assertTrue( testUtil._sendKeyPress( "Enter" ) );
+ assertTrue( testUtil._sendKeyPress( 13 ) );
+ assertTrue( testUtil._sendKeyPress( "F1" ) );
+ assertTrue( testUtil._sendKeyPress( 112 ) );
+ assertTrue( testUtil._sendKeyPress( "Space" ) );
+ assertTrue( testUtil._sendKeyPress( 32 ) );
+ assertTrue( testUtil._sendKeyPress( "Escape" ) );
+ assertTrue( testUtil._sendKeyPress( 27 ) );
+ assertTrue( testUtil._sendKeyPress( "Tab" ) );
+ assertTrue( testUtil._sendKeyPress( 9 ) );
+ assertTrue( testUtil._sendKeyPress( "Backspace" ) );
+ assertTrue( testUtil._sendKeyPress( 8 ) );
+ if( org.eclipse.rwt.Client.isOpera() ) {
+ assertFalse( testUtil._sendKeyPress( "Win" ) );
+ assertFalse( testUtil._sendKeyPress( 91 ) );
+ } else {
+ assertTrue( testUtil._sendKeyPress( "Win" ) ); // opera false
+ assertTrue( testUtil._sendKeyPress( 91 ) );
+ }
+ assertTrue( testUtil._sendKeyPress( "Apps" ) );
+ assertTrue( testUtil._sendKeyPress( 93 ) );
+ assertFalse( testUtil._sendKeyPress( "Shift" ) );
+ assertFalse( testUtil._sendKeyPress( 16 ) );
+ assertFalse( testUtil._sendKeyPress( "Control" ) );
+ assertFalse( testUtil._sendKeyPress( 17 ) );
+ assertFalse( testUtil._sendKeyPress( "Alt" ) );
+ assertFalse( testUtil._sendKeyPress( 18 ) );
+ },
+ "default" : function() {
+ var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
+ assertTrue( testUtil._sendKeyPress( "a" ) );
+ assertTrue( testUtil._sendKeyPress( "A" ) );
+ assertTrue( testUtil._sendKeyPress( 65 ) );
+ assertTrue( testUtil._sendKeyPress( "Enter" ) );
+ assertTrue( testUtil._sendKeyPress( 13 ) );
+ assertFalse( testUtil._sendKeyPress( "F1" ) );
+ assertFalse( testUtil._sendKeyPress( 112 ) );
+ assertTrue( testUtil._sendKeyPress( "Space" ) );
+ assertTrue( testUtil._sendKeyPress( 32 ) );
+ if( org.eclipse.rwt.Client.isWebkit() ) {
+ assertFalse( testUtil._sendKeyPress( "Escape" ) );
+ assertFalse( testUtil._sendKeyPress( 27 ) );
+ } else {
+ assertTrue( testUtil._sendKeyPress( "Escape" ) );
+ assertTrue( testUtil._sendKeyPress( 27 ) );
+ }
+ assertFalse( testUtil._sendKeyPress( "Tab" ) );
+ assertFalse( testUtil._sendKeyPress( 9 ) );
+ assertFalse( testUtil._sendKeyPress( "Backspace" ) );
+ assertFalse( testUtil._sendKeyPress( 8 ) );
+ assertFalse( testUtil._sendKeyPress( "Win" ) );
+ assertFalse( testUtil._sendKeyPress( 91 ) );
+ assertFalse( testUtil._sendKeyPress( "Apps" ) );
+ assertFalse( testUtil._sendKeyPress( 93 ) );
+ assertFalse( testUtil._sendKeyPress( "Shift" ) );
+ assertFalse( testUtil._sendKeyPress( 16 ) );
+ assertFalse( testUtil._sendKeyPress( "Control" ) );
+ assertFalse( testUtil._sendKeyPress( 17 ) );
+ assertFalse( testUtil._sendKeyPress( "Alt" ) );
+ assertFalse( testUtil._sendKeyPress( 18 ) );
+ }
+ } ),
testPressPrintable : function() {
var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
@@ -416,8 +485,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
var log = this._addKeyLogger( widget, true, true, false );
widget.focus();
testUtil.press( widget, "Space" );
- var expected
- = [ "keydown", "Space", "keypress", "Space", "keyup", "Space", ];
+ var expected = [ "keydown", "Space", "keypress", "Space", "keyup", "Space", ];
assertEquals( expected, log );
widget.destroy();
},

Back to the top