Index: vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/TestMaatwerkDetailsJsonToCacheObject.cls.xml
===================================================================
diff -u
--- vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/TestMaatwerkDetailsJsonToCacheObject.cls.xml	(revision 0)
+++ vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/TestMaatwerkDetailsJsonToCacheObject.cls.xml	(revision 62002)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.zTryout.LLA.ParseJsonMaatwerkFrameworkRestApi.TestMaatwerkDetailsJsonToCacheObject">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test JSON GeefProductRestRequest zonder ingegeven kenmerken en productdata">
+<Implementation><![CDATA[
+	#dim JSONString As %String = "{""Halffabrikaten"":{""HalffabItems"":[{""Aantal"":1.0,""Gewicht"":100.0,""OpnemenInEindproduct"":false,""Rol"":""EenRolNaam1""},{""Aantal"":2.0,""Gewicht"":200.0,""OpnemenInEindproduct"":false,""Rol"":""EenRolNaam2""},{""Aantal"":3.0,""Gewicht"":300.0,""OpnemenInEindproduct"":true,""Rol"":""EenRolNaam3""}],""Aantal"":0.0,""Gewicht"":0.0,""OpnemenInEindproduct"":false,""Rol"":null},""Kosten"":{""KostItems"":[{""Details"":""EenDetail1"",""Kost"":10.0,""Naam"":""EenNaam1""},{""Details"":""EenDetail2"",""Kost"":20.0,""Naam"":""EenNaam2""},{""Details"":""EenDetail3"",""Kost"":30.0,""Naam"":""EenNaam3""}],""Details"":null,""Kost"":0.0,""Naam"":null},""ProbleemRapport"":null}"
+
+	#dim MaatwerkDetails As APPS.PM.Maatwerk.dto.MaatwerkDetails = ..Parse(JSONString)
+		
+	If ($$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.Count(),3)) {
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(1).Aantal,"1.0")
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(1).Gewicht,"100.0")
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(1).OpnemenInEindproduct,0)
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(1).Rol,"EenRolNaam1")
+	
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(2).Aantal,"2.0")
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(2).Gewicht,"200.0")
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(2).OpnemenInEindproduct,0)
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(2).Rol,"EenRolNaam2")
+	
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(3).Aantal,"3.0")
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(3).Gewicht,"300.0")
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(3).OpnemenInEindproduct,1)
+		Do $$$AssertEquals(MaatwerkDetails.Halffabrikaten.HalffabItems.GetAt(3).Rol,"EenRolNaam3")
+	}
+	
+	If ($$$AssertEquals(MaatwerkDetails.Kosten.KostItems.Count(),3)) {
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(1).Details,"EenDetail1")
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(1).Kost,"10.0")
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(1).Naam,"EenNaam1")
+	
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(2).Details,"EenDetail2")
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(2).Kost,"20.0")
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(2).Naam,"EenNaam2")
+	
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(3).Details,"EenDetail3")
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(3).Kost,"30.0")
+		Do $$$AssertEquals(MaatwerkDetails.Kosten.KostItems.GetAt(3).Naam,"EenNaam3")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Parse">
+<FormalSpec>JSONString:%String</FormalSpec>
+<ReturnType>vhUnitTest.TECH.JSON.Parser.ParseJSON.Main</ReturnType>
+<Implementation><![CDATA[
+	#dim ObjectClassName As %String = ##class(APPS.PM.Maatwerk.dto.MaatwerkDetails).%ClassName(1)
+	#dim Object As APPS.PM.Maatwerk.dto.MaatwerkDetails
+	Do ##class(TECH.JSON.Parser).ParseJSON(JSONString,ObjectClassName,.Object)
+	Quit Object
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/Test.cls.xml
===================================================================
diff -u -r61379 -r62002
--- vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/Test.cls.xml	(.../Test.cls.xml)	(revision 61379)
+++ vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/Test.cls.xml	(.../Test.cls.xml)	(revision 62002)
@@ -3,18 +3,8 @@
 <Class name="vhUnitTest.zTryout.LLA.ParseJsonMaatwerkFrameworkRestApi.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="aTestJSONStream">
-<Implementation><![CDATA[
-	#dim JSONStream As %GlobalCharacterStream = ##class(%GlobalCharacterStream).%New()
-	do JSONStream.Write("{ ""Field1"":""Field1Value"" }")
-	#dim Object As vhUnitTest.TECH.JSON.Parser.ParseJSON.Main = ..Parse(JSONStream)
-	do $$$AssertEquals(Object.Field1,"Field1Value")
-]]></Implementation>
-</Method>
-
 <Method name="Test JSON GeefProductRestRequest zonder ingegeven kenmerken en productdata">
 <Implementation><![CDATA[
-	//#dim JSONString As %String = "{ ""Field1"":""Field1Value"" }"
 	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"" }"
 
 	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
@@ -25,8 +15,6 @@
 
 <Method name="Test 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)
@@ -39,9 +27,6 @@
 
 <Method name="Test 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)
@@ -75,8 +60,6 @@
 
 <Method name="Test 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)
@@ -94,47 +77,6 @@
 ]]></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>