Index: vhUnitTest/APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator/Genereer/Test.cls.xml =================================================================== diff -u -r58085 -r58205 --- vhUnitTest/APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator/Genereer/Test.cls.xml (.../Test.cls.xml) (revision 58085) +++ vhUnitTest/APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator/Genereer/Test.cls.xml (.../Test.cls.xml) (revision 58205) @@ -39,10 +39,19 @@ Set CodeCalculatorStub = ##class(vhTest.Mock.APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeCalculator).%New() Do CodeCalculatorStub.IndienMethodCall("Bereken", "1").DanException($$$DummyException) + #dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("DefaultExportDirectory"),"OrgaluxBarcode") + #dim BestandsNaam As %String = Path_"\LadeCode "_..#Beginwaarde_" tot "_(..#Beginwaarde + Aantal - 1)_".csv" + Set FileWriterStub = ##class(vhTest.Mock.TECH.File.FileWriter).%New() + Do FileWriterStub.IndienMethodCall("Open", BestandsNaam, 1).ExactAantalKeer(1).DanDoeNiks() + Do FileWriterStub.IndienMethodCall("Close",).ExactAantalKeer(1).DanDoeNiks() + Do FileWriterStub.IndienMethodCall("WriteLine", $$$ElkeWaarde).ExactAantalKeer(Aantal+1).DanDoeNiks() + + #dim FileApiStub As vhTest.Mock.TECH.File.FileAPI = ##class(vhTest.Mock.TECH.File.FileAPI).MockInstance() + do FileApiStub.IndienMethodCall("GeefFileWriter").DanReturn(FileWriterStub) #dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyException") Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings)) - Set CodeGenerator = ##class(APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeGenerator).%New(CodeCalculatorStub,,) + Set CodeGenerator = ##class(APPS.VKP.Maatwerk.LadeRegistratie.impl.CodeGenerator).%New(CodeCalculatorStub,,FileApiStub) Do CodeGenerator.Genereer(..#Beginwaarde, Aantal, ..#Prefix) ]]> Index: APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator.cls.xml =================================================================== diff -u -r58085 -r58205 --- APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator.cls.xml (.../CodeGenerator.cls.xml) (revision 58085) +++ APPS/VKP/Maatwerk/LadeRegistratie/impl/CodeGenerator.cls.xml (.../CodeGenerator.cls.xml) (revision 58205) @@ -43,7 +43,7 @@ #dim FileWriter As TECH.File.FileWriter = ..FileApi.GeefFileWriter() Do FileWriter.Open(Path_"\LadeCode "_Vanaf_" tot "_(Vanaf + Aantal - 1)_".csv", 1) - Do FileWriter.WriteLine("CodeNr,CodeGeformateerd,CodeBarcode,Formaat") + Do FileWriter.WriteLine("CodeNr;CodeGeformateerd;CodeBarcode;Formaat") #dim CodeNr As %String #dim AantalGegenereerdeCodes As %Integer = 0 @@ -54,7 +54,7 @@ Do ..Calculator.Bereken(CodeNr) If ..BevatGeenOngewensteWoorden() { - Do FileWriter.WriteLine(..Calculator.CodeNr_","_Prefix_..Calculator.CodeGeformateerd_","_BasisUrl_Prefix_..Calculator.Code_","_..Calculator.CodeFormat) + Do FileWriter.WriteLine(..Calculator.CodeNr_";"_Prefix_..Calculator.CodeGeformateerd_";"_BasisUrl_Prefix_..Calculator.Code_";"_..Calculator.CodeFormat) Set OrgaluxLadecode = ##class(DOM.VKP.Maatwerk.LadeRegistratie.impl.OrgaluxLadecode).%New() Set OrgaluxLadecode.Basisgetal = CodeNr