From a4538554c9f715ef64b6eda3925c1b8925828285 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 29 Sep 2009 09:59:02 +0000 Subject: [PATCH] Fixed test cases, removed unnecessary test scripts, updated IE references images. svn changeset:8976/svn branch:6.1 --- .../button/TooltipForDisabledButton.html | 92 ---------- .../components/form/FormRenderingFlicker.html | 42 ----- .../tests/components/link/LinkIcon.html | 27 --- .../richtextarea/RichTextAreaSize.java | 16 +- .../splitpanel/SplitPanelSplitterWidth.html | 47 ------ .../LabelEmbeddedClickThroughForTable.java | 5 +- .../components/table/RowAdditionTest.html | 157 ------------------ 7 files changed, 12 insertions(+), 374 deletions(-) delete mode 100644 src/com/vaadin/tests/components/button/TooltipForDisabledButton.html delete mode 100644 src/com/vaadin/tests/components/form/FormRenderingFlicker.html delete mode 100644 src/com/vaadin/tests/components/link/LinkIcon.html delete mode 100644 src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html delete mode 100644 src/com/vaadin/tests/components/table/RowAdditionTest.html diff --git a/src/com/vaadin/tests/components/button/TooltipForDisabledButton.html b/src/com/vaadin/tests/components/button/TooltipForDisabledButton.html deleted file mode 100644 index f5dc4dfebe..0000000000 --- a/src/com/vaadin/tests/components/button/TooltipForDisabledButton.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - -TooltipForDisabledButton - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TooltipForDisabledButton
open/run/com.vaadin.tests.components.button.TooltipForDisabledButton
waitForVaadin
clickvaadin=runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
mouseOvervaadin=runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
pause500
screenCapture
waitForVaadin
clickvaadin=runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
mouseOvervaadin=runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
pause500
screenCapture
- - diff --git a/src/com/vaadin/tests/components/form/FormRenderingFlicker.html b/src/com/vaadin/tests/components/form/FormRenderingFlicker.html deleted file mode 100644 index a99556d6d6..0000000000 --- a/src/com/vaadin/tests/components/form/FormRenderingFlicker.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - -FormRenderingFlicker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FormRenderingFlicker
open/run/com.vaadin.tests.components.form.FormRenderingFlicker
waitForVaadin
screenCapture
clickvaadin=runcomvaadintestscomponentsformFormRenderingFlicker::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]
waitForVaadin
- - diff --git a/src/com/vaadin/tests/components/link/LinkIcon.html b/src/com/vaadin/tests/components/link/LinkIcon.html deleted file mode 100644 index 8ae7942916..0000000000 --- a/src/com/vaadin/tests/components/link/LinkIcon.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -LinkIcon - - - - - - - - - - - - - - - - - -
LinkIcon
open/run/com.vaadin.tests.components.link.LinkIcon
screenCapture
- - diff --git a/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java b/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java index b41b192056..ce8dcb4df8 100644 --- a/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java +++ b/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java @@ -1,6 +1,7 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.VerticalLayout; @@ -8,7 +9,7 @@ public class RichTextAreaSize extends TestBase { @Override protected String getDescription() { - return "Test the size of a rich text area. The first area is 100px*100px wide, the second 100%*100% (of 500x500px), the third one has undefined width and height."; + return "Test the size of a rich text area. The first area is 100px*100px wide, the second 100%*100% (of 200x200px), the third one has undefined width and height."; } @Override @@ -18,7 +19,8 @@ public class RichTextAreaSize extends TestBase { @Override protected void setup() { - getMainWindow().getLayout().setHeight(null); + HorizontalLayout main = new HorizontalLayout(); + getMainWindow().setContent(main); RichTextArea first = new RichTextArea(); RichTextArea second = new RichTextArea(); @@ -30,13 +32,13 @@ public class RichTextAreaSize extends TestBase { third.setSizeUndefined(); VerticalLayout secondLayout = new VerticalLayout(); - secondLayout.setWidth("500px"); - secondLayout.setHeight("500px"); + secondLayout.setWidth("200px"); + secondLayout.setHeight("200px"); secondLayout.addComponent(second); - addComponent(first); - addComponent(secondLayout); - addComponent(third); + main.addComponent(first); + main.addComponent(secondLayout); + main.addComponent(third); } } diff --git a/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html b/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html deleted file mode 100644 index 876ed75ea8..0000000000 --- a/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - -SplitPanelSplitterWidth - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SplitPanelSplitterWidth
open/run/com.vaadin.tests.components.splitpanel.SplitPanelSplitterWidth
waitForVaadin
screenCapture
clickvaadin=runcomvaadintestscomponentssplitpanelSplitPanelSplitterWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
screenCapture
- - diff --git a/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index 0d90d9adb1..dc6cf53de7 100644 --- a/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -38,7 +38,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase { new Label("Label A", Label.CONTENT_XHTML)); item.getItemProperty("Column 4").setValue( new Embedded("An embedded image", new ThemeResource( - "icons/32/ok.png"))); + "../runo/icons/32/ok.png"))); item = table.addItem("Item 2 (row 2)"); item.getItemProperty("Column 1").setValue("String B"); @@ -50,7 +50,8 @@ public class LabelEmbeddedClickThroughForTable extends TestBase { "Label A", Label.CONTENT_XHTML)); item.getItemProperty("Column 4").setValue( - new Embedded("", new ThemeResource("icons/32/cancel.png"))); + new Embedded("", new ThemeResource( + "../runo/icons/32/cancel.png"))); table.addListener(new ItemClickListener() { diff --git a/src/com/vaadin/tests/components/table/RowAdditionTest.html b/src/com/vaadin/tests/components/table/RowAdditionTest.html deleted file mode 100644 index 4125e32e41..0000000000 --- a/src/com/vaadin/tests/components/table/RowAdditionTest.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - -RowAdditionTest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RowAdditionTest
open/run/com.vaadin.tests.components.table.RowAdditionTest
waitForVaadin
clickvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
screenCapture
clickvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]
waitForVaadin
scrollvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]300
waitForVaadin
scrollvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]600
waitForVaadin
scrollvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]900
waitForVaadin
screenCapture
clickvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]
waitForVaadin
scrollvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]903
waitForVaadin
scrollvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]1203
waitForVaadin
scrollvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]1503
waitForVaadin
scrollvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]1803
waitForVaadin
screenCapture
scrollvaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]1848
waitForVaadin
screenCapture
- - -- 2.39.5