Issue #73 Discrete and Inlist Validations throw error if data element value is not simple value (#74)

* Issue #73 Discrete Validation throw error if data element value is not simple value

* Issue #73 Discrete validation fix if value is not simple var name to test for consistency

* Issue #73 InList Validation throw error if data element value is not simple Value

Author: srikanthm79

models/validators/DiscreteValidator.cfc

@@ -55,6 +55,25 @@ component extends="BaseValidator" accessors="true" singleton {
 			return true;
 		}
 
+		// check data element value and return error if it is not simple value.
+		if ( !isSimpleValue( arguments.targetValue ) ) {
+            var args = {
+                message        : "The '#arguments.field#' value is not a Simple value",
+                field          : arguments.field,
+                validationType : getName(),
+                rejectedValue  : ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : "" ),
+                validationData : arguments.validationData
+            };
+            var error = validationResult
+                .newError( argumentCollection = args )
+                .setErrorMetadata( {
+                    "operation"      : operation,
+                    "operationValue" : operationValue
+                } );
+            validationResult.addError( error );
+          return false;
+        }
+
 		var r = false;
 		if ( !isNull( arguments.targetValue ) ) {
 			switch ( operation ) {

models/validators/InListValidator.cfc

@@ -36,6 +36,24 @@ component extends="BaseValidator" accessors="true" singleton {
 			return true;
 		}
 
+		// check data element value and return error if it is not simple value.
+		if ( !isSimpleValue( arguments.targetValue ) ) {
+            var args = {
+                message        : "The '#arguments.field#' value is not a Simple value",
+                field          : arguments.field,
+                validationType : getName(),
+                rejectedValue  : ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : "" ),
+                validationData : arguments.validationData
+            };
+            var error = validationResult
+                .newError( argumentCollection = args )
+                .setErrorMetadata( {
+                    "inlist" : arguments.validationData
+                } );
+            validationResult.addError( error );
+          return false;
+        }
+
 		// Now check
 		if ( listFindNoCase( arguments.validationData, arguments.targetValue ) ) {
 			return true;

test-harness/tests/specs/validators/DiscreteValidatorTest.cfc

@@ -47,6 +47,10 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 		assertEquals( false, r );
 		r = model.validate( result, this, "test", 4, "gte:4" );
 		assertEquals( true, r );
+
+		// Validation check - if simple value
+		r = model.validate( result, this, "test", [], "gte:1" );
+		assertEquals( false, r );
 	}
 
 }

test-harness/tests/specs/validators/InListValidatorTest.cfc

@@ -32,6 +32,16 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 			"luis,joe,alexia,vero"
 		);
 		assertEquals( true, r );
+
+		// not simple value
+		r = model.validate(
+			result,
+			this,
+			"test",
+			[],
+			"luis,joe,alexia,vero"
+		);
+		assertEquals( false, r );
 	}
 
 	function getLuis(){