@@ -62,13 +62,13 @@ protected function setUp()
62
62
public function testMerge ()
63
63
{
64
64
$ validatorResultMock = $ this ->createMock (ValidatorResultInterface::class);
65
- $ orderValidationResultMock = $ this ->createMock (ValidatorResultInterface::class);
66
- $ creditmemoValidationResultMock = $ this ->createMock (ValidatorResultInterface::class);
65
+ $ validationResult = $ this ->createMock (ValidatorResultInterface::class);
66
+ $ cmValidationResult = $ this ->createMock (ValidatorResultInterface::class);
67
67
$ itemsValidationMessages = [['test04 ' , 'test05 ' ], ['test06 ' ]];
68
68
$ this ->validatorResultFactoryMock ->expects ($ this ->once ())->method ('create ' )
69
69
->willReturn ($ validatorResultMock );
70
- $ orderValidationResultMock ->expects ($ this ->once ())->method ('getMessages ' )->willReturn (['test01 ' , 'test02 ' ]);
71
- $ creditmemoValidationResultMock ->expects ($ this ->once ())->method ('getMessages ' )->willReturn (['test03 ' ]);
70
+ $ validationResult ->expects ($ this ->once ())->method ('getMessages ' )->willReturn (['test01 ' , 'test02 ' ]);
71
+ $ cmValidationResult ->expects ($ this ->once ())->method ('getMessages ' )->willReturn (['test03 ' ]);
72
72
73
73
$ validatorResultMock ->expects ($ this ->at (0 ))->method ('addMessage ' )->with ('test01 ' );
74
74
$ validatorResultMock ->expects ($ this ->at (1 ))->method ('addMessage ' )->with ('test02 ' );
@@ -78,8 +78,8 @@ public function testMerge()
78
78
$ validatorResultMock ->expects ($ this ->at (5 ))->method ('addMessage ' )->with ('test06 ' );
79
79
$ expected = $ validatorResultMock ;
80
80
$ actual = $ this ->validatorResultMerger ->merge (
81
- $ orderValidationResultMock ,
82
- $ creditmemoValidationResultMock ,
81
+ $ validationResult ,
82
+ $ cmValidationResult ,
83
83
...$ itemsValidationMessages
84
84
);
85
85
$ this ->assertEquals ($ expected , $ actual );
0 commit comments