MAGETWO-87555: Test coverage for critical logic

Author: rganin

app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php

@@ -37,6 +37,7 @@ public function __construct(
      */
     public function apply()
     {
+        $this->schemaSetup->startSetup();
         // Updating data of the 'catalog_product_bundle_option_value' table.
         $tableName = $this->schemaSetup->getTable('catalog_product_bundle_option_value');
 
@@ -103,8 +104,6 @@ public function apply()
 
         $columnsToSelect = [];
 
-        $this->schemaSetup->getConnection()->startSetup();
-
         foreach ($this->schemaSetup->getConnection()->describeTable($tmpTableName) as $column) {
             $alias = $column['COLUMN_NAME'] == 'parent_product_id' ? 'selections.' : 'prices.';
 
@@ -131,7 +130,7 @@ public function apply()
 
         $this->schemaSetup->getConnection()->dropTable($tmpTableName);
 
-        $this->schemaSetup->getConnection()->endSetup();
+        $this->schemaSetup->endSetup();
     }
 
     /**

lib/internal/Magento/Framework/Config/FileResolverByModule.php

@@ -61,7 +61,7 @@ public function get($filename, $scope)
         $iterator = $this->_moduleReader->getConfigurationFiles($filename)->toArray();
         if ($scope !== self::ALL_MODULES) {
             $path = $this->componentRegistrar->getPath('module', $scope);
-            $path .= DIRECTORY_SEPARATOR . Dir::MODULE_ETC_DIR . DIRECTORY_SEPARATOR . $filename;
+            $path .= '/' . Dir::MODULE_ETC_DIR . '/'. $filename;
             $iterator = isset($iterator[$path]) ? [$path => $iterator[$path]] : [];
         }
         $primaryFile = parent::get($filename, 'primary')->toArray();

lib/internal/Magento/Framework/Test/Unit/Config/FileResolverByModuleTest.php

@@ -11,25 +11,39 @@
 
 class FileResolverByModuleTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\Config\FileResolverByModule */
-    protected $model;
+    /**
+     * @var \Magento\Framework\Config\FileResolverByModule
+     */
+    private $model;
 
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
 
-    /** @var \Magento\Framework\Module\Dir\Reader|\PHPUnit_Framework_MockObject_MockObject */
-    protected $readerMock;
+    /**
+     * @var \Magento\Framework\Module\Dir\Reader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $readerMock;
 
-    /** @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */
-    protected $filesystemMock;
+    /**
+     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filesystemMock;
 
-    /** @var \Magento\Framework\Config\FileIteratorFactory|\PHPUnit_Framework_MockObject_MockObject */
-    protected $fileIteratorFactoryMock;
+    /**
+     * @var \Magento\Framework\Config\FileIteratorFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileIteratorFactoryMock;
 
-    /** @var \Magento\Framework\Component\ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject */
-    protected $componentRegistrarMock;
+    /**
+     * @var \Magento\Framework\Component\ComponentRegistrar|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $componentRegistrarMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File|\PHPUnit_Framework_MockObject_MockObject
+     */
     private $fileDriver;
 
     protected function setUp()
@@ -46,7 +60,7 @@ protected function setUp()
         $this->componentRegistrarMock = $this->getMockBuilder(\Magento\Framework\Component\ComponentRegistrar::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->fileDriver = $this->getMockBuilder(DriverInterface::class)
+        $this->fileDriver = $this->getMockBuilder(\Magento\Framework\Filesystem\Driver\File::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->objectManagerHelper = new ObjectManagerHelper($this);