Index: APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator.cls.xml
===================================================================
diff -u -r57945 -r57951
--- APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator.cls.xml	(.../CodeGenerator.cls.xml)	(revision 57945)
+++ APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator.cls.xml	(.../CodeGenerator.cls.xml)	(revision 57951)
@@ -16,10 +16,11 @@
 </Parameter>
 
 <Method name="%OnNew">
+<FormalSpec>Calculator:APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeCalculator="",OrgaluxLadecodeRepository:DOM.VKP.Maatwerk.LadeRegistratie.impl.OrgaluxLadecodeRepository=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..Calculator=##class(APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeCalculator).%New()
-	Set ..OrgaluxLadecodeRepository = ##class(DOM.VKP.Maatwerk.LadeRegistratie.impl.OrgaluxLadecodeRepository).%New()
+	Set ..Calculator = $$$Inject(Calculator, ##class(APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeCalculator).%New())
+	Set ..OrgaluxLadecodeRepository = $$$Inject(OrgaluxLadecodeRepository, ##class(DOM.VKP.Maatwerk.LadeRegistratie.impl.OrgaluxLadecodeRepository).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -31,6 +32,7 @@
 <FormalSpec>Vanaf:%Integer,Aantal:%Integer,Prefix:%String</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
+	New Dev, CodeNr
 	Set Dev=0 ;$$OPEN^vhDEV("c:\scratch","LadeCode "_Vanaf_" tot "_(Vanaf+Aantal-1)_".txt","W")
 	Set Dev=$$OPEN^vhDEV(,"LadeCode "_Vanaf_" tot "_(Vanaf+Aantal-1)_".txt","W","T")
 	Use Dev
@@ -42,6 +44,7 @@
 		{
 			Write ..Calculator.CodeNr,*9,Prefix_..Calculator.CodeGeformateerd,*9,Prefix_..Calculator.Code,*9,..Calculator.CodeFormat,!	
 			
+			New OrgaluxLadecode
 			Set OrgaluxLadecode = ##class(DOM.VKP.Maatwerk.LadeRegistratie.impl.OrgaluxLadecode).%New()
 			Set OrgaluxLadecode.Basisgetal = CodeNr
 			Set OrgaluxLadecode.GegenereerdeCode = Prefix_..Calculator.Code
Index: vhUnitTest/APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator/Genereer/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator/Genereer/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator/Genereer/Test.cls.xml	(revision 57951)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeGenerator.Genereer.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test:Standaard gedrag">
+<Implementation><![CDATA[
+	#dim BeginWaarde As %Integer
+	#dim Aantal As %Integer
+	#dim Prefix As %String
+	
+	Set CodeCalculatorMock = ##class(vhTest.Mock.APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeCalculator).%New()
+	Do CodeCalculatorMock.VerwachtMethodCall("Bereken", "1").ExactAantalKeer(1)
+	Do CodeCalculatorMock.VerwachtMethodCall("CodeGet",).ExactAantalKeer(3)
+	Set RepositoryMock = ##class(vhTest.Mock.DOM.VKP.Maatwerk.LadeRegistratie.impl.OrgaluxLadecodeRepository).%New()
+	Do RepositoryMock.VerwachtMethodCall("Bewaar", $$$ElkeWaarde).ExactAantalKeer(1)
+	
+	// Initialisatie
+	Set CodeGenerator = ##class(APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeGenerator).%New(CodeCalculatorMock, RepositoryMock)
+	Set BeginWaarde = 1
+	Set Aantal = 1
+	Set Prefix = "BA"
+	
+	Do CodeGenerator.Genereer(BeginWaarde, Aantal, Prefix)
+	Do CodeCalculatorMock.Verifieer()
+	
+	Do RepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>