Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml
===================================================================
diff -u -r56097 -r56103
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml	(.../Test.cls.xml)	(revision 56097)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/HernoemPallet/Test.cls.xml	(.../Test.cls.xml)	(revision 56103)
@@ -5,7 +5,7 @@
 
 <Method name="Test: OudeCode is geldige palletcode met data (NieuweCode leeg) -&gt; lijst DnaCodes">
 <Implementation><![CDATA[
-	/*Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
+	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
 	Set Request.OudeCode = "TBX12345"
 	Set Request.NieuweCode = ""
 	
@@ -15,30 +15,37 @@
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
 	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.OudeCode).DanReturn(DnaCodeIterator)
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	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)
 	
 	#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>
 
-<Method name="aTest: OudeCode is geldige palletcode zonder data (NieuweCode leeg) -&gt; foutmelding geven">
+<Method name="Test: OudeCode is geldige palletcode zonder data (NieuweCode leeg) -&gt; foutmelding geven">
 <Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.ZoekViaToeleveringRequest).%New()
-	Set Request.Toelevering = "333333"
+	Set Request = ##class(WS.Halux.AAP.HernoemPalletRequest).%New()
+	Set Request.OudeCode = "TBX12345"
+	Set Request.NieuweCode = ""
 	
 	Set DnaCodeRepositoryMock = ##class(vhTest.Mock.DOM.Halux.AAP.DnaCodeRepository).%New()
-	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaToeleveringId",Request.Toelevering).DanReturn(..EmptyIterator())
+	Do DnaCodeRepositoryMock.VerwachtMethodCall("ZoekViaPalletCode",Request.OudeCode).DanReturn(..EmptyIterator())
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+	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)
 	
-	#dim Antwoord As WS.Halux.AAP.ZoekViaToeleveringResponse = DnaCodeService.ZoekViaToelevering(Request)
+	#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 '333333'")
+	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Geen data gevonden voor pallet 'TBX12345'")
 	Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
 	Do DnaCodeRepositoryMock.Verifieer()
 ]]></Implementation>