MAGETWO-58658: [PR] Delivery of bug fixes for Setup, Sample Data and Import/Export

Author: Bohdan Korablov

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -1242,8 +1242,7 @@ public function testImportWithoutUrlKeys()
             'simple2' => 'simple-2',
             'simple3' => 'simple-3'
         ];
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Filesystem::class);
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
             \Magento\ImportExport\Model\Import\Source\Csv::class,
@@ -1262,9 +1261,7 @@ public function testImportWithoutUrlKeys()
         $this->assertTrue($errors->getErrorsCount() == 0);
         $this->_model->importData();
 
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
-        );
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         foreach ($products as $productSku => $productUrlKey) {
             $this->assertEquals($productUrlKey, $productRepository->get($productSku)->getUrlKey());
         }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_without_url_keys.csv

@@ -1,4 +1,4 @@
 sku,product_type,store_view_code,name,price,attribute_set_code,url_key
 simple1,simple,,"simple 1",25,Default,""
 simple2,simple,,"simple 2",34,Default,""
-simple3,simple,,"simple 3",58,Default,""
+simple3,simple,,"simple 3",58,Default,""

setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/Writer/File/AbstractFileTest.php renamed to setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/Writer/File/CsvTest.php

@@ -8,11 +8,15 @@
 use Magento\Setup\Module\I18n\Context;
 use Magento\Setup\Module\I18n\Locale;
 use Magento\Setup\Module\I18n\Dictionary;
+use Magento\Setup\Module\I18n\Factory;
 use Magento\Setup\Module\I18n\Dictionary\Phrase;
