diff options
| author | Artur Signell <artur.signell@itmill.com> | 2011-12-20 10:37:08 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2011-12-20 10:37:08 +0000 |
| commit | 67629854f920d734ceab541d8b27202ef04f6043 (patch) | |
| tree | 6e04eec10c9141f6358a2bc210c1ed676ef271c3 | |
| parent | 24d51f48d6c18752275bf647b609207c6b5e7f30 (diff) | |
| download | vaadin-framework-67629854f920d734ceab541d8b27202ef04f6043.tar.gz vaadin-framework-67629854f920d734ceab541d8b27202ef04f6043.zip | |
Fixed test mixup
svn changeset:22455/svn branch:6.8
3 files changed, 24 insertions, 31 deletions
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.html b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.html index f04dd564bf..3c59c7a953 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.html +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.html @@ -13,32 +13,19 @@ </thead><tbody> <tr> <td>open</td> - <td>/run/com.vaadin.tests.application.WebBrowserTest?restartApplication</td> + <td>/run/com.vaadin.tests.application.WebBrowserSizeTest?restartApplication</td> <td></td> </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestsapplicationWebBrowserSizeTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td> <td></td> </tr> -<!-- Raw offset --> <tr> - <td>assertText</td> - <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VLabel[0]</td> - <td>7200000</td> -</tr> -<!-- offset to Helsinki --> -<tr> - <td>assertText</td> - <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[6]/VLabel[0]</td> - <td>0</td> -</tr> -<!-- in Helsinki? --> -<tr> - <td>assertText</td> - <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VLabel[0]</td> - <td>Yes</td> + <td>screenCapture</td> + <td></td> + <td>size</td> </tr> </tbody></table> </body> -</html> +</html>
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html index 4648f6abb1..f04dd564bf 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html @@ -13,18 +13,31 @@ </thead><tbody> <tr> <td>open</td> - <td>/run/com.vaadin.tests.application.WebBrowserSizeTest?restartApplication</td> + <td>/run/com.vaadin.tests.application.WebBrowserTest?restartApplication</td> <td></td> </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestsapplicationWebBrowserSizeTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> +<!-- Raw offset --> <tr> - <td>screenCapture</td> - <td></td> - <td>size</td> + <td>assertText</td> + <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VLabel[0]</td> + <td>7200000</td> +</tr> +<!-- offset to Helsinki --> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[6]/VLabel[0]</td> + <td>0</td> +</tr> +<!-- in Helsinki? --> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsapplicationWebBrowserTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VLabel[0]</td> + <td>Yes</td> </tr> </tbody></table> </body> diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java index e95daf3144..31e7534042 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java @@ -76,13 +76,6 @@ public class WebBrowserTest extends TestBase { });
addComponent(update);
- addComponent(new Button("Hide non-static info",
- new Button.ClickListener() {
-
- public void buttonClick(ClickEvent event) {
-
- }
- }));
addComponent(offsetLabel);
addComponent(rawOffsetLabel);
addComponent(dstDiffLabel);
|