Merge remote-tracking branch 'mainline/develop' into MAGETWO-52187-user-noaccess

Author: ark99

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

@@ -33,11 +33,6 @@ class AdapterTest extends \PHPUnit_Framework_TestCase
      */
     protected $objectManager;
 
-    /**
-     * @var string
-     */
-    protected $requestConfig = __DIR__ . '/../../_files/requests.xml';
-
     /**
      * @var string
      */
@@ -51,7 +46,7 @@ protected function setUp()
         $converter = $this->objectManager->create('Magento\Framework\Search\Request\Config\Converter');
 
         $document = new \DOMDocument();
-        $document->load($this->requestConfig);
+        $document->load($this->getRequestConfigPath());
         $requestConfig = $converter->convert($document);
 
         /** @var \Magento\Framework\Search\Request\Config $config */
@@ -66,6 +61,16 @@ protected function setUp()
         $this->adapter = $this->createAdapter();
     }
 
+    /**
+     * Get request config path
+     * 
+     * @return string
+     */
+    protected function getRequestConfigPath()
+    {
+        return __DIR__ . '/../../_files/requests.xml';
+    }
+
     /**
      * Make sure that correct engine is set
      */