Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator.cls.xml
===================================================================
diff -u
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator.cls.xml	(revision 0)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator.cls.xml	(revision 35878)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator">
+<Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
+
+<Property name="Product">
+<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Product = Product
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Equals(..Product.CorpusWandDikte, 16,18,19)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator.cls.xml
===================================================================
diff -u
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator.cls.xml	(revision 0)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator.cls.xml	(revision 35878)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator">
+<Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
+
+<Property name="Product">
+<Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Product = Product
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..Product.HeeftOpvullijstLinks || ..Product.HeeftOpvullijstRechts) && $$$HasLength(..Product.OpvullijstKleur)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/OpvullijstValidator/Test.cls.xml	(revision 35878)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Opvullijst L en R en -kleur aanwezig">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.HeeftOpvullijstLinks = $$$True
+	Set Product.HeeftOpvullijstRechts = $$$True
+	Set Product.OpvullijstKleur = ##class(DOM.PM.enu.TBXOpvullijstKleur).Grijs()
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New(Product)
+	
+	Do $$$AssertTrue(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Opvullijst L en -kleur aanwezig">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.HeeftOpvullijstLinks = $$$True
+	Set Product.OpvullijstKleur = ##class(DOM.PM.enu.TBXOpvullijstKleur).Grijs()
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New(Product)
+	
+	Do $$$AssertTrue(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Opvullijst R en -kleur aanwezig">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.HeeftOpvullijstRechts = $$$True
+	Set Product.OpvullijstKleur = ##class(DOM.PM.enu.TBXOpvullijstKleur).Grijs()
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New(Product)
+	
+	Do $$$AssertTrue(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Opvullijst R maar geen kleur aanwezig">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.HeeftOpvullijstRechts = $$$True
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Opvullijst L maar geen kleur aanwezig">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.HeeftOpvullijstLinks = $$$True
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geen Opvullijst maar wel kleur aanwezig">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.OpvullijstKleur = ##class(DOM.PM.enu.TBXOpvullijstKleur).Grijs()
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator/CorpusWandDikteValidator/Test.cls.xml	(revision 35878)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: CorpusWandDikte juist">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.CorpusWandDikte = 16
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator).%New(Product)
+	
+	Do $$$AssertTrue(Validator.IsValid())
+]]></Implementation>
+</Method>
+
+<Method name="Test: CorpusWandDikte fout">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTBX = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Set Product.CorpusWandDikte = 42
+	
+	Set Validator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator).%New(Product)
+	
+	Do $$$AssertFalse(Validator.IsValid())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator.cls.xml
===================================================================
diff -u -r35876 -r35878
--- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator.cls.xml	(.../Validator.cls.xml)	(revision 35876)
+++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/Validator.cls.xml	(.../Validator.cls.xml)	(revision 35878)
@@ -1,33 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator">
-<Super>TECH.RegisteredObject,TECH.Validator.Validator</Super>
+<Super>TECH.Mockable,TECH.Validator.Validator</Super>
 
 <Property name="Product">
 <Type>APPS.EDI.common.dto.v001.LadeTBX</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="CorpusWandDikteValidator">
+<Type>APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OpvullijstValidator">
+<Type>APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..Product = Product
+	Set ..CorpusWandDikteValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.CorpusWandDikteValidator).%New(..Product)
+	Set ..OpvullijstValidator = ##class(APPS.EDI.Bestel.impl.BestelService.TandemboxBesteller.Validator.OpvullijstValidator).%New(..Product)
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="IsValid">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..ValideerCorpusWandDikte()
+<Implementation><![CDATA[	Quit ..CorpusWandDikteValidator.IsValid() && ..OpvullijstValidator.IsValid()
 ]]></Implementation>
 </Method>
-
-<Method name="ValideerCorpusWandDikte">
-<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Equals(..Product.CorpusWandDikte, 16,18,19)
-]]></Implementation>
-</Method>
 </Class>