Index: vhUnitTest/TECH/ClassUtils.cls.xml
===================================================================
diff -u -r1905 -r2137
--- vhUnitTest/TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 1905)
+++ vhUnitTest/TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2137)
@@ -46,29 +46,62 @@
 
 <Method name="TestMethodReturnTypeValidation">
 <Implementation><![CDATA[
-
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1,"vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
+	
+	Set $ZTRAP = "Catch1"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1.5,"vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
+Catch1 Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van TECH.Integer is niet gelukt.","Foutmelding is correct.")
+	
+	Set $ZTRAP = "Catch2"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
-	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("1-3","vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
+Catch2 Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van TECH.Integer is niet gelukt.","Foutmelding is correct.")
 	
+	Set $ZTRAP = "Catch3"	
+	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("1-3","vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
+Catch3 Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van TECH.Integer is niet gelukt.","Foutmelding is correct.")
+		
+			
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1,"vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
+	
+	
+	
+	Set $ZTRAP = "Catch4"
+	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
+Catch4 Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van %Library.Float is niet gelukt.","Foutmelding is correct.")
+	
+	
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1.5,"vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
-	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
 	
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required = "required"
+	
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 1")
-
+	
+	
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.ValueList=""
+	Set $ZTRAP = "Catch5"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 2")
-
+Catch5 Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van vhUnitTest.TECH.ClassUtilsTestObject is niet gelukt.","Foutmelding is correct.")	
+	Set $ZTRAP = "Catch6"
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
 	set obj.ValueList="InvalidValue"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 3")
-
+Catch6 Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	do $$$AssertTrue(Exception.GeefOmschrijving()["Validatie van  '%Dictionary.CompiledProperty' is niet correct.","Foutmelding is correct.")
+	
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
 	set obj.ValueList="ValidValue"
@@ -80,13 +113,17 @@
 	do obj.Array.SetAt(15,"GeldigeIntegerWaarde")
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 5")
 
+	Set $ZTRAP = "Catch7"
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
 	set obj.ValueList="ValidValue"
 	do obj.Array.SetAt(15.5,"OnGeldigeIntegerWaarde")
 	do obj.Array.SetAt(15,"GeldigeIntegerWaarde")
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 6")
-
+Catch7 Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van vhUnitTest.TECH.ClassUtilsTestObject is niet gelukt.","Foutmelding is correct.")
+	
 	quit
 ]]></Implementation>
 </Method>