Index: vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml
===================================================================
diff -u -r61991 -r61995
--- vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml	(.../Test.cls.xml)	(revision 61991)
+++ vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml	(.../Test.cls.xml)	(revision 61995)
@@ -20,145 +20,102 @@
 
 <Method name="Test JSON GeefProductRestRequest zonder ingegeven kenmerken en productdata">
 <Implementation><![CDATA[
-	Do ##class(Tools.Wlip).%New(43).String("--------------------------------------------------")
-	Do ##class(Tools.Wlip).%New(43).String("Test JSON GeefProductRestRequest zonder ingegeven kenmerken en productdata")
-	//#dim JSONString As %String = "{ ""Field1"":""Field1Value"" }"
-	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"" }"
-
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set Object.Aantal = "FieldIntValue"
-	Set Object.KlantID = "FieldDOMVKPVanHoeckeKlantIDValue"
-	Set Object.IngegevenKenmerken = ""
-	Set Object.ProductData = ""
-	
-	Do ##class(Tools.Wlip).%New(43).String("object.KlantID "_Object.KlantID)
-	Do ##class(Tools.Wlip).%New(43).String("object.Aantal "_Object.Aantal)
-	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	
-	Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).%ObjectToJSON(Object)
-	Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(Object)
-	//Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).%WriteJSONFromObject(Object)
-	Do ##class(Tools.Wlip).%New(43).String("parsedjsonobject")
-	Do ##class(Tools.Wlip).%New(43).String(parsedjsonobject)
-	Write "-- Eerste test--"
-	;Write parsedjsonobject
-	;Write "----"
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
+	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
+	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	Set GeefProductRestRequest.IngegevenKenmerken = ""
+	Set GeefProductRestRequest.ProductData = ""
+		
+	#dim ParsedJsonObject As %String = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(GeefProductRestRequest)
+	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken:null, KlantID:""DummyKlantIDValue"", ProductData:null}"
+	Do $$$AssertEquals($$$Trim(ParsedJsonObject),$$$Trim(ExpectedJsonString))
 ]]></Implementation>
 </Method>
 
 <Method name="Test JSON GeefProductRestRequest zonder ingegeven kenmerken">
 <Implementation><![CDATA[
-	Do ##class(Tools.Wlip).%New(43).String("--------------------------------------------------")
-	Do ##class(Tools.Wlip).%New(43).String("Test JSON GeefProductRestRequest zonder ingegeven kenmerken")
-	//#dim JSONString As %String = "{ ""Field1"":""Field1Value"" }"
-	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"" }"
-
-	#dim productData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	Set productData.PRNr = 1
-	Set productData.DossierNummer = "DummyDossierNummer"
+	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
+	Set ProductData.PRNr = 1
+	Set ProductData.DossierNummer = "DummyDossierNummer"
 	
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set Object.Aantal = "FieldIntValue"
-	Set Object.KlantID = "FieldDOMVKPVanHoeckeKlantIDValue"
-	Set Object.IngegevenKenmerken = ""
-	Set Object.ProductData = productData
-	
-	Do ##class(Tools.Wlip).%New(43).String("object.KlantID "_Object.KlantID)
-	Do ##class(Tools.Wlip).%New(43).String("object.Aantal "_Object.Aantal)
-	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	
-	Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(Object)
-	//Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).%ObjectToJSON(Object)
-	//Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).%WriteJSONFromObject(Object)
-	Do ##class(Tools.Wlip).%New(43).String("parsedjsonobject")
-	Do ##class(Tools.Wlip).%New(43).String(parsedjsonobject)
-	Write "-- Tweede test --"
-	;Write parsedjsonobject
-	;Write "----"
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
+	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
+	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	Set GeefProductRestRequest.IngegevenKenmerken = ""
+	Set GeefProductRestRequest.ProductData = ProductData
+		
+	#dim ParsedJsonObject As %String = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(GeefProductRestRequest)
+	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken:null, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
+	Do $$$AssertEquals($$$Trim(ParsedJsonObject),$$$Trim(ExpectedJsonString))
 ]]></Implementation>
 </Method>
 
 <Method name="Test JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type">
 <Implementation><![CDATA[
-	Write "-- Derde test--"
-	Do ##class(Tools.Wlip).%New(43).String("--------------------------------------------------")
-	Do ##class(Tools.Wlip).%New(43).String("Test JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type")
-	//#dim JSONString As %String = "{ ""Field1"":""Field1Value"" }"
-	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"" }"
-
 	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	Set ProductData.PRNr = "ProductDataFieldPRNrIntValue1"
-	Set ProductData.DossierNummer = "ProductDataFieldDossierNummerStringValue1"
+	Set ProductData.PRNr = 1
+	Set ProductData.DossierNummer = "DummyDossierNummer"
 	
 	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
 	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
 	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"
+
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
+	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
+	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	Set GeefProductRestRequest.IngegevenKenmerken = IngegevenKenmerken
+	Set GeefProductRestRequest.ProductData = ProductData
 	
-	;Property ProductieWijze As %String;
-	;Property Onderdelen As list Of %String;
-	;Property NietMeeleveren As list Of DOM.PM.Maatwerk.Calc.HF.enu.HalffabRol;
-	;Property ExplicietGekozenKenmerken As list Of %String;
-	;Property GekoppeldeIngegevenKenmerken As array Of DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken;
-	;Property VersieNr As %String;
-	
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set Object.Aantal = "FieldIntValue"
-	Set Object.KlantID = "FieldDOMVKPVanHoeckeKlantIDValue"
-	Set Object.IngegevenKenmerken = IngegevenKenmerken
-	Set Object.ProductData = ProductData
-	
-	Do ##class(Tools.Wlip).%New(43).String("object.KlantID "_Object.KlantID)
-	Do ##class(Tools.Wlip).%New(43).String("object.Aantal "_Object.Aantal)
-	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
-	do $$$AssertEquals(Object.ProductData.PRNr,"ProductDataFieldPRNrIntValue1")
-	do $$$AssertEquals(Object.IngegevenKenmerken.ProductieWijze,"DummyProductieWijze")
-	do $$$AssertEquals(Object.IngegevenKenmerken.VersieNr,"DummyVersieNr")
-	
-	Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(Object)
-	//Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).%ObjectToJSON(Object)
-	//Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).%WriteJSONFromObject(Object)
-	Do ##class(Tools.Wlip).%New(43).String("parsedjsonobject")
-	Do ##class(Tools.Wlip).%New(43).String(parsedjsonobject)
-	;Write "-- Derde test --"
-	;Write parsedjsonobject
-	;Write "----"
+	#dim ParsedJsonObject As %String = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(GeefProductRestRequest)
+	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, NietMeeleveren:[], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
+	Do $$$AssertEquals($$$Trim(ParsedJsonObject),$$$Trim(ExpectedJsonString))
 ]]></Implementation>
 </Method>
 
 <Method name="Test JSON met ingegeven kenmerken, met een array object">
 <Implementation><![CDATA[
-	Write "-- Vierde test--"
-	Do ##class(Tools.Wlip).%New(43).String("--------------------------------------------------")
-	Do ##class(Tools.Wlip).%New(43).String("Test JSON met ingegeven kenmerken, met een array object")
-	
 	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	Set ProductData.PRNr = "ProductDataFieldPRNrIntValue1"
-	Set ProductData.DossierNummer = "ProductDataFieldDossierNummerStringValue1"
+	Set ProductData.PRNr = 1
+	Set ProductData.DossierNummer = "DummyDossierNummer"
 	
 	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
 	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
 	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"
 	Set IngegevenKenmerken.GekoppeldeIngegevenKenmerken = ..GeefArrayGekoppeldeIngegevenKenmerken()
 		
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set Object.Aantal = "FieldIntValue"
-	Set Object.KlantID = "FieldDOMVKPVanHoeckeKlantIDValue"
-	Set Object.IngegevenKenmerken = IngegevenKenmerken
-	Set Object.ProductData = ProductData
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
+	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
+	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	Set GeefProductRestRequest.IngegevenKenmerken = IngegevenKenmerken
+	Set GeefProductRestRequest.ProductData = ProductData
+		
+	#dim ParsedJsonObject As %String = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(GeefProductRestRequest)
+	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{MatX: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0},MatY: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0}}, NietMeeleveren:[], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
+	Do $$$AssertEquals($$$Trim(ParsedJsonObject),$$$Trim(ExpectedJsonString))
+]]></Implementation>
+</Method>
+
+<Method name="Test JSON met ingegeven kenmerken, met een list object">
+<Implementation><![CDATA[
+	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
+	Set ProductData.PRNr = 1
+	Set ProductData.DossierNummer = "DummyDossierNummer"
 	
-	Do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	Do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	Do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
-	Do $$$AssertEquals(Object.ProductData.PRNr,"ProductDataFieldPRNrIntValue1")
-	Do $$$AssertEquals(Object.IngegevenKenmerken.ProductieWijze,"DummyProductieWijze")
-	Do $$$AssertEquals(Object.IngegevenKenmerken.VersieNr,"DummyVersieNr")
-	
-	Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(Object)
-	Do ##class(Tools.Wlip).%New(43).String(parsedjsonobject)
+	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
+	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
+	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"
+	Set IngegevenKenmerken.GekoppeldeIngegevenKenmerken = ..GeefArrayGekoppeldeIngegevenKenmerken()
+	Set IngegevenKenmerken.NietMeeleveren = ..GeefNietMeeleveren()
+		
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
+	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
+	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	Set GeefProductRestRequest.IngegevenKenmerken = IngegevenKenmerken
+	Set GeefProductRestRequest.ProductData = ProductData
+		
+	#dim ParsedJsonObject As %String = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(GeefProductRestRequest)
+	#dim ExpectedJsonString As %String = "{ _class:'zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest', Aantal:""DummyAantalValue"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, IngegevenKenmerken: { _class:'zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken', ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{MatX: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0},MatY: { _class:'DOM.PM.Maatwerk.Calc.Common.impl.MATKenmerken', Breedte:"""", Diepte:200, ExplicietGekozenKenmerken:[], GekoppeldeIngegevenKenmerken:{}, Kleur:""ZW"", Materiaal:""CL"", NietMeeleveren:[""Mat""], Onderdelen:[""MatOnderdeel""], ProductieWijze:""Volledig"", Type:""Basis"", VersieNr:0}}, NietMeeleveren:[""NietMeeleveren1"",""NietMeeleveren2""], Onderdelen:[], ProductieWijze:""DummyProductieWijze"", VersieNr:""DummyVersieNr""}, KlantID:""DummyKlantIDValue"", ProductData: { _class:'DOM.PM.dto.ProductData', DossierNummer:""DummyDossierNummer"", E: { _class:'TECH.Exceptions', AbstractOmschrijvingException:""TECH.Exceptions.AbstractOmschrijvingException"", BaseException:""TECH.Exceptions.BaseException"", CommunicationErrorException:""TECH.Exceptions.CommunicationErrorException"", ConcurrencyException:""TECH.Concurrency.ConcurrencyException"", DataCorruptException:""TECH.Exceptions.DataCorruptException"", DataNotFoundException:""TECH.Exceptions.DataNotFoundException"", DoesNotExistsException:""TECH.Exceptions.DoesNotExistsException"", EnumerationException:""TECH.Exceptions.EnumerationException"", FileException:""TECH.Exceptions.FileException"", GeneralErrorException:""TECH.Exceptions.GeneralErrorException"", IllegalArgumentException:""TECH.Exceptions.IllegalArgumentException"", IllegalUsageException:""TECH.Exceptions.IllegalUsageException"", InvalidInputException:""TECH.Exceptions.InvalidInputException"", InvalidResponseException:""TECH.Exceptions.InvalidResponseException"", InvalidUserInputException:""TECH.Exceptions.InvalidUserInputException"", IteratorUitvoerderOpdrachtException:""TECH.IteratorUitvoerderOpdrachtException"", LockedException:""TECH.Exceptions.LockedException"", MockException:""TECH.Exceptions.MockException"", NoException:""TECH.Exceptions.NoException"", NotSupportedException:""TECH.Exceptions.NotSupportedException"", ObjectConverterCombinationException:""TECH.ObjectUtils.ObjectConverterCombinationException"", ObjectConverterException:""TECH.ObjectUtils.ObjectConverterException"", ObjectConverterPropertyException:""TECH.ObjectUtils.ObjectConverterPropertyException"", ObjectExpectedException:""TECH.Exceptions.ObjectExpectedException"", ObjectValidationFailedException:""TECH.Exceptions.ObjectValidationFailedException"", OngeldigLeverAdres:""TECH.Exceptions.OngeldigLeverAdres"", OngeldigeGegevensOntvangen:""TECH.Exceptions.OngeldigeGegevensOntvangen"", OngeldigeOptieKeuze:""TECH.Exceptions.OngeldigeOptieKeuze"", OngeldigeVerzendKeuze:""TECH.Exceptions.OngeldigeVerzendKeuze"", ResultSetNoRecordException:""TECH.Exceptions.ResultSetNoRecordException"", RuntimeException:""TECH.Exceptions.RuntimeException"", SaveFailedException:""TECH.Exceptions.SaveFailedException"", StapelingException:""TECH.Algo.Stapeling.StapelingException"", StatusException:""TECH.Exceptions.StatusException"", TemplateBaseException:""TECH.Exceptions.TemplateBaseException"", UnimplementedException:""TECH.Exceptions.UnimplementedException""}, PRNr:1}}"
+	Do $$$AssertEquals($$$Trim(ParsedJsonObject),$$$Trim(ExpectedJsonString))
 ]]></Implementation>
 </Method>
 
