Make sure method return non-null values

apex-enterprise-patterns · May 27, 2022 · 5dbfb3a · 5dbfb3a
1 parent a64b4a2
commit 5dbfb3a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/sfdx-source/apex-common/main/classes/fflib_SObjects.cls b/sfdx-source/apex-common/main/classes/fflib_SObjects.cls
@@ -161,11 +161,16 @@ public virtual class fflib_SObjects
 	 * @return Return a set with all the Id values of the given field
 	 */
 	@TestVisible
-	protected Set<Id> getIdFieldValues(Schema.SObjectField field)
+	protected virtual Set<Id> getIdFieldValues(Schema.SObjectField field)
 	{
 		Set<Id> result = new Set<Id>();
 		for (SObject record : getRecords())
 		{
+			if (record.get(field) == null)
+			{
+				continue;
+			}
+
 			result.add((Id) record.get(field));
 		}
 		return result;
@@ -177,11 +182,16 @@ public virtual class fflib_SObjects
 	 * @return Return a set with all the String values of the given field
 	 */
 	@TestVisible
-	protected Set<String> getStringFieldValues(Schema.SObjectField field)
+	protected virtual Set<String> getStringFieldValues(Schema.SObjectField field)
 	{
 		Set<String> result = new Set<String>();
 		for (SObject record : getRecords())
 		{
+			if (String.isBlank((String) record.get(field)))
+			{
+				continue;
+			}
+
 			result.add((String) record.get(field));
 		}
 		return result;

diff --git a/sfdx-source/apex-common/test/classes/fflib_SObjectsTest.cls b/sfdx-source/apex-common/test/classes/fflib_SObjectsTest.cls
@@ -134,8 +134,6 @@ private class fflib_SObjectsTest
 
 		final Set<String> expected = new Set<String>
 		{
-				null,
-				'',
 				'Canada',
 				'Ireland',
 				'UK',