Fixed - 333963: [Combo] Selection in drop-down list changes on hover

https://bugs.eclipse.org/bugs/show_bug.cgi?id=333963

2 files changed, 26 insertions, 6 deletions

diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js
index 2d46f09102..519aa16331 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js
@@ -49,7 +49,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.ComboTest", {
       testUtil.flush();
       combo.select( 1 );
       assertEquals( "Java", combo._field.getValue() );
-      assertEquals( "Java", combo._list.getSelectedItems()[ 0 ].getLabel() )
+      assertEquals( "Java", combo._list.getSelectedItems()[ 0 ].getLabel() );
       combo.destroy();
     },
 
@@ -117,8 +117,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.ComboTest", {
       assertTrue( combo._list.isSeeable() );
       combo.destroy();
     },
-    
-    
+   
     testOpenList : function() {
       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
       var combo = this._createDefaultCombo();
@@ -129,6 +128,17 @@ qx.Class.define( "org.eclipse.rwt.test.tests.ComboTest", {
       assertEquals( correctHeight, combo._list.getHeight() );
     },
 
+    testListSelection : function() {
+      var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
+      var combo = this._createDefaultCombo();
+      combo.select( 1 );
+      combo._setListSelection( combo._list.getItems()[ 5 ] );
+      assertEquals( "Smalltalk", combo._list.getSelectedItems()[ 0 ].getLabel() );
+      combo.setListVisible( true );
+      assertEquals( "Java", combo._list.getSelectedItems()[ 0 ].getLabel() );
+      combo.destroy();
+    },
+
     //////////
     // Helpers
 
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js
index 2d46f09102..519aa16331 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ComboTest.js
@@ -49,7 +49,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.ComboTest", {
       testUtil.flush();
       combo.select( 1 );
       assertEquals( "Java", combo._field.getValue() );
-      assertEquals( "Java", combo._list.getSelectedItems()[ 0 ].getLabel() )
+      assertEquals( "Java", combo._list.getSelectedItems()[ 0 ].getLabel() );
       combo.destroy();
     },
 
@@ -117,8 +117,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.ComboTest", {
       assertTrue( combo._list.isSeeable() );
       combo.destroy();
     },
-    
-    
+   
     testOpenList : function() {
       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
       var combo = this._createDefaultCombo();
@@ -129,6 +128,17 @@ qx.Class.define( "org.eclipse.rwt.test.tests.ComboTest", {
       assertEquals( correctHeight, combo._list.getHeight() );
     },
 
+    testListSelection : function() {
+      var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
+      var combo = this._createDefaultCombo();
+      combo.select( 1 );
+      combo._setListSelection( combo._list.getItems()[ 5 ] );
+      assertEquals( "Smalltalk", combo._list.getSelectedItems()[ 0 ].getLabel() );
+      combo.setListVisible( true );
+      assertEquals( "Java", combo._list.getSelectedItems()[ 0 ].getLabel() );
+      combo.destroy();
+    },
+
     //////////
     // Helpers