Index: vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml
===================================================================
diff -u -r48463 -r48773
--- vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 48463)
+++ vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 48773)
@@ -31,15 +31,16 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
 	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
+	
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/Create",KlantId))
 	
-	w !,..GeefBestandLocatie()
-	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
 ]]></Implementation>
 </Method>
@@ -54,7 +55,10 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
@@ -91,7 +95,10 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 	
@@ -117,7 +124,10 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
@@ -139,7 +149,10 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()