Skip to content

Commit 6f40478

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-90297' into 2.3-develop-pr18
2 parents 0654e74 + 05eee1c commit 6f40478

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/SortingProcessorTest.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,25 @@ public function testProcess()
7676
->method('getDirection')
7777
->willReturn($orderThreeDirection);
7878

79+
/** @var SortOrder|\PHPUnit_Framework_MockObject_MockObject $sortOrderThreeMock */
80+
$sortOrderFourMock = $this->getMockBuilder(SortOrder::class)
81+
->disableOriginalConstructor()
82+
->getMock();
83+
$sortOrderFourMock->expects($this->once())
84+
->method('getField')
85+
->willReturn(null);
86+
$sortOrderFourMock->expects($this->never())
87+
->method('getDirection');
88+
7989
/** @var SearchCriteriaInterface|\PHPUnit_Framework_MockObject_MockObject $searchCriteriaMock */
8090
$searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
8191
->getMock();
8292

8393
$searchCriteriaMock->expects($this->exactly(2))
8494
->method('getSortOrders')
85-
->willReturn([$sortOrderOneMock, $sortOrderTwoMock, $sortOrderThreeMock]);
95+
->willReturn([$sortOrderOneMock, $sortOrderTwoMock, $sortOrderThreeMock, $sortOrderFourMock]);
8696

87-
/** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $searchCriteriarMock */
97+
/** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
8898
$collectionMock = $this->getMockBuilder(AbstractDb::class)
8999
->disableOriginalConstructor()
90100
->getMock();
@@ -130,7 +140,7 @@ public function testProcessWithDefaults()
130140
->method('getSortOrders')
131141
->willReturn([]);
132142

133-
/** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $searchCriteriarMock */
143+
/** @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
134144
$collectionMock = $this->getMockBuilder(AbstractDb::class)
135145
->disableOriginalConstructor()
136146
->getMock();

0 commit comments

Comments
 (0)