Index: APPS/EDI/common/impl/ProductValidator.cls.xml
===================================================================
diff -u -r52229 -r52238
--- APPS/EDI/common/impl/ProductValidator.cls.xml	(.../ProductValidator.cls.xml)	(revision 52229)
+++ APPS/EDI/common/impl/ProductValidator.cls.xml	(.../ProductValidator.cls.xml)	(revision 52238)
@@ -30,11 +30,12 @@
 <FormalSpec><![CDATA[Product:APPS.EDI.common.dto.v001.Lade,&Exceptions:TECH.ExceptionList,Opties:TECH.KeyValue.List=""]]></FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
+	#dim IsValid As %Boolean = $$$True
 	
-	Do ..RughoogteValidator.IsValid(Product, Exceptions)
-	Do ..ZijkantLogoValidator.IsValid(Product, Exceptions, Opties)
+	Set IsValid = IsValid && ..RughoogteValidator.IsValid(Product, Exceptions)
+	Set IsValid = IsValid && ..ZijkantLogoValidator.IsValid(Product, Exceptions, Opties)
 	
-	Quit $$$If(Exceptions.Count()>0,$$$false,$$$true)
+	Quit IsValid
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/EDI/common/impl/ProductValidator/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/common/impl/ProductValidator/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDI/common/impl/ProductValidator/Test.cls.xml	(revision 52238)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDI.common.impl.ProductValidator.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test IsValid is geslaagd indien Rughoogte en ZijkantLogo beide valid zijn">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTAX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTAX).StandaardLade()
+	Set Exceptions = ##class(TECH.ExceptionList).%New()
+	Set ConvertOpties = ##class(TECH.KeyValue.List).%New()
+
+	Set RughoogteValidatorMock = ##class(vhTest.Mock.APPS.EDI.common.impl.Validator.RughoogteValidator).%New()
+	Do RughoogteValidatorMock.VerwachtMethodCall("IsValid",Product,Exceptions).DanReturn($$$True)
+	
+	Set ZijkantLogoValidatorMock = ##class(vhTest.Mock.APPS.EDI.common.impl.Validator.ZijkantLogoValidator).%New()
+	Do ZijkantLogoValidatorMock.VerwachtMethodCall("IsValid",Product,Exceptions,ConvertOpties).DanReturn($$$True)	
+	
+	Set ProductValidator = ##class(APPS.EDI.common.impl.ProductValidator).%New(RughoogteValidatorMock, ZijkantLogoValidatorMock)
+	
+	Do $$$AssertTrue(ProductValidator.IsValid(Product, .Exceptions, ConvertOpties))
+	Do $$$AssertTrue(Exceptions.Count()=0)
+	
+	Do RughoogteValidatorMock.Verifieer()
+	Do ZijkantLogoValidatorMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test IsValid faalt indien Rughoogte faalt en ZijkantLogo valid is">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTAX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTAX).StandaardLade()
+	Set Exceptions = ##class(TECH.ExceptionList).%New()
+	Set ConvertOpties = ##class(TECH.KeyValue.List).%New()
+
+	Set RughoogteValidatorMock = ##class(vhTest.Mock.APPS.EDI.common.impl.Validator.RughoogteValidator).%New()
+	Do RughoogteValidatorMock.IndienMethodCall("IsValid",Product,Exceptions).DanReturn($$$False)
+	
+	Set ZijkantLogoValidatorMock = ##class(vhTest.Mock.APPS.EDI.common.impl.Validator.ZijkantLogoValidator).%New()
+	Do ZijkantLogoValidatorMock.IndienMethodCall("IsValid",Product,Exceptions,ConvertOpties).DanReturn($$$True)	
+	
+	Set ProductValidator = ##class(APPS.EDI.common.impl.ProductValidator).%New(RughoogteValidatorMock, ZijkantLogoValidatorMock)
+	
+	Do $$$AssertFalse(ProductValidator.IsValid(Product, Exceptions, ConvertOpties))
+]]></Implementation>
+</Method>
+
+<Method name="Test IsValid faalt indien ZijkantLogo faalt en Rughoogte valid is">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTAX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTAX).StandaardLade()
+	Set Exceptions = ##class(TECH.ExceptionList).%New()
+	Set ConvertOpties = ##class(TECH.KeyValue.List).%New()
+
+	Set RughoogteValidatorMock = ##class(vhTest.Mock.APPS.EDI.common.impl.Validator.RughoogteValidator).%New()
+	Do RughoogteValidatorMock.IndienMethodCall("IsValid",Product,Exceptions).DanReturn($$$True)
+	
+	Set ZijkantLogoValidatorMock = ##class(vhTest.Mock.APPS.EDI.common.impl.Validator.ZijkantLogoValidator).%New()
+	Do ZijkantLogoValidatorMock.IndienMethodCall("IsValid",Product,Exceptions,ConvertOpties).DanReturn($$$False)	
+	
+	Set ProductValidator = ##class(APPS.EDI.common.impl.ProductValidator).%New(RughoogteValidatorMock, ZijkantLogoValidatorMock)
+	
+	Do $$$AssertFalse(ProductValidator.IsValid(Product, Exceptions, ConvertOpties))
+]]></Implementation>
+</Method>
+
+<Method name="Test IsValid faalt indien beide ZijkantLogo en Rughoogte falen">
+<Implementation><![CDATA[
+	#dim Product As APPS.EDI.common.dto.v001.LadeTAX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeTAX).StandaardLade()
+	Set Exceptions = ##class(TECH.ExceptionList).%New()
+	Set ConvertOpties = ##class(TECH.KeyValue.List).%New()
+
+	Set RughoogteValidatorMock = ##class(vhTest.Mock.APPS.EDI.common.impl.Validator.RughoogteValidator).%New()
+	Do RughoogteValidatorMock.IndienMethodCall("IsValid",Product,Exceptions).DanReturn($$$False)
+	
+	Set ZijkantLogoValidatorMock = ##class(vhTest.Mock.APPS.EDI.common.impl.Validator.ZijkantLogoValidator).%New()
+	Do ZijkantLogoValidatorMock.IndienMethodCall("IsValid",Product,Exceptions,ConvertOpties).DanReturn($$$False)	
+	
+	Set ProductValidator = ##class(APPS.EDI.common.impl.ProductValidator).%New(RughoogteValidatorMock, ZijkantLogoValidatorMock)
+	
+	Do $$$AssertFalse(ProductValidator.IsValid(Product, Exceptions, ConvertOpties))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>