Merged changes to 6.4

svn changeset:13340/svn branch:6.4

5 files changed, 70 insertions, 21 deletions

diff --git a/tests/src/com/vaadin/tests/components/select/NativeSelects.java b/tests/src/com/vaadin/tests/components/select/NativeSelects.java
index 46b5267e28..cd2c95d127 100644
--- a/tests/src/com/vaadin/tests/components/select/NativeSelects.java
+++ b/tests/src/com/vaadin/tests/components/select/NativeSelects.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.Button.ClickEvent;
 
-public class NativeSelects extends ComponentTestCase {
+public class NativeSelects extends ComponentTestCase<NativeSelect> {
 
     private static final Object CAPTION = "caption";
     NativeSelect label[] = new NativeSelect[20];
@@ -95,7 +95,7 @@ public class NativeSelects extends ComponentTestCase {
         s.addContainerProperty(CAPTION, String.class, "");
         s.setItemCaptionPropertyId(CAPTION);
         s.setCaption(caption);
-
+        s.setNullSelectionAllowed(false);
         return s;
     }
 
@@ -135,19 +135,41 @@ public class NativeSelects extends ComponentTestCase {
                     }
                 });
 
+        CheckBox nullSelect = new CheckBox("Null selection allowed",
+                new Button.ClickListener() {
+                    public void buttonClick(ClickEvent event) {
+                        boolean nullAllowed = event.getButton().booleanValue();
+                        setNullAllowed(nullAllowed);
+                    }
+                });
+
         errorIndicators.setValue(new Boolean(false));
         readonly.setValue(new Boolean(false));
         enabled.setValue(new Boolean(true));
+        nullSelect.setValue(new Boolean(false));
 
         errorIndicators.setImmediate(true);
         readonly.setImmediate(true);
         enabled.setImmediate(true);
+        nullSelect.setImmediate(true);
 
         actions.add(errorIndicators);
         actions.add(readonly);
         actions.add(enabled);
+        actions.add(nullSelect);
 
         return actions;
     }
 
+    protected void setNullAllowed(boolean on) {
+        for (NativeSelect c : getTestComponents()) {
+            if (c == null) {
+                continue;
+            }
+
+            c.setNullSelectionAllowed(on);
+        }
+
+    }
+
 }
diff --git a/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java b/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
new file mode 100644
index 0000000000..bb7bedf431
--- /dev/null
+++ b/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
@@ -0,0 +1,29 @@
+package com.vaadin.tests.server.component.tabsheet;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+

+import java.util.Iterator;

+

+import org.junit.Test;

+

+import com.vaadin.ui.Component;

+import com.vaadin.ui.Label;

+import com.vaadin.ui.TabSheet;

+

+public class TestTabSheet {

+

+    @Test

+    public void addExistingComponent() {

+        Component c = new Label("abc");

+        TabSheet tabSheet = new TabSheet();

+        tabSheet.addComponent(c);

+        tabSheet.addComponent(c);

+

+        Iterator<Component> iter = tabSheet.getComponentIterator();

+

+        assertEquals(c, iter.next());

+        assertEquals(false, iter.hasNext());

+        assertNotNull(tabSheet.getTab(c));

+    }

+}

diff --git a/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java b/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
index 8881b9e273..3af9d12a83 100644
--- a/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
+++ b/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
@@ -21,12 +21,20 @@ public class TestGridLayoutLastRowRemoval extends TestCase {
             fail("removeRow(0) threw an IllegalArgumentExcetion when removing the last row");
         }
 
-        // The grid should now be empty with one row and one column
-        assertEquals(1, grid.getColumns());
+        // The column amount should be preserved
+        assertEquals(2, grid.getColumns());
+
+        // There should be one row left
         assertEquals(1, grid.getRows());
 
         // There should be no component left in the grid layout
         assertNull("A component should not be left in the layout", grid
                 .getComponent(0, 0));
+        assertNull("A component should not be left in the layout", grid
+                .getComponent(1, 0));
+
+        // The cursor should be in the first cell
+        assertEquals(0, grid.getCursorX());
+        assertEquals(0, grid.getCursorY());
     }
 }
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket4507.html b/tests/src/com/vaadin/tests/tickets/Ticket4507.html
index ae1317af8f..4f69743410 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket4507.html
+++ b/tests/src/com/vaadin/tests/tickets/Ticket4507.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/vaadin63/run/com.vaadin.tests.tickets.Ticket4507?restartApplication</td>
+	<td>/run/com.vaadin.tests.tickets.Ticket4507?restartApplication</td>
 	<td></td>
 </tr>
 <tr>
@@ -47,16 +47,6 @@
 	<td></td>
 </tr>
 <tr>
-	<td>mouseClick</td>
-	<td>//div[@id='runcomvaadinteststicketsTicket4507-1550628061']/div</td>
-	<td>231,202</td>
-</tr>
-<tr>
-	<td>waitForVaadin</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
 	<td>screenCapture</td>
 	<td></td>
 	<td></td>
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket4607.html b/tests/src/com/vaadin/tests/tickets/Ticket4607.html
index 141ac4ec0c..684caad19e 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket4607.html
+++ b/tests/src/com/vaadin/tests/tickets/Ticket4607.html
@@ -23,7 +23,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=vaadin63runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
+	<td>vaadin=runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
 	<td>7,8</td>
 </tr>
 <tr>
@@ -43,7 +43,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=vaadin63runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
+	<td>vaadin=runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
 	<td>12,15</td>
 </tr>
 <tr>
@@ -68,7 +68,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=vaadin63runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
+	<td>vaadin=runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
 	<td>7,17</td>
 </tr>
 <tr>
@@ -88,7 +88,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=vaadin63runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
+	<td>vaadin=runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
 	<td>10,15</td>
 </tr>
 <tr>
@@ -98,7 +98,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=vaadin63runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
+	<td>vaadin=runcomvaadinteststicketsTicket4607::/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
 	<td>10,15</td>
 </tr>
 <tr>
@@ -108,7 +108,7 @@
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>//div[@id='vaadin63runcomvaadinteststicketsTicket4607-992355988']/div</td>
+	<td>//div[@id='runcomvaadinteststicketsTicket4607-992355988']/div</td>
 	<td>438,155</td>
 </tr>
 <tr>