]> source.dussan.org Git - vaadin-framework.git/commit
Merge commit '257d49'
authorJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 10:35:50 +0000 (13:35 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 10:35:50 +0000 (13:35 +0300)
commitaf9760c6be31b1cf9018601952573ad1c06af45f
tree7ed8d082cedc09578433d531e4f90926ce23f939
parent3f54038eedd721fd8ded23456c6cee4531e0d812
parent257d49fc06f152df292704e8ae6c3bc9a5541a8f
Merge commit '257d49'

Conflicts:
tests/testbench/com/vaadin/tests/application/PaintableIdsShouldBeUnique.java
tests/testbench/com/vaadin/tests/components/TestBase.java
tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
tests/testbench/com/vaadin/tests/components/window/ReplacingComponentsInHandleParameters.java
tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java
tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
tests/testbench/com/vaadin/tests/tickets/Ticket6002.java

Changed tests creating their own main windows (without a good reason) and extending AbstractTestBase to call getMainWindow() and extend TestBase instead
tests/testbench/com/vaadin/tests/components/TestBase.java
tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java
tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java