Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTim Buschtöns2011-01-21 13:02:04 +0000
committerTim Buschtöns2011-01-21 13:02:04 +0000
commit400a924cd7e3e9db36cd8b33049d732aafab31d8 (patch)
treeca646360749ac1ca601c1f7b4199bdd1a0da6bc4 /tests
parentd06c9a622e5ec5e81341d221de8b2d159d445913 (diff)
downloadorg.eclipse.rap-400a924cd7e3e9db36cd8b33049d732aafab31d8.tar.gz
org.eclipse.rap-400a924cd7e3e9db36cd8b33049d732aafab31d8.tar.xz
org.eclipse.rap-400a924cd7e3e9db36cd8b33049d732aafab31d8.zip
Fix for Bug 334927 - [Tree] Tree scrollable with mouswheel while scrollbar not visible
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js16
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js16
2 files changed, 16 insertions, 16 deletions
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js
index a5906c4d3b..23daef9c6f 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js
@@ -659,7 +659,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
new org.eclipse.rwt.widgets.TreeItem( tree );
}
testUtil.flush();
- assertEquals( 2020, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2000, tree._vertScrollBar.getMaximum() );
tree.destroy();
},
@@ -672,10 +672,10 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
}
new org.eclipse.rwt.widgets.TreeItem( lastItem );
testUtil.flush();
- assertEquals( 2020, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2000, tree._vertScrollBar.getMaximum() );
lastItem.setExpanded( true );
testUtil.flush();
- assertEquals( 2040, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2020, tree._vertScrollBar.getMaximum() );
tree.destroy();
},
@@ -687,10 +687,10 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
new org.eclipse.rwt.widgets.TreeItem( tree );
}
testUtil.flush();
- assertEquals( 2020, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2000, tree._vertScrollBar.getMaximum() );
tree.setItemHeight( 40 );
testUtil.flush();
- assertEquals( 4040, tree._vertScrollBar.getMaximum() );
+ assertEquals( 4000, tree._vertScrollBar.getMaximum() );
tree.destroy();
},
@@ -730,7 +730,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
org.eclipse.swt.EventUtil.setSuspended( false );
testUtil.flush();
var itemNode = tree._clientArea._getTargetNode().firstChild;
- assertEquals( "Test78", itemNode.firstChild.innerHTML );
+ assertEquals( "Test77", itemNode.firstChild.innerHTML );
tree.destroy();
},
@@ -996,7 +996,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
new org.eclipse.rwt.widgets.TreeItem( tree );
}
testUtil.flush();
- assertEquals( 2020, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2000, tree._vertScrollBar.getMaximum() );
assertEquals( 0, tree._vertScrollBar.getValue() );
testUtil.fakeWheel( tree._clientArea , -3 );
assertEquals( 120, tree._vertScrollBar.getValue() );
@@ -2940,7 +2940,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
assertTrue( tree.isItemSelected( root.getChild( 55 ) ) );
assertTrue( tree.isFocusItem( root.getChild( 55 ) ) );
testUtil.press( tree, "End" );
- assertIdentical( root.getChild( 76 ), tree._getTopItem() );
+ assertIdentical( root.getChild( 75 ), tree._getTopItem() );
assertTrue( tree.isItemSelected( root.getChild( 99 ) ) );
assertTrue( tree.isFocusItem( root.getChild( 99 ) ) );
tree.destroy();
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js
index a5906c4d3b..23daef9c6f 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js
@@ -659,7 +659,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
new org.eclipse.rwt.widgets.TreeItem( tree );
}
testUtil.flush();
- assertEquals( 2020, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2000, tree._vertScrollBar.getMaximum() );
tree.destroy();
},
@@ -672,10 +672,10 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
}
new org.eclipse.rwt.widgets.TreeItem( lastItem );
testUtil.flush();
- assertEquals( 2020, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2000, tree._vertScrollBar.getMaximum() );
lastItem.setExpanded( true );
testUtil.flush();
- assertEquals( 2040, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2020, tree._vertScrollBar.getMaximum() );
tree.destroy();
},
@@ -687,10 +687,10 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
new org.eclipse.rwt.widgets.TreeItem( tree );
}
testUtil.flush();
- assertEquals( 2020, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2000, tree._vertScrollBar.getMaximum() );
tree.setItemHeight( 40 );
testUtil.flush();
- assertEquals( 4040, tree._vertScrollBar.getMaximum() );
+ assertEquals( 4000, tree._vertScrollBar.getMaximum() );
tree.destroy();
},
@@ -730,7 +730,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
org.eclipse.swt.EventUtil.setSuspended( false );
testUtil.flush();
var itemNode = tree._clientArea._getTargetNode().firstChild;
- assertEquals( "Test78", itemNode.firstChild.innerHTML );
+ assertEquals( "Test77", itemNode.firstChild.innerHTML );
tree.destroy();
},
@@ -996,7 +996,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
new org.eclipse.rwt.widgets.TreeItem( tree );
}
testUtil.flush();
- assertEquals( 2020, tree._vertScrollBar.getMaximum() );
+ assertEquals( 2000, tree._vertScrollBar.getMaximum() );
assertEquals( 0, tree._vertScrollBar.getValue() );
testUtil.fakeWheel( tree._clientArea , -3 );
assertEquals( 120, tree._vertScrollBar.getValue() );
@@ -2940,7 +2940,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TreeTest", {
assertTrue( tree.isItemSelected( root.getChild( 55 ) ) );
assertTrue( tree.isFocusItem( root.getChild( 55 ) ) );
testUtil.press( tree, "End" );
- assertIdentical( root.getChild( 76 ), tree._getTopItem() );
+ assertIdentical( root.getChild( 75 ), tree._getTopItem() );
assertTrue( tree.isItemSelected( root.getChild( 99 ) ) );
assertTrue( tree.isFocusItem( root.getChild( 99 ) ) );
tree.destroy();

Back to the top