Added DoEntityBuilder.putIf() conditional put operation

Change-Id: Iaeccd795ed4dc63e1eff2ab349ec6f6d879493ed

1 files changed, 28 insertions, 6 deletions

diff --git a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/DoEntityBuilderTest.java b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/DoEntityBuilderTest.java
index 89699c85c9..c7277635a4 100644
--- a/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/DoEntityBuilderTest.java
+++ b/org.eclipse.scout.rt.dataobject.test/src/test/java/org/eclipse/scout/rt/dataobject/DoEntityBuilderTest.java
@@ -12,8 +12,10 @@ package org.eclipse.scout.rt.dataobject;
 
 import static org.eclipse.scout.rt.testing.platform.util.ScoutAssert.assertEqualsWithComparisonFailure;
 
-import org.eclipse.scout.rt.dataobject.DoEntity;
-import org.eclipse.scout.rt.dataobject.DoEntityBuilder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
 import org.eclipse.scout.rt.platform.BEANS;
 import org.eclipse.scout.rt.platform.util.CollectionUtility;
 import org.junit.Test;
@@ -25,18 +27,38 @@ public class DoEntityBuilderTest {
     DoEntity expected = BEANS.get(DoEntity.class);
     expected.put("attribute1", "foo");
     expected.put("attribute2", 42);
-    expected.putList("listAttribute", CollectionUtility.arrayList(1, 2, 3));
+    expected.put("attribute3", "bar");
+    expected.putList("listAttribute1", CollectionUtility.arrayList(1, 2, 3));
+    expected.putList("listAttribute2", CollectionUtility.arrayList(4, 5, 6));
 
     DoEntity actual = BEANS.get(DoEntityBuilder.class)
         .put("attribute1", "foo")
         .put("attribute2", 42)
-        .putList("listAttribute", 1, 2, 3)
+        .putIf("attribute3", "bar", Objects::nonNull)
+        .putIf("attribute4", null, Objects::nonNull)
+        .putList("listAttribute1", 1, 2, 3)
+        .putList("listAttribute2", Arrays.asList(4, 5, 6))
         .build();
     assertEqualsWithComparisonFailure(expected, actual);
 
     // ensure lists are mutable
-    expected.getList("listAttribute").remove(1);
-    actual.getList("listAttribute").remove(1);
+    expected.getList("listAttribute1").remove(1);
+    actual.getList("listAttribute1").remove(1);
+    assertEqualsWithComparisonFailure(expected, actual);
+  }
+
+  @Test
+  public void testBuildNullValues() {
+    DoEntity expected = BEANS.get(DoEntity.class);
+    expected.put("attribute1", null);
+    expected.putList("listAttribute1", CollectionUtility.emptyArrayList());
+    expected.putList("listAttribute2", CollectionUtility.emptyArrayList());
+
+    DoEntity actual = BEANS.get(DoEntityBuilder.class)
+        .put("attribute1", null)
+        .putList("listAttribute1", (Object[]) null)
+        .putList("listAttribute2", (List<Object>) null)
+        .build();
     assertEqualsWithComparisonFailure(expected, actual);
   }
 }