@@ -174,7 +131,6 @@
 	
 	Set DtoNaarGekoppeldeKenmerkConverteerder = ##class(APPS.PM.Maatwerk.impl.DtoNaarGekoppeldeKenmerkConverter).%New(WaardenKopieerderStub)
 	
-	;#dim IngegevenKenmerkenArray As Array of DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken =  ..DtoNaarGekoppeldeKenmerkConverteerder.Converteer(..HoofdIngegevenKenmerken, ..IngegevenKenmerkenDto,##class(DOM.PM.Maatwerk.Calc.Common.enu.GekoppeldIKType).Mat())
 	Quit DtoNaarGekoppeldeKenmerkConverteerder.Converteer(..HoofdIngegevenKenmerken, ..IngegevenKenmerkenDto,##class(DOM.PM.Maatwerk.Calc.Common.enu.GekoppeldIKType).Mat())
 ]]></Implementation>
 </Method>
@@ -212,41 +168,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test JSON met ingegeven kenmerken, met een list object">
-<Implementation><![CDATA[
-	Write "-- Vijfde test--"
-	Do ##class(Tools.Wlip).%New(43).String("--------------------------------------------------")
-	Do ##class(Tools.Wlip).%New(43).String("Test JSON met ingegeven kenmerken, met een array object")
-	
-	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	Set ProductData.PRNr = "ProductDataFieldPRNrIntValue1"
-	Set ProductData.DossierNummer = "ProductDataFieldDossierNummerStringValue1"
-	
-	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
-	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
-	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"
-	Set IngegevenKenmerken.GekoppeldeIngegevenKenmerken = ..GeefArrayGekoppeldeIngegevenKenmerken()
-	Set IngegevenKenmerken.NietMeeleveren = ..GeefNietMeeleveren()
-
-		
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set Object.Aantal = "FieldIntValue"
-	Set Object.KlantID = "FieldDOMVKPVanHoeckeKlantIDValue"
-	Set Object.IngegevenKenmerken = IngegevenKenmerken
-	Set Object.ProductData = ProductData
-	
-	Do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	Do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	Do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
-	Do $$$AssertEquals(Object.ProductData.PRNr,"ProductDataFieldPRNrIntValue1")
-	Do $$$AssertEquals(Object.IngegevenKenmerken.ProductieWijze,"DummyProductieWijze")
-	Do $$$AssertEquals(Object.IngegevenKenmerken.VersieNr,"DummyVersieNr")
-	
-	Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(Object)
-	Do ##class(Tools.Wlip).%New(43).String(parsedjsonobject)
-]]></Implementation>
-</Method>
-
 <Method name="GeefNietMeeleveren">
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
@@ -258,144 +179,6 @@
 	Quit NietMeeleveren
 ]]></Implementation>
 </Method>
