Ensure all BeanBinding chaining methods return BeanBinding

Change-Id: Ifbd5f278c83fcadbe6cf21d6c1f40914b35c4aba

1 files changed, 24 insertions, 0 deletions

diff --git a/server/src/test/java/com/vaadin/data/BeanBinderTest.java b/server/src/test/java/com/vaadin/data/BeanBinderTest.java
index 117b4e81eb..08cdf38426 100644
--- a/server/src/test/java/com/vaadin/data/BeanBinderTest.java
+++ b/server/src/test/java/com/vaadin/data/BeanBinderTest.java
@@ -3,11 +3,15 @@ package com.vaadin.data;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
+import java.lang.reflect.Method;
 import java.util.List;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.data.BeanBinder.BeanBinding;
+import com.vaadin.data.Binder.Binding;
 import com.vaadin.tests.data.bean.BeanToValidate;
 
 public class BeanBinderTest
@@ -171,4 +175,24 @@ public class BeanBinderTest
         assertSame(field, errors.get(0).getField());
         assertEquals(message, errors.get(0).getMessage().get());
     }
+
+    @Test
+    public void beanBindingChainingMethods() {
+        Method[] methods = BeanBinding.class.getMethods();
+        for (int i = 0; i < methods.length; i++) {
+            Method method = methods[i];
+            try {
+                Method actualMethod = BeanBinding.class.getMethod(
+                        method.getName(), method.getParameterTypes());
+
+                Assert.assertNotSame(
+                        actualMethod + " should be overridden in "
+                                + BeanBinding.class
+                                + " with more specific return type ",
+                        Binding.class, actualMethod.getReturnType());
+            } catch (NoSuchMethodException | SecurityException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
 }