Merge remote-tracking branch 'trigger/MAGETWO-95723' into BugFixPR

Author: joanhe

app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php

@@ -406,7 +406,6 @@ public function getResultingIds()
         $idsSelect->reset(Select::LIMIT_COUNT);
         $idsSelect->reset(Select::LIMIT_OFFSET);
         $idsSelect->reset(Select::COLUMNS);
-        $idsSelect->reset(Select::ORDER);
         $idsSelect->columns('rt.review_id');
         return $this->getConnection()->fetchCol($idsSelect);
     }

dev/tests/integration/testsuite/Magento/Review/Model/ResourceModel/Review/Product/CollectionTest.php

@@ -3,20 +3,88 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Review\Model\ResourceModel\Review\Product;
 
+/**
+ * Tests some functionality of the Product Review collection
+ */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
+     * @param string $status
+     * @param int $expectedCount
+     * @param string $sortAttribute
+     * @param string $dir
+     * @param callable $assertion
+     * @dataProvider sortOrderAssertionsDataProvider
      * @magentoDataFixture Magento/Review/_files/different_reviews.php
      */
-    public function testGetResultingIds()
-    {
+    public function testGetResultingIds(
+        ?string $status,
+        int $expectedCount,
+        string $sortAttribute,
+        string $dir,
+        callable $assertion
+    ) {
+        /**
+         * @var $collection \Magento\Review\Model\ResourceModel\Review\Product\Collection
+         */
         $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Review\Model\ResourceModel\Review\Product\Collection::class
         );
-        $collection->addStatusFilter(\Magento\Review\Model\Review::STATUS_APPROVED);
+        if ($status) {
+            $collection->addStatusFilter($status);
+        }
+        $collection->setOrder($sortAttribute, $dir);
         $actual = $collection->getResultingIds();
-        $this->assertCount(2, $actual);
+        $this->assertCount($expectedCount, $actual);
+        $assertion($actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function sortOrderAssertionsDataProvider() :array
+    {
+        return [
+            [
+                \Magento\Review\Model\Review::STATUS_APPROVED,
+                2,
+                'rt.review_id',
+                'DESC',
+                function (array $actual) :void {
+                    $this->assertLessThan($actual[0], $actual[1]);
+                }
+            ],
+            [
+                \Magento\Review\Model\Review::STATUS_APPROVED,
+                2,
+                'rt.review_id',
+                'ASC',
+                function (array $actual) :void {
+                    $this->assertLessThan($actual[1], $actual[0]);
+                }
+            ],
+            [
+                \Magento\Review\Model\Review::STATUS_APPROVED,
+                2,
+                'rt.created_at',
+                'ASC',
+                function (array $actual) :void {
+                    $this->assertLessThan($actual[1], $actual[0]);
+                }
+            ],
+            [
+                null,
+                3,
+                'rt.review_id',
+                'ASC',
+                function (array $actual) :void {
+                    $this->assertLessThan($actual[1], $actual[0]);
+                }
+            ]
+        ];
     }
 }