Index: vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml
===================================================================
diff -u -r61995 -r62000
--- vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml	(.../Test.cls.xml)	(revision 61995)
+++ vhUnitTest/zTryout/LLA/ParseCacheObjectToJson/Test.cls.xml	(.../Test.cls.xml)	(revision 62000)
@@ -20,102 +20,78 @@
 
 <Method name="Test JSON GeefProductRestRequest zonder ingegeven kenmerken en productdata">
 <Implementation><![CDATA[
-	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
-	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..GeefProductRestRequestBasis()
 	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))
+
+	Do ..AssertJson(GeefProductRestRequest, ExpectedJsonString)
 ]]></Implementation>
 </Method>
 
 <Method name="Test JSON GeefProductRestRequest zonder ingegeven kenmerken">
 <Implementation><![CDATA[
-	#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 = ..GeefProductData()
 	
-	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
-	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..GeefProductRestRequestBasis()
 	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))
+	
+	Do ..AssertJson(GeefProductRestRequest, ExpectedJsonString)
 ]]></Implementation>
 </Method>
 
 <Method name="Test JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type">
 <Implementation><![CDATA[
-	#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 = ..GeefProductData()
 	
-	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
-	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
-	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"
+	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ..GeefIngegevenKenmerkenBasis()
 
-	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
-	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..GeefProductRestRequestBasis()
 	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:{}, 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))
+	
+	Do ..AssertJson(GeefProductRestRequest, ExpectedJsonString)
 ]]></Implementation>
 </Method>
 
 <Method name="Test JSON met ingegeven kenmerken, met een array object">
 <Implementation><![CDATA[
-	#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 = ..GeefProductData()
 	
-	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
-	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
-	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"
+	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ..GeefIngegevenKenmerkenBasis()
 	Set IngegevenKenmerken.GekoppeldeIngegevenKenmerken = ..GeefArrayGekoppeldeIngegevenKenmerken()
 		
-	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
-	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
-	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..GeefProductRestRequestBasis()
 	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))
+	
+	Do ..AssertJson(GeefProductRestRequest, 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"
+	#dim ProductData As DOM.PM.dto.ProductData = ..GeefProductData()
 	
-	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
-	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
-	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"
+	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ..GeefIngegevenKenmerkenBasis()
 	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"
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..GeefProductRestRequestBasis()
 	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))
+	
+	Do ..AssertJson(GeefProductRestRequest, ExpectedJsonString)
 ]]></Implementation>
 </Method>
 
@@ -179,6 +155,49 @@
 	Quit NietMeeleveren
 ]]></Implementation>
 </Method>
+
+<Method name="GeefProductData">
+<ReturnType>DOM.PM.dto.ProductData</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
+	Set ProductData.PRNr = 1
+	Set ProductData.DossierNummer = "DummyDossierNummer"
+	
+	Quit ProductData
+]]></Implementation>
+</Method>
+
+<Method name="GeefIngegevenKenmerkenBasis">
+<ReturnType>zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken</ReturnType>
+<Implementation><![CDATA[
+	#dim IngegevenKenmerken As zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken = ##class(zTryout.LLA.RestAPI.ParseJsonObject.IngegevenKenmerken).%New()
+	Set IngegevenKenmerken.ProductieWijze = "DummyProductieWijze"
+	Set IngegevenKenmerken.VersieNr = "DummyVersieNr"
+			
+	Quit IngegevenKenmerken
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductRestRequestBasis">
+<ReturnType>zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest</ReturnType>
+<Implementation><![CDATA[
+	#dim GeefProductRestRequest As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%New()
+	Set GeefProductRestRequest.Aantal = "DummyAantalValue"
+	Set GeefProductRestRequest.KlantID = "DummyKlantIDValue"
+	
+	Quit GeefProductRestRequest
+]]></Implementation>
+</Method>
+
+<Method name="AssertJson">
+<FormalSpec>GeefProductRestRequest:zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest,ExpectedJsonString:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim OutputJsonString As %String
+	#dim ParseStatus As %Status = ##class(TECH.JSON.ParserIntersystemsVersion).ObjectToJSON(GeefProductRestRequest,,,.OutputJsonString)
+	Do $$$AssertFalse($$$ISERR(ParseStatus))
+	Do $$$AssertEquals($$$Trim(OutputJsonString),$$$Trim(ExpectedJsonString))
+]]></Implementation>
+</Method>
 </Class>