Index: vhUnitTest/Tools/ObjectDumper/BaseObject.cls.xml =================================================================== diff -u -r1033 -r2008 --- vhUnitTest/Tools/ObjectDumper/BaseObject.cls.xml (.../BaseObject.cls.xml) (revision 1033) +++ vhUnitTest/Tools/ObjectDumper/BaseObject.cls.xml (.../BaseObject.cls.xml) (revision 2008) @@ -45,7 +45,7 @@ Object - + %String list @@ -55,6 +55,10 @@ list + +%ListOfDataTypes + + %String array Index: vhUnitTest/Tools/ObjectDumper/ObjectCreator.cls.xml =================================================================== diff -u -r1033 -r2008 --- vhUnitTest/Tools/ObjectDumper/ObjectCreator.cls.xml (.../ObjectCreator.cls.xml) (revision 1033) +++ vhUnitTest/Tools/ObjectDumper/ObjectCreator.cls.xml (.../ObjectCreator.cls.xml) (revision 2008) @@ -19,6 +19,9 @@ do Object.PropertyAsListOfDataTypes.Insert("Item1") do Object.PropertyAsListOfDataTypes.Insert("Item2") + do Object.PropertyAsListOfString.Insert("Item1") + do Object.PropertyAsListOfString.Insert("Item2") + do Object.PropertyAsArrayOfDataTypes.SetAt("Item1","Key1") do Object.PropertyAsArrayOfDataTypes.SetAt("Item2","Key2") Index: vhUnitTest/Tools/ObjectDumper/TestDumper.cls.xml =================================================================== diff -u -r1988 -r2008 --- vhUnitTest/Tools/ObjectDumper/TestDumper.cls.xml (.../TestDumper.cls.xml) (revision 1988) +++ vhUnitTest/Tools/ObjectDumper/TestDumper.cls.xml (.../TestDumper.cls.xml) (revision 2008) @@ -3,16 +3,16 @@ vhUnitTest.TestCase + +0 + + %Integer 0 1 - -0 - - %ListOfDataTypes 1 @@ -23,7 +23,7 @@ #dim Object = ##class(vhUnitTest.Tools.ObjectDumper.ObjectCreator).GetObject() set ..DumpResult = ##class(Tools.ObjectDumper.Dumper).%New(Object).GetResult() - + do ..WijzigObjectReferenceNummers("nn") do ..AssertValue("EmptyObject = ") @@ -36,9 +36,13 @@ do ..AssertValue("PropertyAsInteger = 1") do ..AssertValue("PropertyAsString = string") - do ..AssertValue("PropertyAsListOfDataTypes = nn@%Collection.ListOfDT") + do ..AssertValue("PropertyAsListOfDataTypes = nn@%Library.ListOfDataTypes") do ..AssertValue("PropertyAsListOfDataTypes[1] = Item1") do ..AssertValue("PropertyAsListOfDataTypes[2] = Item2") + + do ..AssertValue("PropertyAsListOfString = nn@%Collection.ListOfDT") + do ..AssertValue("PropertyAsListOfString[1] = Item1") + do ..AssertValue("PropertyAsListOfString[2] = Item2") do ..AssertValue("PropertyAsArrayOfDataTypes = nn@%Collection.ArrayOfDT") do ..AssertValue("PropertyAsArrayOfDataTypes[Key1] = Item1") Index: Tools/ObjectDumper/Base.cls.xml =================================================================== diff -u -r1907 -r2008 --- Tools/ObjectDumper/Base.cls.xml (.../Base.cls.xml) (revision 1907) +++ Tools/ObjectDumper/Base.cls.xml (.../Base.cls.xml) (revision 2008) @@ -63,7 +63,7 @@ set itProperties = ##class(TECH.ListIterator).%New(..GetProperties()) while itProperties.HasNext() { #dim Property As Tools.ObjectDumper.dto.Property = itProperties.Next() - + break:(Property.Name="NietMeeleveren")&&(..Object.NietMeeleveren.Count()) try { continue:..SkipProperty(Property.Name) if Property.ClassType = ##class(Tools.ObjectDumper.enu.ClassType).DataType() { @@ -224,6 +224,7 @@ vhUnitTest.TestCase + +0 + + %Integer 0 1 - -0 - - %ListOfDataTypes 1 @@ -42,6 +42,9 @@ do ..AssertValue("set BaseObject.PropertyAsListOfDataTypes = ##class(%ListOfDataTypes).%New()") do ..AssertValue("do BaseObject.PropertyAsListOfDataTypes.Insert(""Item1"")") do ..AssertValue("do BaseObject.PropertyAsListOfDataTypes.Insert(""Item2"")") + do ..AssertValue("set BaseObject.PropertyAsListOfString = ##class(%ListOfDataTypes).%New()") + do ..AssertValue("do BaseObject.PropertyAsListOfString.Insert(""Item1"")") + do ..AssertValue("do BaseObject.PropertyAsListOfString.Insert(""Item2"")") do ..AssertValue("do BaseObject.PropertyAsListOfObjects.Insert(##class(vhUnitTest.Tools.ObjectDumper.Object).%New())") do ..AssertValue("set BaseObject.PropertyAsListOfObjects.GetAt(1).PropertyAsInteger = ""1""") do ..AssertValue("set BaseObject.PropertyAsListOfObjects.GetAt(1).PropertyAsString = ""string""")