Index: WSimpl/Halux/PPS/dto/MatAfmeting.cls.xml
===================================================================
diff -u -r66525 -r66621
--- WSimpl/Halux/PPS/dto/MatAfmeting.cls.xml (.../MatAfmeting.cls.xml) (revision 66525)
+++ WSimpl/Halux/PPS/dto/MatAfmeting.cls.xml (.../MatAfmeting.cls.xml) (revision 66621)
@@ -72,6 +72,11 @@
%Boolean
1
+
+
+%Boolean
+1
+
Index: vhUnitTest/WSimpl/Halux/PPS/MatService/GeefAfmetingenViaBatchId/Test.cls.xml
===================================================================
diff -u -r66620 -r66621
--- vhUnitTest/WSimpl/Halux/PPS/MatService/GeefAfmetingenViaBatchId/Test.cls.xml (.../Test.cls.xml) (revision 66620)
+++ vhUnitTest/WSimpl/Halux/PPS/MatService/GeefAfmetingenViaBatchId/Test.cls.xml (.../Test.cls.xml) (revision 66621)
@@ -23,12 +23,8 @@
Set Request = ##class(WS.Halux.PPS.MatService.GeefAfmetingenRequest).%New()
Set Request.BatchId = BatchId
- Set BatchStub = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
- Do BatchStub.IndienMethodCall("GeefCategorie").DanReturn(CategorieNaam)
+ #dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ..GeefBatchMock(BatchId, CategorieNaam)
- Set BatchServiceMock = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
- Do BatchServiceMock.VerwachtMethodCall("GeefBatch", BatchId).DanReturn(BatchStub)
-
Set MatService = ##class(WSimpl.Halux.PPS.MatService).%New(BatchServiceMock)
#dim Antwoord As WS.Halux.PPS.MatService.GeefAfmetingenResponse = MatService.GeefAfmetingenViaBatchId(Request)
@@ -47,12 +43,8 @@
Set Request = ##class(WS.Halux.PPS.MatService.GeefAfmetingenRequest).%New()
Set Request.BatchId = BatchId
- Set LbxBatchStub = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
- Do LbxBatchStub.IndienMethodCall("GeefCategorie").DanReturn(Categorie)
+ #dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ..GeefBatchMock(BatchId, Categorie)
- Set BatchServiceMock = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
- Do BatchServiceMock.VerwachtMethodCall("GeefBatch", BatchId).DanReturn(LbxBatchStub)
-
Set LegeUitvoeringInfoIterator = ##class(TECH.ListIterator).%New(##class(%ArrayOfObjects).%New())
Set GeefMatAfmetingenHelperMock = ##class(vhTest.Mock.WSimpl.Halux.PPS.MatService.GeefAfmetingenHelper).%New()
Do GeefMatAfmetingenHelperMock.VerwachtMethodCall("GeefUitvoeringIterator", BatchId, Categorie).DanReturn(LegeUitvoeringInfoIterator)
@@ -76,12 +68,8 @@
Set Request = ##class(WS.Halux.PPS.MatService.GeefAfmetingenRequest).%New()
Set Request.BatchId = BatchId
- Set LbxBatchStub = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
- Do LbxBatchStub.IndienMethodCall("GeefCategorie").DanReturn(Categorie)
+ #dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ..GeefBatchMock(BatchId, Categorie)
- Set BatchServiceMock = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
- Do BatchServiceMock.VerwachtMethodCall("GeefBatch", BatchId).DanReturn(LbxBatchStub)
-
Set UitvoeringInfoLijst = ##class(%ListOfObjects).%New()
#dim MattenUitvoeringInfo1 As APPS.Halux.PPS.Activiteit.impl.common.dto.MattenUitvoeringInfo = ..MaakMattenUitvoeringObject(100000, "1A2B", 300000, 1, 273, "-", 1500, 422, "UTBeschrijving1", "UTKleur1", "UTMateriaal1", 1, $$$False)
#dim MattenUitvoeringInfo2 As APPS.Halux.PPS.Activiteit.impl.common.dto.MattenUitvoeringInfo = ..MaakMattenUitvoeringObject(100001, "3C4D", 300001, 2, 423, "-", 1500, 548, "UTBeschrijving2", "UTKleur2", "UTMateriaal2", 2, $$$False)
@@ -113,6 +101,88 @@
]]>
+
+
+
+
+
+
+
+
+
+BatchId:%Integer,Categorie:APPS.Halux.common.enu.Categorie
+vhTest.Mock.APPS.Halux.common.BatchService
+
+
+
UitvoeringInfoLijst:%ListOfObjects
1
Index: WSimpl/Halux/PPS/MatService.cls.xml
===================================================================
diff -u -r66617 -r66621
--- WSimpl/Halux/PPS/MatService.cls.xml (.../MatService.cls.xml) (revision 66617)
+++ WSimpl/Halux/PPS/MatService.cls.xml (.../MatService.cls.xml) (revision 66621)
@@ -127,7 +127,7 @@
WSimpl.Halux.PPS.dto.MatAfmeting