Index: Tools/Test/Asserter.cls.xml =================================================================== diff -u -r1744 -r1758 --- Tools/Test/Asserter.cls.xml (.../Asserter.cls.xml) (revision 1744) +++ Tools/Test/Asserter.cls.xml (.../Asserter.cls.xml) (revision 1758) @@ -13,6 +13,11 @@ 1 + +TECH.ObjectUtils.impl.Differenciator +1 + + TestCase:Tools.Test.TestCase,Manager:Tools.Test.Manager 1 @@ -272,41 +277,10 @@ #dim manager As Tools.Test.Manager =r%Manager #dim success As %Boolean = 1 - set Verschillen = ##class(%ListOfDataTypes).%New() - set aMessage=$g(aMessage)_":" + + #dim Verschillen As %ListOfDataTypes = ..ObjectDifferenciator.GetDifferences(Object,VerwachtObject) - #dim arrProperties As %String = "" - do arrProperties^vhLib.Class(Object.%ClassName(1),.arrProperties,"A","A","A") - - set itProperties = ##class(TECH.ArrayOneDimIterator).%New(.arrProperties) - while itProperties.HasNext() { - #dim PropertyInfo As %list = itProperties.Next() - #dim Property As %String = itProperties.Key() - - #dim PropertyIsCollection As %Boolean = $length($list(PropertyInfo,3)) - - #dim WaardePropertyObject As %CacheString = $property(Object,Property) - #dim WaardePropertyVerwachtObject As %CacheString = $property(VerwachtObject,Property) - - if PropertyIsCollection { - if $method(WaardePropertyObject,"Count") '= $method(WaardePropertyVerwachtObject,"Count") { - do Verschillen.Insert(Property_" : "_$method(WaardePropertyObject,"Count") _" <> "_ $method(WaardePropertyVerwachtObject,"Count") ) - } else { - set itList1 = ##class(TECH.ListIterator).%New(WaardePropertyObject) - set itList2 = ##class(TECH.ListIterator).%New(WaardePropertyVerwachtObject) - while itList1.HasNext() && success { - #dim Value1 As %String = itList1.Next() - #dim Value2 As %String = itList2.Next() - set success = ( Value1 = Value2) - if 'success do Verschillen.Insert("Item "_itList1.Key()_" verschillend : *"_Value1 _ "* <> *"_Value2_"*") - } - } - } elseif WaardePropertyObject '= WaardePropertyVerwachtObject { - do Verschillen.Insert(Property_" : "_WaardePropertyObject _" <> "_ WaardePropertyVerwachtObject ) - } - } - if Verschillen.Count() { set aMessage = aMessage _ ##class(TECH.ListUtils).ListToPieces(Verschillen,$$$CRLF) set success = 0 @@ -421,6 +395,15 @@ Quit Resultaat ]]> + + +1 +TECH.ObjectUtils.impl.Differenciator + +