Index: vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml =================================================================== diff -u -r55441 -r58153 --- vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml (.../Test.cls.xml) (revision 55441) +++ vhUnitTest/AXimpl/common/AxProductValidator/IsGeldig/Test.cls.xml (.../Test.cls.xml) (revision 58153) @@ -68,9 +68,13 @@ #dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New() Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False) + #dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New() + Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False) + Set ..AxProductFactory = AxProductFactoryStub Set ..SoprIteratorFilter = SoprIteratorFilterStub Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub + Set ..ProductTypeApi = ProductTypeApiStub #dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory) #dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId) @@ -120,9 +124,13 @@ #dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New() Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$True) + #dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New() + Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False) + Set ..AxProductFactory = AxProductFactoryStub Set ..SoprIteratorFilter = SoprIteratorFilterStub Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub + Set ..ProductTypeApi = ProductTypeApiStub #dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory) #dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId) @@ -147,9 +155,13 @@ #dim IsOngewenstProductInMigratieFilterStub As AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter = ##class(vhTest.Mock.AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New() Do IsOngewenstProductInMigratieFilterStub.IndienMethodCall("IsValid", Product).DanReturn($$$False) + #dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New() + Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False) + Set ..AxProductFactory = AxProductFactoryStub Set ..SoprIteratorFilter = SoprIteratorFilterStub Set ..IsOngewenstProductInMigratieFilter = IsOngewenstProductInMigratieFilterStub + Set ..ProductTypeApi = ProductTypeApiStub #dim AxProductValidator As AXimpl.common.AxProductValidator = ##class(AXimpl.common.AxProductValidator).%New(..IsOngewenstProductInMigratieFilter, ..SoprIteratorFilter, ..ProductTypeApi, ..AxProductFactory) #dim Result As %Boolean = AxProductValidator.IsGeldig(..#ProductId) @@ -205,6 +217,7 @@ #dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New() Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$True) + Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False) Set ..AxProductFactory = AxProductFactoryStub Set ..SoprIteratorFilter = SoprIteratorFilterStub @@ -235,6 +248,7 @@ #dim ProductTypeApiStub As DOM.PM.ProductTypeAPI = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New() Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", ..#ProductId).DanReturn($$$True) + Do ProductTypeApiStub.IndienMethodCall("IsLadeVanSpaceTowerProduct", ..#ProductId).DanReturn($$$False) Set ..AxProductFactory = AxProductFactoryStub Set ..SoprIteratorFilter = SoprIteratorFilterStub @@ -248,6 +262,37 @@ Do $$$AssertEquals(Product.Basis.IdentNummer, "0.123.451.0") ]]> + + + + Index: AXimpl/common/AxProductValidator.cls.xml =================================================================== diff -u -r57045 -r58153 --- AXimpl/common/AxProductValidator.cls.xml (.../AxProductValidator.cls.xml) (revision 57045) +++ AXimpl/common/AxProductValidator.cls.xml (.../AxProductValidator.cls.xml) (revision 58153) @@ -50,6 +50,8 @@ Set IsValid = $$$False } ElseIf ((Product.Basis.LinkType = ##class(DOM.PM.enu.LinkType).MoederZonderStock()) && ($$$Not(..ProductTypeApi.IsSpaceTowerProduct(ProductNummer)))) { Set IsValid = $$$False + } ElseIf (..ProductTypeApi.IsLadeVanSpaceTowerProduct(ProductNummer)) { + Set IsValid = $$$False } ElseIf (..IsOngewenstProductInMigratieFilter.IsValid(Product)) { Set IsValid = $$$False } ElseIf (##class(TECH.StringUtils).StartsWith(Product.Basis.IdentNummer,"6")) {