1 files changed, 79 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
new file mode 100644
index 0000000000..e19bbaf2c5
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
@@ -0,0 +1,79 @@
+package com.vaadin.tests.dd;
+
+import com.vaadin.data.Item;
+import com.vaadin.event.dd.DragAndDropEvent;
+import com.vaadin.event.dd.DropHandler;
+import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
+import com.vaadin.event.dd.acceptcriteria.SourceIs;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Table.TableDragMode;
+import com.vaadin.ui.Table.TableTransferable;
+
+public class NotPaintedAcceptSourceInTabSheet extends TestBase {
+
+    @Override
+    protected void setup() {
+        final Table source1 = createTable("Source 1");
+        final Table source2 = createTable("Source 2");
+        final Table target = createTable("Target");
+
+        source1.setDragMode(TableDragMode.ROW);
+        source2.setDragMode(TableDragMode.ROW);
+
+        target.setDropHandler(new DropHandler() {
+            @Override
+            public AcceptCriterion getAcceptCriterion() {
+                return new SourceIs(source1, source2);
+            }
+
+            @Override
+            public void drop(DragAndDropEvent event) {
+                TableTransferable transferable = (TableTransferable) event
+                        .getTransferable();
+                Item item = transferable.getSourceComponent().getItem(
+                        transferable.getItemId());
+                Object value = item.getItemProperty("value").getValue();
+                AbstractSelectTargetDetails targetDetails = (AbstractSelectTargetDetails) event
+                        .getTargetDetails();
+                Object targetItemId = targetDetails.getItemIdOver();
+                Object addItemAfter = target.addItemAfter(targetItemId);
+                target.getItem(addItemAfter).getItemProperty("value")
+                        .setValue(value);
+                transferable.getSourceComponent().removeItem(
+                        transferable.getItemId());
+            }
+        });
+
+        TabSheet tabSheet = new TabSheet();
+        tabSheet.addComponent(source1);
+        tabSheet.addComponent(source2);
+
+        addComponent(tabSheet);
+        addComponent(target);
+    }
+
+    private Table createTable(String caption) {
+        Table table = new Table(caption);
+        table.addContainerProperty("value", String.class, "");
+        for (int i = 0; i < 10; i++) {
+            table.addItem(new Object[] { caption + " value " + i },
+                    Integer.valueOf(i));
+        }
+        table.setWidth("300px");
+        return table;
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Including a component in an accept criterion when the actual component is in a TabSheet and has not yet been painted should still allow painting the component properly when the tab is opened.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return Integer.valueOf(8730);
+    }
+
+}