Index: vhUnitTest/TECH/ObjectUtils/ObjectConverter.cls.xml =================================================================== diff -u -r2202 -r2209 --- vhUnitTest/TECH/ObjectUtils/ObjectConverter.cls.xml (.../ObjectConverter.cls.xml) (revision 2202) +++ vhUnitTest/TECH/ObjectUtils/ObjectConverter.cls.xml (.../ObjectConverter.cls.xml) (revision 2209) @@ -88,7 +88,7 @@ ]]> - + + +") + do $$$AssertContains(ExceptionList.GetAt(1).GeefOmschrijving(),"*OnbestaandeProperty") + } + } +]]> + + @@ -168,9 +196,10 @@ if $$$AssertEquals(ExceptionList.Count(),1) { do $$$AssertEquals(ExceptionList.GetAt(1).%ClassName(1),"TECH.ObjectUtils.ObjectConverterPropertyException") do $$$AssertEquals(ExceptionList.GetAt(1).GeefOmschrijving(),"Invalid output validation. Value 'InvalidValue' not valid for 'AsEnumeration' on 'vhUnitTest.TECH.ObjectUtils.ObjectConverter.Object'.") + do $$$AssertEquals(ExceptionList.GetAt(1).PropertyNameFrom,"AsString") + do $$$AssertEquals(ExceptionList.GetAt(1).PropertyNameTo,"AsEnumeration") do $$$AssertTrue(ExceptionList.GetAt(1).IsOutput()) do $$$AssertFalse(ExceptionList.GetAt(1).IsInput()) - } } ]]> Index: TECH/ObjectUtils/impl/ObjectConverter.cls.xml =================================================================== diff -u -r2202 -r2209 --- TECH/ObjectUtils/impl/ObjectConverter.cls.xml (.../ObjectConverter.cls.xml) (revision 2202) +++ TECH/ObjectUtils/impl/ObjectConverter.cls.xml (.../ObjectConverter.cls.xml) (revision 2209) @@ -31,7 +31,7 @@ try { #dim Output As %CacheString = "" - do ..Validate(ObjectFrom,Conversion.PropertyFrom,1) + do ..Validate(ObjectFrom,Conversion,1) #dim Input As %CacheString = $property(ObjectFrom,Conversion.PropertyFrom) @@ -43,7 +43,7 @@ set $property(ObjectTo,Conversion.PropertyTo) = Output - do ..Validate(ObjectTo,Conversion.PropertyTo,0) + do ..Validate(ObjectTo,Conversion,0) } catch { @@ -61,12 +61,13 @@ -Object:%Base,PropertyName:%String,IsInput:%Boolean +Object:%Base,Conversion:TECH.ObjectUtils.ObjectConverter.Conversion,IsInput:%Boolean 1 Index: TECH/ObjectUtils/ObjectConverterPropertyException.cls.xml =================================================================== diff -u -r2202 -r2209 --- TECH/ObjectUtils/ObjectConverterPropertyException.cls.xml (.../ObjectConverterPropertyException.cls.xml) (revision 2202) +++ TECH/ObjectUtils/ObjectConverterPropertyException.cls.xml (.../ObjectConverterPropertyException.cls.xml) (revision 2209) @@ -19,8 +19,16 @@ %String + +%String + + + +%String + + -InputOutput:%String,ClassName:%String,PropertyName:%String,Value:%CacheString +InputOutput:%String,ClassName:%String,PropertyName:%String,Value:%CacheString,PropertyNameFrom:%String,PropertyNameTo:%String 1 1 %Status @@ -30,6 +38,8 @@ set ..ClassName = ClassName set ..PropertyName = PropertyName set ..Value = Value + set ..PropertyNameFrom = PropertyNameFrom + set ..PropertyNameTo = PropertyNameTo Quit $$$OK ]]>