Index: vhUnitTest/DOM/PM/impl/DataM/PakketService/Test.cls.xml
===================================================================
diff -u -r47325 -r47344
--- vhUnitTest/DOM/PM/impl/DataM/PakketService/Test.cls.xml	(.../Test.cls.xml)	(revision 47325)
+++ vhUnitTest/DOM/PM/impl/DataM/PakketService/Test.cls.xml	(.../Test.cls.xml)	(revision 47344)
@@ -7,11 +7,10 @@
 <Implementation><![CDATA[
 	set PakketService = ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).%New()	
 	#dim Data As TECH.MultiDim  = ""
-	;do ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).ZetTestData(.Data)
 	do PakketService.Setup(.Data)
 	
 	Do $$$AssertEquals($Get(PakketService.MultiDim("N")) ,"")
-	Do $$$AssertEquals( PakketService.GeefOfMaakPakketnummerVoorPakketnaam("K||1000", "testpakket"),"1")
+	Do $$$AssertEquals( PakketService.MaakPakket("K||1000", "testpakket"),"1")
 	Do $$$AssertEquals(PakketService.MultiDim("N") ,"1")
 ]]></Implementation>
 </Method>
@@ -24,7 +23,7 @@
 	do PakketService.Setup(.Data)
 	
 	Do $$$AssertEquals(PakketService.MultiDim("N") ,"10")
-	Do $$$AssertEquals( PakketService.GeefOfMaakPakketnummerVoorPakketnaam("K||1000", "testpakket"),"11")
+	Do $$$AssertEquals( PakketService.MaakPakket("K||1000", "testpakket"),"11")
 	Do $$$AssertEquals(PakketService.MultiDim("N") ,"11")
 ]]></Implementation>
 </Method>
@@ -37,23 +36,51 @@
 	do PakketService.Setup(.Data)
 	
 	Do $$$AssertEquals(PakketService.MultiDim("N") ,"10")
-	Do $$$AssertEquals( PakketService.GeefOfMaakPakketnummerVoorPakketnaam("K||1000", "testpakket"),"11")
+	Do $$$AssertEquals(PakketService.MaakPakket("K||1000", "testpakket"),"11")
 	Do $$$AssertEquals(PakketService.MultiDim("D",11) ,"1000\testpakket")
 	Do $$$AssertEquals(PakketService.MultiDim("IK",1000,"TESTPAKKET"),11)
 ]]></Implementation>
 </Method>
 
-<Method name="Test GeefOfMaakNieuwPakket geeft pakketnummer van bestaand pakket terug">
+<Method name="Test Aanmaken nieuw pakket met reeds bestaande pakketnaam voor klant smijt exceptie">
 <Implementation><![CDATA[
 	set PakketService = ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).%New()	
 	#dim Data As TECH.MultiDim  
 	do ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).Zet3pakkettenTestData(.Data)
 	do PakketService.Setup(.Data)
+
+	#Dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Pakket met naam '1014,002' bestaat reeds voor KlantId 'K||1000'.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
+
+	#dim Pakketnummer As %String = PakketService.MaakPakket("K||1000","1014,002")
+]]></Implementation>
+</Method>
+
+<Method name="Test GeefPakketNummerViaPakketnaam geeft pakketnummer van bestaand pakket terug">
+<Implementation><![CDATA[
+	set PakketService = ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).%New()	
+	#dim Data As TECH.MultiDim  
+	do ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).Zet3pakkettenTestData(.Data)
+	do PakketService.Setup(.Data)
 	
-	Do $$$AssertEquals( PakketService.GeefOfMaakPakketnummerVoorPakketnaam("K||1000", "1014.003"),"8")
+	Do $$$AssertEquals( PakketService.GeefPakketNummerViaPakketnaam("K||1000", "1014.003"),"8")
 ]]></Implementation>
 </Method>
 
+<Method name="Test GeefPakketNummerViaPakketnaam smijt exceptie indien ongekende pakketnaam">
+<Implementation><![CDATA[
+	set PakketService = ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).%New()	
+	#dim Data As TECH.MultiDim  
+	do ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).Zet3pakkettenTestData(.Data)
+	do PakketService.Setup(.Data)
+	
+	#Dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan pakketnummer van pakket met naam 'onbestaand' niet vinden voor KlantId 'K||1000'.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
+
+	#dim pakketnummer as %String = PakketService.GeefPakketNummerViaPakketnaam("K||1000", "onbestaand")
+]]></Implementation>
+</Method>
+
 <Method name="Test BestaatViaPakketnaam return waardes">
 <Implementation><![CDATA[
 	set PakketService = ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).%New()	
@@ -104,6 +131,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test GeefTypeEPakketNummersVoorKlantProduct">
+<Implementation><![CDATA[
+	set PakketService = ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).%New()	
+	#dim Data As TECH.MultiDim  
+	Do ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).Zet4pakkettenVerschillendeTypesTestData(.Data)
+	Do PakketService.Setup(.Data)
+
+	Do $$$AssertEquals(PakketService.GeefPakketNummersVoorKlantProduct("K||1000",3414).Count(),2)
+	Do $$$AssertEquals(PakketService.GeefTypeEPakketNummersVoorKlantProduct("K||1000",3414).Count(),1)
+	Do $$$AssertEquals(PakketService.GeefTypeEPakketNummersVoorKlantProduct("K||1000",3414).GetAt(1),"6")
+]]></Implementation>
+</Method>
+
 <Method name="Test ZetPakketType past de juiste piece aan in de global">
 <Implementation><![CDATA[
 	set PakketService = ##class(vhUnitTest.DOM.PM.impl.DataM.PakketService.PakketServiceFake).%New()