Merge branch 'MAGETWO-32074-core-helpers' of https://github.corp.ebay.com/magento-extensibility/magento2ce into MAGETWO-32074-core-helpers

Author: Maksym Savich

app/code/Magento/CustomerImportExport/Model/Resource/Import/CustomerComposite/Data.php

@@ -37,7 +37,7 @@ public function __construct(
         $resourcePrefix = null,
         array $arguments = []
     ) {
-        parent::__construct($context, $jsonHelper, $resourcePrefix, $arguments);
+        parent::__construct($context, $jsonHelper, $resourcePrefix);
 
         if (isset($arguments['entity_type'])) {
             $this->_entityType = $arguments['entity_type'];

app/code/Magento/ImportExport/Model/Resource/Import/Data.php

@@ -30,13 +30,11 @@ class Data extends \Magento\Framework\Model\Resource\Db\AbstractDb implements \I
      * @param \Magento\Framework\Model\Resource\Db\Context $context
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param string|null $resourcePrefix
-     * @param array $arguments
      */
     public function __construct(
         \Magento\Framework\Model\Resource\Db\Context $context,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
-        $resourcePrefix = null,
-        array $arguments = []
+        $resourcePrefix = null
     ) {
         parent::__construct($context, $resourcePrefix);
         $this->jsonHelper = $jsonHelper;

composer.json

@@ -38,6 +38,7 @@
         "phpunit/phpunit": "4.1.0",
         "squizlabs/php_codesniffer": "1.5.3",
         "phpmd/phpmd": "@stable",
+        "pdepend/pdepend": "2.0.4",
         "lib-libxml": "*",
         "ext-ctype": "*",
         "ext-gd": "*",

composer.lock

@@ -18,10 +18,71 @@ class BeforeTest extends \PHPUnit_Framework_TestCase
      */
     protected $_model;
 
+    /**
+     * Source entity behaviors
+     *
+     * @var array
+     */
+    protected $_sourceEntities = [
+        'entity_1' => ['code' => 'behavior_1', 'token' => 'Some_Random_First_Class'],
+        'entity_2' => ['code' => 'behavior_2', 'token' => 'Some_Random_Second_Class'],
+    ];
+
+    /**
+     * Expected entity behaviors
+     *
+     * @var array
+     */
+    protected $_expectedEntities = ['entity_1' => 'behavior_1', 'entity_2' => 'behavior_2'];
+
+    /**
+     * Source unique behaviors
+     *
+     * @var array
+     */
+    protected $_sourceBehaviors = [
+        'behavior_1' => 'Some_Random_First_Class',
+        'behavior_2' => 'Some_Random_Second_Class',
+    ];
+
+    /**
+     * Expected unique behaviors
+     *
+     * @var array
+     */
+    protected $_expectedBehaviors = ['behavior_1', 'behavior_2'];
+
     protected function setUp()
     {
+        $importModel = $this->getMock(
+            'Magento\ImportExport\Model\Import',
+            ['getEntityBehaviors', 'getUniqueEntityBehaviors'],
+            [],
+            '',
+            false
+        );
+        $importModel->expects(
+            $this->any()
+        )->method(
+            'getEntityBehaviors'
+        )->will(
+            $this->returnValue($this->_sourceEntities)
+        );
+        $importModel->expects(
+            $this->any()
+        )->method(
+            'getUniqueEntityBehaviors'
+        )->will(
+            $this->returnValue($this->_sourceBehaviors)
+        );
+
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->_model = $objectManager->create('Magento\ImportExport\Block\Adminhtml\Import\Edit\Before');
+        $this->_model = $objectManager->create(
+            'Magento\ImportExport\Block\Adminhtml\Import\Edit\Before',
+            [
+                'importModel' => $importModel,
+            ]
+        );
     }
 
     /**
@@ -32,8 +93,7 @@ protected function setUp()
     public function testGetEntityBehaviors()
     {
         $actualEntities = $this->_model->getEntityBehaviors();
-        $expectedEntities = '{"catalog_product":"basic_behavior","customer_finance":"custom_behavior",' .
-            '"customer_composite":"basic_behavior","customer":"custom_behavior","customer_address":"custom_behavior"}';
+        $expectedEntities = \Zend_Json::encode($this->_expectedEntities);
         $this->assertEquals($expectedEntities, $actualEntities);
     }
 
@@ -45,7 +105,7 @@ public function testGetEntityBehaviors()
     public function testGetUniqueBehaviors()
     {
         $actualBehaviors = $this->_model->getUniqueBehaviors();
-        $expectedBehaviors = '["basic_behavior","custom_behavior"]';
+        $expectedBehaviors = \Zend_Json::encode($this->_expectedBehaviors);
         $this->assertEquals($expectedBehaviors, $actualBehaviors);
     }
 }