Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml
===================================================================
diff -u -r55656 -r56080
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 55656)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 56080)
@@ -8,15 +8,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "TBX12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -25,15 +21,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "KAD12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -42,15 +34,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "DIV12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -59,15 +47,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "TBP12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -76,15 +60,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "SFS12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -93,15 +73,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "Vhoss345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -110,15 +86,11 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "tbx12345"
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -127,16 +99,12 @@
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = $$$DummyString
 	
-	Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New()
-	Do HeaderValidatorMock.VerwachtMethodCall("ValidateHeader",Request.Header).ExactAantalKeer(1).DanDoeNiks()
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock)
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Ongeldige code")
-	Do HeaderValidatorMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>