Merge remote-tracking branch 'origin/MAGETWO-59477-Attribute-Weighting-MySql' into Okapis-PR

Author: cpartica

dev/tests/integration/testsuite/Magento/Framework/Search/Adapter/Mysql/AdapterTest.php

@@ -123,6 +123,20 @@ private function assertProductIds($queryResponse, $expectedIds)
         $this->assertEquals($expectedIds, $actualIds);
     }
 
+    /**
+     * @param \Magento\Framework\Search\Response\QueryResponse $queryResponse
+     * @param array $expectedIds
+     */
+    private function assertOrderedProductIds($queryResponse, $expectedIds)
+    {
+        $actualIds = [];
+        foreach ($queryResponse as $document) {
+            /** @var \Magento\Framework\Api\Search\Document $document */
+            $actualIds[] = $document->getId();
+        }
+        $this->assertEquals($expectedIds, $actualIds);
+    }
+
     /**
      * @magentoConfigFixture current_store catalog/search/engine mysql
      */
@@ -136,6 +150,24 @@ public function testMatchQuery()
         $this->assertEquals(1, $queryResponse->count());
     }
 
+    /**
+     * @magentoDataFixture Magento/Framework/Search/_files/products_multi_option.php
+     * @magentoConfigFixture current_store catalog/search/engine mysql
+     */
+    public function testMatchOrderedQuery()
+    {
+        $expectedIds = [8, 7, 6, 5, 2];
+
+        //Verify that MySql randomized result of equal-weighted results
+        //consistently ordered by entity_id after multiple calls
+        $this->requestBuilder->bind('fulltext_search_query', 'shorts');
+        $this->requestBuilder->setRequestName('one_match');
+        $queryResponse = $this->executeQuery();
+
+        $this->assertEquals(5, $queryResponse->count());
+        $this->assertOrderedProductIds($queryResponse, $expectedIds);
+    }
+
     /**
      * @magentoConfigFixture current_store catalog/search/engine mysql
      */