]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ad74ab0)
Merged multiple test updates
authorArtur Signell <artur.signell@itmill.com>
Tue, 13 Oct 2009 05:54:28 +0000 (05:54 +0000)
committerArtur Signell <artur.signell@itmill.com>
Tue, 13 Oct 2009 05:54:28 +0000 (05:54 +0000)
svn changeset:9173/svn branch:6.2

src/com/vaadin/demo/sampler/ExampleUtil.java patch | blob | history
src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html patch | blob | history
src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java [new file with mode: 0644] patch | blob
src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html patch | blob | history
src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html patch | blob | history
src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html patch | blob | history

diff --git a/src/com/vaadin/demo/sampler/ExampleUtil.java b/src/com/vaadin/demo/sampler/ExampleUtil.java
index ca50d2a6543952566a027d56d598f4e4336bdc8b..411e7d77eb7256d5df94794528c84bc7ffd9c608 100644 (file)
--- 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 7c9b3a655912313e156c6a07d952c2c56d354bd7..16d18d2e50b511d740e188526893c8dc333b31e6 100644 (file)
--- a/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
+++ b/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
@@ -22,9 +22,9 @@
        <td></td>
 </tr>
 <tr>
-       <td>screenCapture</td>
+       <td>click</td>
+       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
        <td></td>
-       <td>1</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
@@ -33,7 +33,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
        <td></td>
 </tr>
 <tr>
@@ -43,7 +43,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+       <td>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]</td>
        <td></td>
 </tr>
 <tr>
@@ -53,7 +53,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>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]</td>
+       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VNativeButton[0]</td>
        <td></td>
 </tr>
 <tr>
@@ -62,9 +62,9 @@
        <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VNativeButton[0]</td>
-       <td></td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>
+       <td>636,149</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
diff --git a/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java b/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
new file mode 100644 (file)
index 0000000..52bdd47
--- /dev/null
+++ b/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
@@ -0,0 +1,37 @@
+package com.vaadin.tests.components.popupview;\r
+\r
+import com.vaadin.tests.components.TestBase;\r
+import com.vaadin.ui.GridLayout;\r
+import com.vaadin.ui.Label;\r
+import com.vaadin.ui.PopupView;\r
+\r
+public class PopupViewLabelResized extends TestBase {\r
+\r
+    @Override\r
+    protected String getDescription() {\r
+        return "When clicking on the popup view on the left, its size should not change.";\r
+    }\r
+\r
+    @Override\r
+    protected Integer getTicketNumber() {\r
+        return 3483;\r
+    }\r
+\r
+    @Override\r
+    protected void setup() {\r
+        GridLayout gl = new GridLayout(3, 1);\r
+        gl.setSizeFull();\r
+\r
+        Label expander = new Label();\r
+        gl.addComponent(expander, 1, 0);\r
+        gl.setColumnExpandRatio(1, 1);\r
+\r
+        gl.addComponent(\r
+                new PopupView("Click here to popup", new Label("test")), 0, 0);\r
+        gl.addComponent(\r
+                new PopupView("Click here to popup", new Label("test")), 2, 0);\r
+\r
+        addComponent(gl);\r
+    }\r
+\r
+}\r
diff --git a/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html b/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
index dd07d8cef65473b5c2f0e6069fbb2b7cff16afaa..e919454fc257b85d644edade9997628b514c3d80 100644 (file)
--- a/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
+++ b/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
@@ -92,8 +92,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>Test 1<br /><br /><br /><br />Test 3<br /><br /><br /><br /><br /><br />Close tab<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />Add new tab</td>
+       <td>screenCapture</td>
+       <td></td>
        <td></td>
 </tr>
 <tr>
@@ -107,8 +107,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>Test 1<br /><br /><br /><br />Test 3<br /><br /><br /><br />Test 4<br /><br /><br /><br /><br /><br />Close tab<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />Add new tab</td>
+       <td>screenCapture</td>
+       <td></td>
        <td></td>
 </tr>
 
diff --git a/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html b/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
index 07db54039575046a6e9345b2f7724b880886a187..18fa4705ce9026d28a807508c952a97f219df0bf 100644 (file)
--- a/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
+++ b/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
@@ -22,8 +22,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>Tab 1<br /><br /><br /><br />Tab 2<br /><br /><br /><br />Tab 3<br /><br /><br /><br />Tab 4<br /><br /><br /><br />Tab 5<br /><br /><br /><br /><br /><br />This is the contents of tab 1<br /><br /><br /><br /><br /><br /><br /><br />close first tab<br /><br /><br />close last tab<br /><br /><br />Close current tab<br /><br /><br />reorder</td>
+       <td>screenCapture</td>
+       <td></td>
        <td></td>
 </tr>
 <tr>
@@ -37,8 +37,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>Tab 2<br /><br /><br /><br />Tab 3<br /><br /><br /><br />Tab 4<br /><br /><br /><br />Tab 5<br /><br /><br /><br /><br /><br />This is the contents of tab 2<br /><br /><br /><br /><br /><br /><br /><br />close first tab<br /><br /><br />close last tab<br /><br /><br />Close current tab<br /><br /><br />reorder</td>
+       <td>screenCapture</td>
+       <td></td>
        <td></td>
 </tr>
 <tr>
@@ -62,8 +62,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>Tab 2<br /><br /><br /><br />Tab 3<br /><br /><br /><br />Tab 5<br /><br /><br /><br /><br /><br />This is the contents of tab 2<br /><br /><br /><br /><br /><br /><br /><br />close first tab<br /><br /><br />close last tab<br /><br /><br />Close current tab<br /><br /><br />reorder</td>
+       <td>screenCapture</td>
+       <td></td>
        <td></td>
 </tr>
 <tr>
@@ -77,8 +77,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>Tab 5<br /><br /><br /><br />Tab 3<br /><br /><br /><br />Tab 2<br /><br /><br /><br /><br /><br />This is the contents of tab 5<br /><br /><br /><br /><br /><br /><br /><br />close first tab<br /><br /><br />close last tab<br /><br /><br />Close current tab<br /><br /><br />reorder</td>
+       <td>screenCapture</td>
+       <td></td>
        <td></td>
 </tr>
 <tr>
@@ -102,8 +102,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>Tab 5<br /><br /><br /><br />Tab 3<br /><br /><br /><br /><br /><br />This is the contents of tab 5<br /><br />This is the contents of tab 3<br /><br /><br /><br /><br /><br /><br /><br />close first tab<br /><br /><br />close last tab<br /><br /><br />Close current tab<br /><br /><br />reorder</td>
+       <td>screenCapture</td>
+       <td></td>
        <td></td>
 </tr>
 
diff --git a/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html b/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
index 2c2baca773102f3af0b97fd6dfaf7a769f7cf7a6..f98482f4c75b4085c44db2ecf7e961a9e6db3a05 100644 (file)
--- a/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
+++ b/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
@@ -23,7 +23,12 @@
 </tr>
 <tr>
        <td>verifyTextPresent</td>
-       <td>1<br /><br /><br /><br /> <br />A very long item that should not wrap<br /><br /> <br />Subitem - also long</td>
+       <td>A very long item that should not wrap</td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyTextPresent</td>
+       <td>Subitem - also long</td>
        <td></td>
 </tr>
 <tr>
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework