Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r58130 -r58133
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58130)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58133)
@@ -320,7 +320,7 @@
 					}
 				} Else {
 					Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).DataNotFound()
-					Set Response.Header.Omschrijving = "Geen data gevonden voor pallet '"_OudePalletCode_"'"
+					Set Response.Header.Omschrijving = "Geen data gevonden voor code '"_OudePalletCode_"'"
 				}
 			} Else {
 				Set Response.Header.Status = "1005:InvalidUserInput"
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml
===================================================================
diff -u -r58130 -r58133
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml	(.../Test.cls.xml)	(revision 58130)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml	(.../Test.cls.xml)	(revision 58133)
@@ -8,11 +8,37 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DnaCode1">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DnaCode2">
+<Type>DOM.Halux.AAP.DnaCode</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TweeDnaCodesIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DnaCodeRepositoryMock">
+<Type>vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super()
 	Set ..Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
+	Set ..DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode1.PalletCode = "TBX12345"
+	Set ..DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
+	Set ..DnaCode2.PalletCode = "TBX54321"
+	Set ..TweeDnaCodesIterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(..DnaCode1, ..DnaCode2)
+	Set ..DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 ]]></Implementation>
 </Method>
 
@@ -21,22 +47,18 @@
 	Set ..Request.OudeCode = "TBX12345"
 	Set ..Request.NieuweCode = ""
 	
-	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(..TweeDnaCodesIterator)
 	
 	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
 	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
 
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidator)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, PalletCodeValidator)
 	
 	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do ..DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -45,61 +67,55 @@
 	Set ..Request.OudeCode = "TBX12345"
 	Set ..Request.NieuweCode = ""
 	
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(..EmptyIterator())
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(..EmptyIterator())
 	
 	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
 	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
 
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidator)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, PalletCodeValidator)
 	
 	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,##class(TECH.enu.ExceptionCode).DataNotFound())
-	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor pallet 'TBX12345'")
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor code 'TBX12345'")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do ..DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: OudeCode is geldige DnaCode (NieuweCode leeg) -&gt; lijst DnaCodes die op zelfde pallet zitten">
 <Implementation><![CDATA[
 	Set ..Request.OudeCode = "LABCDE1"
 	
-	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode1.PalletCode = "TBX12345"
-	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",DnaCode1.PalletCode).DanReturn(DnaCodeIterator)
+	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(..DnaCode1)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..DnaCode1.PalletCode).DanReturn(DnaCodeIterator)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),1)
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do ..DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: OudeCode is geldige DnaCode die niet op pallet staat (NieuweCode leeg) -&gt; foutmelding geven">
 <Implementation><![CDATA[
 	Set ..Request.OudeCode = "LABCDE1"
 	
-	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",DnaCode1.PalletCode).ExactAantalKeer(0).DanReturn(DnaCodeIterator)
+	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(..DnaCode1)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..DnaCode1.PalletCode).DanReturn(..EmptyIterator())
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock)
 	
 	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.HernoemPallet(..Request)
 	
-	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
+	Do $$$AssertEquals(Antwoord.Header.Status,"-1021")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do ..DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -108,22 +124,21 @@
 	Set ..Request.OudeCode = $$$DummyString
 	Set ..Request.NieuweCode = ""
 	
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).ExactAantalKeer(0).DanDoeNiks()
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).ExactAantalKeer(0).DanDoeNiks()
 	
 	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
 	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$False)
 	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.NieuweCode).DanReturn($$$True)
 
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidator)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, PalletCodeValidator)
 	
 	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Ongeldige code")
 	Do $$$AssertEquals(Antwoord.Header.OmschrijvingVoorLogging,"Ongeldige code: 'NIET VAN TOEPASSING'")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do ..DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -132,22 +147,21 @@
 	Set ..Request.OudeCode = "TBX12345"
 	Set ..Request.NieuweCode = $$$DummyString
 	
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).ExactAantalKeer(0).DanDoeNiks()
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).ExactAantalKeer(0).DanDoeNiks()
 	
 	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
 	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
 	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",..Request.NieuweCode).DanReturn($$$False)
 
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidator)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, PalletCodeValidator)
 	
 	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Ongeldige code")
 	Do $$$AssertEquals(Antwoord.Header.OmschrijvingVoorLogging,"Ongeldige code: '"_..Request.OudeCode_"' of '"_..Request.NieuweCode_"'")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do ..DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -156,25 +170,21 @@
 	Set ..Request.OudeCode = "TBX12345"
 	Set ..Request.NieuweCode = "TBX54321"
 	
-	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	#dim DnaCodeIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1, DnaCode2)
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(DnaCodeIterator)
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(2).DanDoeNiks()
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..Request.OudeCode).DanReturn(..TweeDnaCodesIterator)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(2).DanDoeNiks()
 	
 	Set PalletCodeValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
 	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
 	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",..Request.NieuweCode).DanReturn($$$True)
 
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidatorMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, PalletCodeValidatorMock)
 	
 	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Pallet is succesvol gewijzigd")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do ..DnaCodeRepositoryMock.Verifieer()
 	Do PalletCodeValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -184,30 +194,25 @@
 	Set ..Request.OudeCode = "LABCDE1"
 	Set ..Request.NieuweCode = "LABCDF2"
 	
-	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode1.PalletCode = "TBX12345"
-	Set DnaCode2 = ##class(DOM.Halux.AAP.DnaCode).%New()
-	Set DnaCode2.PalletCode = "TBX54321"
-	#dim DnaCodeIterator1 As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode1)
-	#dim DnaCodeIterator2 As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(DnaCode2)
-	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator1)
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.NieuweCode).DanReturn(DnaCodeIterator2)
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",DnaCode1.PalletCode).DanReturn(DnaCodeIterator1)
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(1).DanDoeNiks()
+	#dim DnaCodeIterator1 As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(..DnaCode1)
+	#dim DnaCodeIterator2 As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(..DnaCode2)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.OudeCode).DanReturn(DnaCodeIterator1)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaDnaCode",..Request.NieuweCode).DanReturn(DnaCodeIterator2)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",..DnaCode1.PalletCode).DanReturn(DnaCodeIterator1)
+	Do ..DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",$$$ElkeWaarde).ExactAantalKeer(1).DanDoeNiks()
 	
 	Set PalletCodeValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
-	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",DnaCode1.PalletCode).DanReturn($$$True)
-	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",DnaCode2.PalletCode).DanReturn($$$True)
+	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",..DnaCode1.PalletCode).DanReturn($$$True)
+	Do PalletCodeValidatorMock.VerwachtMethodCall("ValideerPalletCode",..DnaCode2.PalletCode).DanReturn($$$True)
 
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, PalletCodeValidatorMock)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, PalletCodeValidatorMock)
 	
 	#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Pallet is succesvol gewijzigd")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
-	Do DnaCodeRepositoryMock.Verifieer()
+	Do ..DnaCodeRepositoryMock.Verifieer()
 	Do PalletCodeValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>