Merge remote-tracking branch 'origin/6.8'

Conflicts:
	tests/test.xml

3 files changed, 51 insertions, 2 deletions

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 3350a0d215..7bb179056a 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -13,7 +13,7 @@
 	<fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run" />
 
 	<!-- Test with these browsers -->
-	<property name="test_browsers" value="winxp-firefox10" />
+	<property name="test_browsers" value="winxp-firefox11" />
 
 	<!-- Path to key file. Default value -->
 	<property name="sshkey.file" value="id_dsa" />
diff --git a/tests/test.xml b/tests/test.xml
index dd308ce0a9..28459c37e9 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -11,7 +11,7 @@
 	<!-- Configuration                                                      -->
 	<!-- ================================================================== -->
 	<!-- Browsers to use for testing -->
-	<property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox10,winxp-safari5,winxp-googlechrome17,winxp-opera11" />
+	<property name="browsers-windows" value="winxp-ie8,win7-ie9,winxp-firefox11,winxp-safari5,winxp-googlechrome18,winxp-opera11" />
 	<property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
 	<property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />
 
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java b/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
new file mode 100644
index 0000000000..d437ab7a04
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
@@ -0,0 +1,49 @@
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Item;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+
+@SuppressWarnings("serial")
+public class MultiClickingItemThatDetachesTable extends TestBase {
+    @Override
+    public void setup() {
+        final Table table = new Table();
+        table.setImmediate(true);
+        table.addContainerProperty("p1", String.class, "p1");
+        table.addContainerProperty("p2", String.class, "p2");
+        for (int i = 0; i < 200; ++i) {
+            final Item item = table.getItem(table.addItem());
+            item.getItemProperty("p2").setValue(i + "");
+            item.getItemProperty("p1").setValue(i + "");
+        }
+        table.addListener(new ItemClickListener() {
+            public void itemClick(ItemClickEvent event) {
+                if (event.isDoubleClick()) {
+                    try {
+                        // Wait a bit so there's time to click multiple times
+                        Thread.sleep(3000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    replaceComponent(table, new Label("Completed!"));
+                }
+            }
+        });
+        addComponent(table);
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Clicking multiple times on an item whose listener detaches the table causes Out of Sync";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 8580;
+    }
+
+}