From 7293dd720e2cd27c0f583c3ea3f3831e9297c78b Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 13 Oct 2009 05:54:28 +0000 Subject: [PATCH] Merged multiple test updates svn changeset:9173/svn branch:6.2 --- src/com/vaadin/demo/sampler/ExampleUtil.java | 10 +++-- .../button/ButtonUndefinedWidth.html | 16 ++++---- .../popupview/PopupViewLabelResized.java | 37 +++++++++++++++++++ .../components/tabsheet/AddAndRemoveTabs.html | 8 ++-- .../tabsheet/RemoveTabsTabsheet.html | 20 +++++----- .../tree/TreeNodeCaptionWrapping.html | 7 +++- 6 files changed, 72 insertions(+), 26 deletions(-) create mode 100644 src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java diff --git a/src/com/vaadin/demo/sampler/ExampleUtil.java b/src/com/vaadin/demo/sampler/ExampleUtil.java index ca50d2a654..411e7d77eb 100644 --- a/src/com/vaadin/demo/sampler/ExampleUtil.java +++ b/src/com/vaadin/demo/sampler/ExampleUtil.java @@ -1,6 +1,7 @@ package com.vaadin.demo.sampler; import java.util.Locale; +import java.util.Random; import com.vaadin.data.Container; import com.vaadin.data.Item; @@ -143,9 +144,11 @@ public final class ExampleUtil { String.class, ""); contactContainer.addContainerProperty(PERSON_PROPERTY_LASTNAME, String.class, ""); + + Random r = new Random(5); for (int i = 0; i < 50;) { - String fn = firstnames[(int) (Math.random() * firstnames.length)]; - String ln = lastnames[(int) (Math.random() * lastnames.length)]; + String fn = firstnames[(int) (r.nextDouble() * firstnames.length)]; + String ln = lastnames[(int) (r.nextDouble() * lastnames.length)]; String id = fn + ln; Item item = contactContainer.addItem(id); if (item != null) { @@ -199,7 +202,8 @@ public final class ExampleUtil { item.getItemProperty(iso3166_PROPERTY_NAME).setValue(name); item.getItemProperty(iso3166_PROPERTY_SHORT).setValue(id); item.getItemProperty(iso3166_PROPERTY_FLAG).setValue( - new ThemeResource("../sampler/flags/" + id.toLowerCase() + ".gif")); + new ThemeResource("../sampler/flags/" + id.toLowerCase() + + ".gif")); } container.sort(new Object[] { iso3166_PROPERTY_NAME }, new boolean[] { true }); diff --git a/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html b/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html index 7c9b3a6559..16d18d2e50 100644 --- a/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html +++ b/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html @@ -22,9 +22,9 @@ - screenCapture + click + vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0] - 1 waitForVaadin @@ -33,7 +33,7 @@ click - vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeButton[0] @@ -43,7 +43,7 @@ click - vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeButton[0] + vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0] @@ -53,7 +53,7 @@ click - vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VNativeButton[0] @@ -62,9 +62,9 @@ - click - vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VNativeButton[0] - + mouseClick + vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2] + 636,149 waitForVaadin diff --git a/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java b/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java new file mode 100644 index 0000000000..52bdd47790 --- /dev/null +++ b/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java @@ -0,0 +1,37 @@ +package com.vaadin.tests.components.popupview; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.PopupView; + +public class PopupViewLabelResized extends TestBase { + + @Override + protected String getDescription() { + return "When clicking on the popup view on the left, its size should not change."; + } + + @Override + protected Integer getTicketNumber() { + return 3483; + } + + @Override + protected void setup() { + GridLayout gl = new GridLayout(3, 1); + gl.setSizeFull(); + + Label expander = new Label(); + gl.addComponent(expander, 1, 0); + gl.setColumnExpandRatio(1, 1); + + gl.addComponent( + new PopupView("Click here to popup", new Label("test")), 0, 0); + gl.addComponent( + new PopupView("Click here to popup", new Label("test")), 2, 0); + + addComponent(gl); + } + +} diff --git a/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html b/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html index dd07d8cef6..e919454fc2 100644 --- a/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html +++ b/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html @@ -92,8 +92,8 @@ - verifyTextPresent - Test 1



Test 3





Close tab












Add new tab + screenCapture + @@ -107,8 +107,8 @@ - verifyTextPresent - Test 1



Test 3



Test 4





Close tab












Add new tab + screenCapture + diff --git a/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html b/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html index 07db540395..18fa4705ce 100644 --- a/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html +++ b/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html @@ -22,8 +22,8 @@ - verifyTextPresent - Tab 1



Tab 2



Tab 3



Tab 4



Tab 5





This is the contents of tab 1







close first tab


close last tab


Close current tab


reorder + screenCapture + @@ -37,8 +37,8 @@ - verifyTextPresent - Tab 2



Tab 3



Tab 4



Tab 5





This is the contents of tab 2







close first tab


close last tab


Close current tab


reorder + screenCapture + @@ -62,8 +62,8 @@ - verifyTextPresent - Tab 2



Tab 3



Tab 5





This is the contents of tab 2







close first tab


close last tab


Close current tab


reorder + screenCapture + @@ -77,8 +77,8 @@ - verifyTextPresent - Tab 5



Tab 3



Tab 2





This is the contents of tab 5







close first tab


close last tab


Close current tab


reorder + screenCapture + @@ -102,8 +102,8 @@ - verifyTextPresent - Tab 5



Tab 3





This is the contents of tab 5

This is the contents of tab 3







close first tab


close last tab


Close current tab


reorder + screenCapture + diff --git a/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html b/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html index 2c2baca773..f98482f4c7 100644 --- a/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html +++ b/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html @@ -23,7 +23,12 @@ verifyTextPresent - 1




A very long item that should not wrap


Subitem - also long + A very long item that should not wrap + + + + verifyTextPresent + Subitem - also long -- 2.39.5