Index: vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml	(revision 56098)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="ValideerPalletCode">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ValideerPalletCode",PalletCode)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml
===================================================================
diff -u -r56097 -r56098
--- WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml	(.../PalletCodeValidator.cls.xml)	(revision 56097)
+++ WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml	(.../PalletCodeValidator.cls.xml)	(revision 56098)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Method name="ValideerPalletCode">
 <FormalSpec>PalletCode:%String</FormalSpec>
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml
===================================================================
diff -u -r56080 -r56098
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 56080)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml	(.../Test.cls.xml)	(revision 56098)
@@ -3,106 +3,34 @@
 <Class name="vhUnitTest.WSimpl.Halux.AAP.DnaCodeService.ValideerPalletcode.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: TBXxxxxx -&gt; ok">
+<Method name="Test: Geldige PalletCode -&gt; ok ">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
 	Set Request.PalletCode = "TBX12345"
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
+	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.PalletCode).DanReturn($$$True)
 	
-	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,PalletCodeValidator)
 	
-	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-]]></Implementation>
-</Method>
-
-<Method name="Test: KADxxxxx -&gt; ok">
-<Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
-	Set Request.PalletCode = "KAD12345"
-	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: DIVxxxxx -&gt; ok">
+<Method name="Test: Ongeldige PalletCode -&gt; niet ok">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
-	Set Request.PalletCode = "DIV12345"
+	Set Request.PalletCode = $$$DummyString
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
+	Set PalletCodeValidator = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New()
+	Do PalletCodeValidator.IndienMethodCall("ValideerPalletCode",Request.PalletCode).DanReturn($$$False)
 	
-	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,PalletCodeValidator)
 	
-	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-]]></Implementation>
-</Method>
-
-<Method name="Test: TBPxxxxx -&gt; ok">
-<Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
-	Set Request.PalletCode = "TBP12345"
-	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
-	
 	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
 	
-	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-]]></Implementation>
-</Method>
-
-<Method name="Test: SFSxxxxx -&gt; ok">
-<Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
-	Set Request.PalletCode = "SFS12345"
-	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
-	
-	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
-	
-	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-]]></Implementation>
-</Method>
-
-<Method name="Test: VHOSSxxx -&gt; ok">
-<Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
-	Set Request.PalletCode = "Vhoss345"
-	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
-	
-	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
-	
-	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-]]></Implementation>
-</Method>
-
-<Method name="Test: tbxxxxxx (lowercase) -&gt; ok">
-<Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
-	Set Request.PalletCode = "tbx12345"
-	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
-	
-	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
-	
-	Do $$$AssertEquals(Antwoord.Header.Status,"200")
-]]></Implementation>
-</Method>
-
-<Method name="Test: willekeurige code -&gt; niet ok">
-<Implementation><![CDATA[
-	Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New()
-	Set Request.PalletCode = $$$DummyString
-	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New()
-	
-	#dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request)
-	
 	Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")
 	Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Ongeldige code")
 ]]></Implementation>
Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r56093 -r56098
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56093)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56098)
@@ -13,14 +13,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PalletCodeValidator">
+<Type>WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
+	Set ..PalletCodeValidator = $$$Inject(PalletCodeValidator, ##class(WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -32,23 +38,12 @@
 <Implementation><![CDATA[
 	Set Response = ##class(WS.Halux.AAP.ValideerPalletCodeResponse).%New()
 	Try {
-		#dim Match As %Boolean = $$$False
-		
-		#dim PalletCode = ##class(TECH.StringUtils).ToUpper(ValideerPalletCodeRequest.PalletCode)
-		
-		Set:(PalletCode ?1"TBX"5N) Match=$$$True 
-		Set:(PalletCode ?1"DIV"5N) Match=$$$True
-		Set:(PalletCode ?1"KAD"5N) Match=$$$True
-		Set:(PalletCode ?1"SFS"5N) Match=$$$True
-		Set:(PalletCode ?1"TBP"5N) Match=$$$True
-		Set:(PalletCode ?1"VHOSS"3N) Match=$$$True
-		
-		If Match {
+		If ..PalletCodeValidator.ValideerPalletCode(ValideerPalletCodeRequest.PalletCode) {
 			Set Response.Header.Status = "200"
 		} Else {
 			Set Response.Header.Status = "1005:InvalidUserInput"
 			Set Response.Header.Omschrijving = "Ongeldige code"
-			Set Response.Header.OmschrijvingVoorLogging = "Ongeldige code: '"_PalletCode_"'"
+			Set Response.Header.OmschrijvingVoorLogging = "Ongeldige code: '"_ValideerPalletCodeRequest.PalletCode_"'"
 		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
Index: vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/Halux/AAP/DnaCodeService/PalletCodeValidator.cls.xml	(revision 56098)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator</Super>
+
+<Method name="ValideerPalletCode">
+<FormalSpec>PalletCode:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>