Index: vhUnitTest/BL/Legacy/TRANSP/Test.cls.xml =================================================================== diff -u -r49958 -r51718 --- vhUnitTest/BL/Legacy/TRANSP/Test.cls.xml (.../Test.cls.xml) (revision 49958) +++ vhUnitTest/BL/Legacy/TRANSP/Test.cls.xml (.../Test.cls.xml) (revision 51718) @@ -53,15 +53,15 @@ Do BonMock.VerwachtMethodCall("GeefTypeBonLijnIterator",##class(DOM.VKP.enu.BonLijnType).OrderVerwijzing()).DanReturn(OrderVerwijzingLijnIterator) Set InvoiceAmountServiceMock = ##class(vhTest.Mock.AXimpl.Dynamics.InvoiceAmountOut.InvoiceAmountService).%New() - #dim Return1 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(12.1,2.1) - #dim Return2 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(24.2,4.2) + #dim Return1 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(12.1,2.1,1.5) + #dim Return2 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(24.2,4.2,1.5) Do InvoiceAmountServiceMock.VerwachtMethodCall("GeefFactuurBedragen","SalesId1").DanReturn(Return1) Do InvoiceAmountServiceMock.VerwachtMethodCall("GeefFactuurBedragen","SalesId2").DanReturn(Return2) Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock) - Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),36.3) + Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),33.3) Do OrderAPIMock.Verifieer() Do BonMock.Verifieer() @@ -109,15 +109,15 @@ Do BonMock.VerwachtMethodCall("GeefTypeBonLijnIterator",##class(DOM.VKP.enu.BonLijnType).OrderVerwijzing()).DanReturn(OrderVerwijzingLijnIterator) Set InvoiceAmountServiceMock = ##class(vhTest.Mock.AXimpl.Dynamics.InvoiceAmountOut.InvoiceAmountService).%New() - #dim Return1 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(12.1,2.1) + #dim Return1 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(12.1,2.1,1) Do InvoiceAmountServiceMock.VerwachtMethodCall("GeefFactuurBedragen","SalesId1").DanReturn(Return1) Set WSException = ##class(TECH.Exceptions.GeneralErrorException).%New("WebserviceException") Do InvoiceAmountServiceMock.IndienMethodCall("GeefFactuurBedragen","SalesId2").DanException(WSException) Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock) - Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),12.1) + Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),11.1) Do OrderAPIMock.Verifieer() Do BonMock.Verifieer() @@ -146,13 +146,13 @@ Set WSException = ##class(TECH.Exceptions.GeneralErrorException).%New("WebserviceException") Do InvoiceAmountServiceMock.IndienMethodCall("GeefFactuurBedragen","SalesId1").DanException(WSException) - #dim Return2 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(12.1,2.1) + #dim Return2 as AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC = ..GeefVHInvoiceAmountOutputDC(12.1,2.1,1) Do InvoiceAmountServiceMock.VerwachtMethodCall("GeefFactuurBedragen","SalesId2").DanReturn(Return2) Set TRANSP = ##class(BL.Legacy.TRANSP).%New(OrderAPIMock,InvoiceAmountServiceMock) - Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),12.1) + Do $$$AssertEquals(TRANSP.GeefRemboursBedragVoorBon("BONNR"),11.1) Do OrderAPIMock.Verifieer() Do BonMock.Verifieer() @@ -231,12 +231,13 @@ -Totaal:%Numeric,BTW:%Numeric +Totaal:%Numeric,BTW:%Numeric,KortingContant:%Numeric AXif.Dynamics.InvoiceAmountOut.tns.VHInvoiceAmountOutputDC