MAGETWO-81901: Move statuses constants from class to the interface

Author: dhorytskyi

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

@@ -537,9 +537,15 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
             ->create(Collection::class)
             ->setAttributeFilter($attribute->getId());
 
+        $visibility = [
+            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_SEARCH,
+            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        ];
+
         $firstOption = $selectOptions->getFirstItem();
         $firstOptionId = $firstOption->getId();
         $this->requestBuilder->bind('test_configurable', $firstOptionId);
+        $this->requestBuilder->bind('visibility', $visibility);
         $this->requestBuilder->setRequestName('filter_out_of_stock_child');
 
         $queryResponse = $this->executeQuery();
@@ -548,6 +554,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
         $secondOption = $selectOptions->getLastItem();
         $secondOptionId = $secondOption->getId();
         $this->requestBuilder->bind('test_configurable', $secondOptionId);
+        $this->requestBuilder->bind('visibility', $visibility);
         $this->requestBuilder->setRequestName('filter_out_of_stock_child');
 
         $queryResponse = $this->executeQuery();

dev/tests/integration/testsuite/Magento/Framework/Search/_files/requests.xml

@@ -394,13 +394,18 @@
         <queries>
             <query xsi:type="boolQuery" name="filter_out_of_stock_child" boost="1">
                 <queryReference clause="must" ref="test_configurable"/>
+                <queryReference clause="must" ref="visibility"/>
             </query>
             <query xsi:type="filteredQuery" name="test_configurable">
                 <filterReference clause="must" ref="test_configurable_filter"/>
             </query>
+            <query xsi:type="filteredQuery" name="visibility">
+                <filterReference clause="must" ref="visibility_filter"/>
+            </query>
         </queries>
         <filters>
             <filter xsi:type="termFilter" name="test_configurable_filter" field="test_configurable" value="$test_configurable$"/>
+            <filter xsi:type="termFilter" name="visibility_filter" field="visibility" value="$visibility$"/>
         </filters>
         <aggregations/>
         <from>0</from>