From 669532b1b971f77153f93a4c17dfa85deb90467d Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Fri, 17 Dec 2010 10:32:53 +0000 Subject: [PATCH] updated test scripts, subwindow window structure has changed svn changeset:16559/svn branch:6.5 --- .../tests/components/window/CloseSubWindow.html | 4 ++-- .../components/window/ExtraWindowShown.html | 4 ++-- .../tests/components/window/SubWindowOrder.html | 16 ++++++++-------- .../tests/components/window/SubWindows-runo.html | 8 ++++---- .../tests/components/window/SubWindows.html | 8 ++++---- .../components/window/WindowClickEvents.html | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/src/com/vaadin/tests/components/window/CloseSubWindow.html b/tests/src/com/vaadin/tests/components/window/CloseSubWindow.html index 3701613054..36e9134566 100644 --- a/tests/src/com/vaadin/tests/components/window/CloseSubWindow.html +++ b/tests/src/com/vaadin/tests/components/window/CloseSubWindow.html @@ -28,7 +28,7 @@ click - vaadin=runcomvaadintestscomponentswindowCloseSubWindow::/VWindow[0]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowCloseSubWindow::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0] @@ -43,7 +43,7 @@ click - vaadin=runcomvaadintestscomponentswindowCloseSubWindow::/VWindow[0]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowCloseSubWindow::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0] diff --git a/tests/src/com/vaadin/tests/components/window/ExtraWindowShown.html b/tests/src/com/vaadin/tests/components/window/ExtraWindowShown.html index ba1682b96d..4881d0caf1 100644 --- a/tests/src/com/vaadin/tests/components/window/ExtraWindowShown.html +++ b/tests/src/com/vaadin/tests/components/window/ExtraWindowShown.html @@ -23,7 +23,7 @@ click - vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0] @@ -43,7 +43,7 @@ click - vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowExtraWindowShown::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0] diff --git a/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html b/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html index cc04258807..a8030a9604 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html +++ b/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html @@ -48,7 +48,7 @@ mouseClick - vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VFilterSelect[0]/domChild[1] + vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VFilterSelect[0]/domChild[1] 11,11 @@ -58,12 +58,12 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VButton[1]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VButton[1]/domChild[0]/domChild[0] mouseClick - vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[3]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VFilterSelect[0]/domChild[1] + vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[3]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VFilterSelect[0]/domChild[1] 11,11 @@ -73,7 +73,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[3]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VButton[1]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[3]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VButton[1]/domChild[0]/domChild[0] @@ -93,7 +93,7 @@ mouseClick - vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VFilterSelect[0]/domChild[1] + vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VFilterSelect[0]/domChild[1] 12,14 @@ -103,12 +103,12 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VButton[1]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VButton[1]/domChild[0]/domChild[0] mouseClick - vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VFilterSelect[0]/domChild[1] + vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VFilterSelect[0]/domChild[1] 10,8 @@ -118,7 +118,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/ScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindowOrder::/VWindow[2]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VButton[0]/domChild[0]/domChild[0] 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 6ed39f70b9..2109a53273 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html +++ b/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html @@ -33,7 +33,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/FocusableScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] @@ -43,7 +43,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/FocusableScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] @@ -58,7 +58,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/FocusableScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0] @@ -68,7 +68,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/FocusableScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0] diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows.html b/tests/src/com/vaadin/tests/components/window/SubWindows.html index b5a503f5d4..7279a10b9c 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindows.html +++ b/tests/src/com/vaadin/tests/components/window/SubWindows.html @@ -33,7 +33,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/FocusableScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] @@ -43,7 +43,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/FocusableScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] @@ -58,7 +58,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/FocusableScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0] @@ -68,7 +68,7 @@ click - vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentswindowSubWindows::/VWindow[0]/FocusableScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0] diff --git a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html index eb9702129c..57092595f3 100644 --- a/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html +++ b/tests/src/com/vaadin/tests/components/window/WindowClickEvents.html @@ -38,7 +38,7 @@ mouseClick - vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VWindow[0]/ScrollPanel[0]/VVerticalLayout[0] + vaadin=runcomvaadintestscomponentswindowWindowClickEvents::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0] 188,16 -- 2.39.5