[FIXED JENKINS-38297] Support DataBoundSetter fields by assertEqualDa…

…taBoundBeans
jenkinsci · Sep 17, 2016 · ce41771 · ce41771
1 parent 2407c77
commit ce41771
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
@@ -1545,6 +1545,15 @@ private void assertEqualProperties(@Nonnull Object lhs, @Nonnull Object rhs, @No
     private Map<String, Class<?>> extractDataBoundSetterProperties(@Nonnull Class<?> c) {
         Map<String, Class<?>> ret = new HashMap<String, Class<?>>();
         for ( ;c != null; c = c.getSuperclass()) {
+
+            for (Field f: c.getDeclaredFields()) {
+                if (f.getAnnotation(DataBoundSetter.class) == null) {
+                    continue;
+                }
+                f.setAccessible(true);
+                ret.put(f.getName(), f.getType());
+           }
+
             for (Method m: c.getDeclaredMethods()) {
                 AbstractMap.SimpleEntry<String, Class<?>> nameAndType = extractDataBoundSetter(m);
                 if (nameAndType == null) {

diff --git a/src/test/java/org/jvnet/hudson/test/JenkinsRuleTest.java b/src/test/java/org/jvnet/hudson/test/JenkinsRuleTest.java
@@ -39,23 +39,40 @@ public List<String> getSomeList() {
     public void assertEqualDataBoundBeansWithSetters() throws Exception {
         SomeClassWithSetters l = new SomeClassWithSetters("value1");
         l.setSetterParam("value2");
+        l.setterField = "value3";
         SomeClassWithSetters r = new SomeClassWithSetters("value1");
         r.setSetterParam("value2");
+        r.setterField = "value3";
         j.assertEqualDataBoundBeans(l, r);
     }
 
     @Test(expected = AssertionError.class)
     public void assertEqualDataBoundBeansWithSettersFail() throws Exception {
         SomeClassWithSetters l = new SomeClassWithSetters("value1");
         l.setSetterParam("value2");
+        l.setterField = "value4";
         SomeClassWithSetters r = new SomeClassWithSetters("value1");
         r.setSetterParam("value3");     // mismatch!
+        r.setterField = "value4";
+        j.assertEqualDataBoundBeans(l, r);
+    }
+
+    @Test(expected = AssertionError.class)
+    public void assertEqualDataBoundBeansWithSettersFailForField() throws Exception {
+        SomeClassWithSetters l = new SomeClassWithSetters("value1");
+        l.setSetterParam("value2");
+        l.setterField = "value3";
+        SomeClassWithSetters r = new SomeClassWithSetters("value1");
+        r.setSetterParam("value2");     // mismatch!
+        l.setterField = "value4";
         j.assertEqualDataBoundBeans(l, r);
     }
 
     public static class SomeClassWithSetters {
         private String ctorParam;
         private String setterParam;
+        @DataBoundSetter
+        public String setterField;
 
         @DataBoundConstructor
         public SomeClassWithSetters(String ctorParam) {