Use isConnectorEnabled instead of isEnabled for DnD service (#12781)

Change-Id: Ica20d57283db74d66176de7c696136a9a3615c41

2 files changed, 56 insertions, 2 deletions

diff --git a/server/src/com/vaadin/server/DragAndDropService.java b/server/src/com/vaadin/server/DragAndDropService.java
index 49a65a09b8..c0c3eebca3 100644
--- a/server/src/com/vaadin/server/DragAndDropService.java
+++ b/server/src/com/vaadin/server/DragAndDropService.java
@@ -84,7 +84,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
 
         DropTarget dropTarget = (DropTarget) owner;
 
-        if (!dropTarget.isEnabled()) {
+        if (!dropTarget.isConnectorEnabled()) {
             getLogger()
                     .warning(
                             "Client dropped on " + owner
diff --git a/server/tests/src/com/vaadin/server/DragAndDropServiceTest.java b/server/tests/src/com/vaadin/server/DragAndDropServiceTest.java
index a88cf131c5..d0cb0ca5a6 100644
--- a/server/tests/src/com/vaadin/server/DragAndDropServiceTest.java
+++ b/server/tests/src/com/vaadin/server/DragAndDropServiceTest.java
@@ -28,6 +28,8 @@ import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.event.dd.DropHandler;
+import com.vaadin.event.dd.TargetDetails;
 import com.vaadin.ui.AbstractComponent;
 
 /**
@@ -38,7 +40,7 @@ import com.vaadin.ui.AbstractComponent;
 public class DragAndDropServiceTest {
 
     @Test
-    public void changeVariables_isConnectorEnabledCalled() {
+    public void changeVariables_isSourceConnectorEnabledCalled() {
         final List<Level> levels = new ArrayList<Level>();
         Logger.getLogger(DragAndDropService.class.getName()).addHandler(
                 new StreamHandler() {
@@ -64,8 +66,60 @@ public class DragAndDropServiceTest {
 
         Assert.assertTrue("isConnectorEnabled() method is not called",
                 isConnectorEnabledCalled[0]);
+        Assert.assertTrue("No warning on drop from disabled source",
+                levels.contains(Level.WARNING));
+
+    }
+
+    @Test
+    public void changeVariables_isTargetConnectorEnabledCalled() {
+        final List<Level> levels = new ArrayList<Level>();
+        Logger.getLogger(DragAndDropService.class.getName()).addHandler(
+                new StreamHandler() {
+                    @Override
+                    public void publish(LogRecord record) {
+                        levels.add(record.getLevel());
+                    }
+                });
+        Map<String, Object> variables = new HashMap<String, Object>();
+        TestDropTarget target = new TestDropTarget();
+        variables.put("dhowner", target);
+
+        DragAndDropService service = new DragAndDropService(
+                EasyMock.createMock(VaadinSession.class));
+        service.changeVariables(null, variables);
+
+        Assert.assertTrue("isConnectorEnabled() method is not called",
+                target.isConnectorEnabledCalled());
         Assert.assertTrue("No warning on drop to disabled target",
                 levels.contains(Level.WARNING));
 
     }
+
+    private static class TestDropTarget extends AbstractComponent implements
+            com.vaadin.event.dd.DropTarget {
+        @Override
+        public boolean isConnectorEnabled() {
+            isConnectorEnabledCalled = true;
+            return false;
+        }
+
+        @Override
+        public DropHandler getDropHandler() {
+            return null;
+        }
+
+        @Override
+        public TargetDetails translateDropTargetDetails(
+                Map<String, Object> clientVariables) {
+            return null;
+        }
+
+        boolean isConnectorEnabledCalled() {
+            return isConnectorEnabledCalled;
+        }
+
+        private boolean isConnectorEnabledCalled;
+
+    }
 }