-use Magento\Setup\Module\I18n\Pack\Writer\File\AbstractFile;
+use Magento\Setup\Module\I18n\Pack\Writer\File\Csv;
+use Magento\Setup\Module\I18n\Dictionary\WriterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
-class AbstractFileTest extends \PHPUnit_Framework_TestCase
+require_once __DIR__ . '/_files/ioMock.php';
+
+class CsvTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var Context|\PHPUnit_Framework_MockObject_MockObject
@@ -35,7 +39,12 @@ class AbstractFileTest extends \PHPUnit_Framework_TestCase
     protected $phraseMock;
 
     /**
-     * @var AbstractFile|\PHPUnit_Framework_MockObject_MockObject
+     * @var Factory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $factoryMock;
+
+    /**
+     * @var Csv|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $object;
 
@@ -51,15 +60,16 @@ protected function setUp()
         $this->localeMock = $this->getMock(Locale::class, [], [], '', false, false);
         $this->dictionaryMock = $this->getMock(Dictionary::class, [], [], '', false, false);
         $this->phraseMock = $this->getMock(Phrase::class, [], [], '', false, false);
+        $this->factoryMock = $this->getMock(Factory::class, [], [], '', false, false);
 
         $constructorArguments = $objectManagerHelper->getConstructArguments(
-            AbstractFile::class,
-            ['context' => $this->contextMock]
+            Csv::class,
+            [
+                'context' => $this->contextMock,
+                'factory' => $this->factoryMock
+            ]
         );
-        $this->object = $this->getMockBuilder(AbstractFile::class)
-            ->setMethods(['_createDirectoryIfNotExist', '_writeFile'])
-            ->setConstructorArgs($constructorArguments)
-            ->getMockForAbstractClass();
+        $this->object = $objectManagerHelper->getObject(Csv::class, $constructorArguments);
     }
 
     /**
@@ -73,11 +83,6 @@ public function testWriteDictionaryWithRuntimeException($contextType, $contextVa
     {
         $this->configureGeneralPhrasesMock($contextType, $contextValue);
 
-        $this->object->expects($this->never())
-            ->method('_createDirectoryIfNotExist');
-        $this->object->expects($this->never())
-            ->method('_writeFile');
-
         $this->object->writeDictionary($this->dictionaryMock, $this->localeMock);
     }
 
@@ -105,11 +110,6 @@ public function testWriteDictionaryWithInvalidArgumentException()
 
         $this->configureGeneralPhrasesMock($contextType, [$contextValue]);
 
-        $this->object->expects($this->never())
-            ->method('_createDirectoryIfNotExist');
-        $this->object->expects($this->never())
-            ->method('_writeFile');
-
         $this->contextMock->expects($this->once())
             ->method('buildPathToLocaleDirectoryByContext')
             ->with($contextType, $contextValue)
@@ -128,16 +128,16 @@ public function testWriteDictionaryWherePathIsNull()
 
         $this->configureGeneralPhrasesMock($contextType, [$contextValue]);
 
-        $this->object->expects($this->never())
-            ->method('_createDirectoryIfNotExist');
-        $this->object->expects($this->never())
-            ->method('_writeFile');
-
         $this->contextMock->expects($this->once())
             ->method('buildPathToLocaleDirectoryByContext')
             ->with($contextType, $contextValue)
             ->willReturn(null);
 
+        $this->phraseMock->expects($this->never())
+            ->method('setContextType');
+        $this->phraseMock->expects($this->never())
+            ->method('setContextValue');
+
         $this->object->writeDictionary($this->dictionaryMock, $this->localeMock);
     }
 
@@ -151,33 +151,37 @@ public function testWriteDictionary()
         $path = '/some/path/';
         $phrase = 'Phrase';
         $locale = 'en_EN';
-        $fileExtension = 'csv';
-        $file = $path . $locale . '.' . $fileExtension;
+        $file = $path . $locale . '.' . Csv::FILE_EXTENSION;
 
         $this->configureGeneralPhrasesMock($contextType, [$contextValue]);
 
         $this->phraseMock->expects($this->once())
             ->method('getPhrase')
             ->willReturn($phrase);
+        $this->phraseMock->expects($this->once())
+            ->method('setContextType')
+            ->with(null);
+        $this->phraseMock->expects($this->once())
+            ->method('setContextValue')
+            ->with(null);
         $this->localeMock->expects($this->once())
             ->method('__toString')
             ->willReturn($locale);
 
-        $this->object->expects($this->once())
-            ->method('_getFileExtension')
-            ->willReturn($fileExtension);
-        $this->object->expects($this->once())
-            ->method('_createDirectoryIfNotExist')
-            ->with(dirname($file));
-        $this->object->expects($this->once())
-            ->method('_writeFile')
-            ->with($file, [$phrase => $this->phraseMock]);
-
         $this->contextMock->expects($this->once())
             ->method('buildPathToLocaleDirectoryByContext')
             ->with($contextType, $contextValue)
             ->willReturn($path);
 
+        $writerMock = $this->getMockForAbstractClass(WriterInterface::class);
+        $writerMock->expects($this->once())
+            ->method('write')
+            ->with($this->phraseMock);
+        $this->factoryMock->expects($this->once())
+            ->method('createDictionaryWriter')
+            ->with($file)
+            ->willReturn($writerMock);
+
         $this->object->writeDictionary($this->dictionaryMock, $this->localeMock);
     }
 

setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/Writer/File/_files/ioMock.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Module\I18n\Pack\Writer\File;
+
+/**
+ * Mock is_dir function
+ *
+ * @see \Magento\Setup\Module\I18n\Pack\Writer\File\AbstractFile
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+function is_dir($path)
+{
+    return false;
+}
+
+/**
+ * Mock mkdir function
+ *
+ * @see \Magento\Setup\Module\I18n\Pack\Writer\File\AbstractFile
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+function mkdir($pathname, $mode = 0777, $recursive = false, $context = null)
+{
+    return true;
+}
+
+/**
+ * Mock chmod function
+ *
+ * @see \Magento\Setup\Module\I18n\Pack\Writer\File\AbstractFile
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+function chmod($filename, $mode)
+{
+    return true;
+}