Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml =================================================================== diff -u -r55636 -r55639 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml (.../Test.cls.xml) (revision 55636) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ValideerPalletcode/Test.cls.xml (.../Test.cls.xml) (revision 55639) @@ -8,8 +8,11 @@ Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New() Set Request.PalletCode = "TBX12345" - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New() + Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New() + Do HeaderValidatorMock.IndienMethodCall("ValidateHeader",Request.Header).DanDoeNiks() + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock) + #dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request) Do $$$AssertEquals(Antwoord.Header.Status,"200") @@ -21,8 +24,11 @@ Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New() Set Request.PalletCode = "KAD12345" - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New() + Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New() + Do HeaderValidatorMock.IndienMethodCall("ValidateHeader",Request.Header).DanDoeNiks() + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock) + #dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request) Do $$$AssertEquals(Antwoord.Header.Status,"200") @@ -34,8 +40,11 @@ Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New() Set Request.PalletCode = "DIV12345" - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New() + Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New() + Do HeaderValidatorMock.IndienMethodCall("ValidateHeader",Request.Header).DanDoeNiks() + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock) + #dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request) Do $$$AssertEquals(Antwoord.Header.Status,"200") @@ -47,8 +56,11 @@ Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New() Set Request.PalletCode = "TBP12345" - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New() + Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New() + Do HeaderValidatorMock.IndienMethodCall("ValidateHeader",Request.Header).DanDoeNiks() + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock) + #dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request) Do $$$AssertEquals(Antwoord.Header.Status,"200") @@ -60,8 +72,11 @@ Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New() Set Request.PalletCode = "SFS12345" - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New() + Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New() + Do HeaderValidatorMock.IndienMethodCall("ValidateHeader",Request.Header).DanDoeNiks() + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock) + #dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request) Do $$$AssertEquals(Antwoord.Header.Status,"200") @@ -73,8 +88,11 @@ Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New() Set Request.PalletCode = "Vhoss345" - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New() + Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New() + Do HeaderValidatorMock.IndienMethodCall("ValidateHeader",Request.Header).DanDoeNiks() + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock) + #dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request) Do $$$AssertEquals(Antwoord.Header.Status,"200") @@ -86,8 +104,11 @@ Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New() Set Request.PalletCode = "tbx12345" - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New() + Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New() + Do HeaderValidatorMock.IndienMethodCall("ValidateHeader",Request.Header).DanDoeNiks() + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock) + #dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request) Do $$$AssertEquals(Antwoord.Header.Status,"200") @@ -99,8 +120,11 @@ Set Request = ##class(WS.Halux.AAP.ValideerPalletCodeRequest).%New() Set Request.PalletCode = $$$DummyString - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New() + Set HeaderValidatorMock = ##class(vhTest.Mock.WSimpl.Halux.AAP.HeaderValidator).%New() + Do HeaderValidatorMock.IndienMethodCall("ValidateHeader",Request.Header).DanDoeNiks() + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(HeaderValidatorMock) + #dim Antwoord As WS.Halux.AAP.ValideerPalletCodeResponse = DnaCodeService.ValideerPalletCode(Request) Do $$$AssertEquals(Antwoord.Header.Status,"1005:InvalidUserInput")