Issue #269: Do not populate collections and maps with null values. Ar…

…rays and non-Java core collections are still populated.
mtedone · Jan 6, 2019 · 7076fed · 7076fed
1 parent 9c34b32
commit 7076fed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/src/main/java/uk/co/jemos/podam/api/PodamFactoryImpl.java b/src/main/java/uk/co/jemos/podam/api/PodamFactoryImpl.java
@@ -1231,7 +1231,10 @@ private void fillCollection(ManufacturingContext manufacturingCtx,
 							collectionElementType, collectionElementType,
 							annotations, attributeName, NULL_TYPE_ARGS_MAP, genericTypeArgs);
 				}
-				collection.add(element);
+
+				if (null != element) {
+					collection.add(element);
+				}
 			}
 		} catch (UnsupportedOperationException e) {
 
@@ -1505,8 +1508,7 @@ private void fillMap(MapArguments mapArguments, ManufacturingContext manufacturi
 
 				elementValue = getMapKeyOrElementValue(valueArguments, manufacturingCtx);
 
-				/* ConcurrentHashMap doesn't allow null values */
-				if (elementValue != null || !(map instanceof ConcurrentHashMap)) {
+				if (elementValue != null) {
 					map.put(keyValue, elementValue);
 				}
 			}

diff --git a/...test/java/uk/co/jemos/podam/test/unit/features/basicTypes/PodamFactoryBasicTypesTest.java b/...test/java/uk/co/jemos/podam/test/unit/features/basicTypes/PodamFactoryBasicTypesTest.java
@@ -108,10 +108,7 @@ public void podamShouldFillRecursivePojosWithLists() throws Exception {
         podamValidationSteps.theCollectionShouldNotBeNullOrEmptyAndContainElementsOfType(recursivePojo.getChildren(), RecursivePojoWithList.class);
         for (RecursivePojoWithList child : recursivePojo.getChildren()) {
             podamValidationSteps.thePojoShouldBeNull(child.getRelated());
-            podamValidationSteps.theCollectionShouldNotBeNullOrEmpty(child.getChildren());
-            for (RecursivePojoWithList grandChild : child.getChildren()) {
-                podamValidationSteps.thePojoShouldBeNull(grandChild);
-            }
+            podamValidationSteps.theCollectionShouldBeEmpty(child.getChildren());
         }
     }
 

diff --git a/src/test/java/uk/co/jemos/podam/test/unit/features/collections/CollectionsTest.java b/src/test/java/uk/co/jemos/podam/test/unit/features/collections/CollectionsTest.java
@@ -204,21 +204,8 @@ private void testMap(final Class<? extends Map> mapType) {
         Map<?,?> pojo = podamInvocationSteps.whenIInvokeTheFactoryForGenericTypeWithSpecificType(
                 mapType, podamFactory, String.class, PodamTestInterface.class);
 
-        int mapSize;
-        if (ConcurrentMap.class.isAssignableFrom(mapType)) {
-            mapSize = 0;
-        } else {
-            DataProviderStrategy strategy = podamFactory.getStrategy();
-            mapSize = strategy.getNumberOfCollectionElements(PodamTestInterface.class);
-        }
-
         podamValidationSteps.thePojoMustBeOfTheType(pojo, Map.class);
-        if (0 != mapSize) {
-            podamValidationSteps.theCollectionShouldNotBeNullOrEmptyAndShouldHaveExactlyTheExpectedNumberOfElements(pojo.keySet(), String.class, mapSize);
-            podamValidationSteps.theTwoObjectsShouldBeEqual(mapSize, pojo.values().size());
-        } else {
-            podamValidationSteps.theMapShouldBeEmpty(pojo);
-        }
+        podamValidationSteps.theMapShouldBeEmpty(pojo);
     }