-
-<Method name="TestEenTest">
-<Implementation><![CDATA[
-	set obj = ##class(%ZEN.proxyObject).%New()
- 	set obj.prop = "val"
- 	do obj.%ToJSON()
- 	set dtList = ##class(%Library.ListOfDataTypes).%New()
- 	set a = 1
- 	do dtList.Insert(a)
- 	do dtList.Insert("a")
- 	do ##class(%ZEN.Auxiliary.jsonProvider).%ObjectToJSON(dtList)
- 	Set parsedjsonobject = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(dtList)
- 	Do ##class(Tools.Wlip).%New(43).String(parsedjsonobject)
-]]></Implementation>
-</Method>
-
-<Method name="aTest JSON GeefProductRestRequest zonder ingegeven kenmerken, met productdata">
-<Implementation><![CDATA[
-	//#dim JSONString As %String = "{ ""Field1"":""Field1Value"" , ""Embedded"" :[{ ""Field1"":""EmbeddedField1Value""}] }"
-	
-	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" } }"
-
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
-	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
-	do $$$AssertEquals(Object.ProductData.PRNr,"ProductDataFieldPRNrIntValue1")
-]]></Implementation>
-</Method>
-
-<Method name="aTest JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type">
-<Implementation><![CDATA[
-	//#dim JSONString As %String = "{ ""Field1"":""Field1Value"" , ""Embedded"" :[{ ""Field1"":""EmbeddedField1Value""}] }"
-	
-	//#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" } }"
-	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" }, ""IngegevenKenmerken"": { ""ProductieWijze"":""IngegevenKenmerkenFieldVersieNrStringValue"", ""VersieNr"":""IngegevenKenmerkenFieldVersieNrIntValue"" }   }"
-
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
-	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
-	do $$$AssertEquals(Object.ProductData.PRNr,"ProductDataFieldPRNrIntValue1")
-	do $$$AssertEquals(Object.IngegevenKenmerken.ProductieWijze,"IngegevenKenmerkenFieldVersieNrStringValue")
-	do $$$AssertEquals(Object.IngegevenKenmerken.VersieNr,"IngegevenKenmerkenFieldVersieNrIntValue")
-]]></Implementation>
-</Method>
-
-<Method name="aTest JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type behalve onderdelen (list of string)">
-<Implementation><![CDATA[
-	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" }, ""IngegevenKenmerken"": { ""ProductieWijze"":""IngegevenKenmerkenFieldVersieNrStringValue"", ""VersieNr"":""IngegevenKenmerkenFieldVersieNrIntValue"", ""Onderdelen"": [ ""OnderdelenString1"", ""OnderdelenString2"" ] }   }"
-
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
-	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
-	do $$$AssertEquals(Object.ProductData.PRNr,"ProductDataFieldPRNrIntValue1")
-	do $$$AssertEquals(Object.IngegevenKenmerken.ProductieWijze,"IngegevenKenmerkenFieldVersieNrStringValue")
-	do $$$AssertEquals(Object.IngegevenKenmerken.VersieNr,"IngegevenKenmerkenFieldVersieNrIntValue")
-
-	if $$$AssertEquals(Object.IngegevenKenmerken.Onderdelen.Count(),2) {
-		do $$$AssertEquals(Object.IngegevenKenmerken.Onderdelen.GetAt(1),"OnderdelenString1")	
-		do $$$AssertEquals(Object.IngegevenKenmerken.Onderdelen.GetAt(2),"OnderdelenString2")	
-	}
-]]></Implementation>
-</Method>
-
-<Method name="aTest JSON GeefProductRestRequest met ingegeven kenmerken met ingevulde properties van list type">
-<Implementation><![CDATA[
-	// TODO verdere lijst data aanvullen
-	// TODO 2 volgende test is dan op in het GeefProductRestRequest de ingegeven kenmerken defenitie te vervangen door de juiste defenitie van de DOM klasse ipv de ztryoutLLA.....iK
-	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" }, ""IngegevenKenmerken"": { ""ProductieWijze"":""IngegevenKenmerkenFieldVersieNrStringValue"", ""VersieNr"":""IngegevenKenmerkenFieldVersieNrIntValue"", ""Onderdelen"": [ ""OnderdelenString1"", ""OnderdelenString2"" ] }   }"
-
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
-	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
-	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
-	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
-	do $$$AssertEquals(Object.ProductData.PRNr,"ProductDataFieldPRNrIntValue1")
-	do $$$AssertEquals(Object.IngegevenKenmerken.ProductieWijze,"IngegevenKenmerkenFieldVersieNrStringValue")
-	do $$$AssertEquals(Object.IngegevenKenmerken.VersieNr,"IngegevenKenmerkenFieldVersieNrIntValue")
-
-	if $$$AssertEquals(Object.IngegevenKenmerken.Onderdelen.Count(),2) {
-		do $$$AssertEquals(Object.IngegevenKenmerken.Onderdelen.GetAt(1),"OnderdelenString1")	
-		do $$$AssertEquals(Object.IngegevenKenmerken.Onderdelen.GetAt(2),"OnderdelenString2")	
-	}
-]]></Implementation>
-</Method>
-
-<Method name="aTestJSONStringMetEmbeddedListMeerdereItems">
-<Implementation><![CDATA[
-	#dim JSONString As %String = "{ ""Field1"":""Field1Value"" , ""Embedded"" :[{ ""Field1"":""EmbeddedField1Value1""},{ ""Field1"":""EmbeddedField1Value2""}] }"
-	
-	#dim Object As vhUnitTest.TECH.JSON.Parser.ParseJSON.Main = ..Parse(JSONString)
-	
-	do $$$AssertEquals(Object.Field1,"Field1Value")
-	if $$$AssertEquals(Object.Embedded.Count(),2) {
-		do $$$AssertEquals(Object.Embedded.GetAt(1).Field1,"EmbeddedField1Value1")	
-		do $$$AssertEquals(Object.Embedded.GetAt(1).Field2,"")	
-		do $$$AssertEquals(Object.Embedded.GetAt(2).Field1,"EmbeddedField1Value2")	
-		do $$$AssertEquals(Object.Embedded.GetAt(2).Field2,"")	
-	}
-]]></Implementation>
-</Method>
-
-<Method name="aTestJSONStringMetEmbeddedListMeerdereItemsMeerdereVelden">
-<Implementation><![CDATA[
-	#dim JSONString As %String = "{ ""Field1"":""Field1Value"" , ""Embedded"" :[{ ""Field1"":""EmbeddedField1Value1"" , ""Field2"":""EmbeddedField2Value1""},{ ""Field1"":""EmbeddedField1Value2""}] }"
-	
-	#dim Object As vhUnitTest.TECH.JSON.Parser.ParseJSON.Main = ..Parse(JSONString)
-	
-	do $$$AssertEquals(Object.Field1,"Field1Value")
-	if $$$AssertEquals(Object.Embedded.Count(),2) {
-		do $$$AssertEquals(Object.Embedded.GetAt(1).Field1,"EmbeddedField1Value1")	
-		do $$$AssertEquals(Object.Embedded.GetAt(1).Field2,"EmbeddedField2Value1")	
-		do $$$AssertEquals(Object.Embedded.GetAt(2).Field1,"EmbeddedField1Value2")	
-		do $$$AssertEquals(Object.Embedded.GetAt(2).Field2,"")	
-	}
-]]></Implementation>
-</Method>
-
-<Method name="aTestJSONMetOnbestaandeVelden">
-<Implementation><![CDATA[
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Parsing JSON file failed")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
-	#dim JSONString As %String = "{ ""UnExistingField"":""Field1Value"" , ""Embedded"" :[{ ""Field1"":""EmbeddedField1Value""}] }"
-	#dim Object As vhUnitTest.TECH.JSON.Parser.ParseJSON.Main = ..Parse(JSONString)
-]]></Implementation>
-</Method>
-
-<Method name="Parse">
-<FormalSpec>JSONString:%String</FormalSpec>
-<ReturnType>vhUnitTest.TECH.JSON.Parser.ParseJSON.Main</ReturnType>
-<Implementation><![CDATA[
-	#dim ObjectClassName As %String = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%ClassName(1)
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest
-	do ##class(TECH.JSON.Parser).ParseJSON(JSONString,ObjectClassName,.Object)
-	quit Object
-]]></Implementation>
-</Method>
 </Class>