diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-11-02 15:42:57 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-11-02 15:42:57 +0000 |
| commit | 7dc11bdca52e50ccecf8d2f46504af89398d14e3 (patch) | |
| tree | 83f26981509de0626bd413c3cb3a8185ae930faf /tests | |
| parent | 1fccc3cff784d7770bec98e0e1a5df6c8ab70567 (diff) | |
| download | vaadin-framework-7dc11bdca52e50ccecf8d2f46504af89398d14e3.tar.gz vaadin-framework-7dc11bdca52e50ccecf8d2f46504af89398d14e3.zip | |
Merged (partly manually) [9533],[9534]
svn changeset:9579/svn branch:6.2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/vaadin/tests/components/window/SubWindows-runo.html | 24 | ||||
| -rw-r--r-- | tests/src/com/vaadin/tests/components/window/SubWindows.html | 14 |
2 files changed, 19 insertions, 19 deletions
diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html b/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html index cbe55d16f6..f98191e239 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html +++ b/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html @@ -4,16 +4,16 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:8888/" /> -<title>UndefinedWidthSubWindow</title> +<title>SubWindows</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">UndefinedWidthSubWindow</td></tr> +<tr><td rowspan="1" colspan="3">SubWindows</td></tr> </thead><tbody> <tr> <td>open</td> - <td>/run/com.vaadin.tests.components.window.UndefinedWidthSubWindow?theme=runo</td> + <td>/run/com.vaadin.tests.components.window.SubWindows?theme=runo</td> <td></td> </tr> <tr> @@ -33,7 +33,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -43,7 +43,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -83,7 +83,7 @@ </tr> <tr> <td>open</td> - <td>/run/com.vaadin.tests.components.window.UndefinedWidthSubWindow?theme=runo</td> + <td>/run/com.vaadin.tests.components.window.SubWindows?theme=runo</td> <td></td> </tr> <tr> @@ -103,7 +103,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -113,7 +113,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -128,7 +128,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -138,7 +138,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows.html b/tests/src/com/vaadin/tests/components/window/SubWindows.html index 68bb3c5f2d..b5a503f5d4 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindows.html +++ b/tests/src/com/vaadin/tests/components/window/SubWindows.html @@ -4,16 +4,16 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:8888/" /> -<title>UndefinedWidthSubWindow</title> +<title>SubWindows</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">UndefinedWidthSubWindow</td></tr> +<tr><td rowspan="1" colspan="3">SubWindows</td></tr> </thead><tbody> <tr> <td>open</td> - <td>/run/com.vaadin.tests.components.window.UndefinedWidthSubWindow</td> + <td>/run/com.vaadin.tests.components.window.SubWindows</td> <td></td> </tr> <tr> @@ -33,7 +33,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -43,7 +43,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>click</td> - <td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> <tr> |