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

Author: Maksym Savich

dev/tests/integration/testsuite/Magento/ImportExport/Block/Adminhtml/Import/Edit/BeforeTest.php

@@ -18,98 +18,10 @@ 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()
     {
-        $jsonEncoderMock = $this->getMockBuilder('Magento\Framework\Json\EncoderInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $jsonEncoderMock->expects(
-            $this->any()
-        )->method(
-            'encode'
-        )->will(
-            $this->returnCallback([$this, 'jsonEncodeCallback'])
-        );
-
-        $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)
-        );
-
-        $arguments = [
-            'jsonEncoder' => $jsonEncoderMock,
-            'importModel' => $importModel,
-            'urlBuilder' => $this->getMock('Magento\Backend\Model\Url', [], [], '', false),
-        ];
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->_model = $objectManager->create('Magento\ImportExport\Block\Adminhtml\Import\Edit\Before', $arguments);
-    }
-
-    protected function tearDown()
-    {
-        unset($this->_model);
-    }
-
-    /**
-     * Callback method for \Magento\Framework\Json\EncoderInterface::jsonEncode
-     *
-     * @param mixed $data
-     * @return string
-     */
-    public function jsonEncodeCallback($data)
-    {
-        return \Zend_Json::encode($data);
+        $this->_model = $objectManager->create('Magento\ImportExport\Block\Adminhtml\Import\Edit\Before');
     }
 
     /**
@@ -120,7 +32,8 @@ public function jsonEncodeCallback($data)
     public function testGetEntityBehaviors()
     {
         $actualEntities = $this->_model->getEntityBehaviors();
-        $expectedEntities = \Zend_Json::encode($this->_expectedEntities);
+        $expectedEntities = '{"catalog_product":"basic_behavior","customer_finance":"custom_behavior",' .
+            '"customer_composite":"basic_behavior","customer":"custom_behavior","customer_address":"custom_behavior"}';
         $this->assertEquals($expectedEntities, $actualEntities);
     }
 
@@ -132,7 +45,7 @@ public function testGetEntityBehaviors()
     public function testGetUniqueBehaviors()
     {
         $actualBehaviors = $this->_model->getUniqueBehaviors();
-        $expectedBehaviors = \Zend_Json::encode($this->_expectedBehaviors);
+        $expectedBehaviors = '["basic_behavior","custom_behavior"]';
         $this->assertEquals($expectedBehaviors, $actualBehaviors);
     }
 }

dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php

@@ -67,7 +67,7 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
     protected $_productFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Json\Helper\
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Json\Helper\Data
      */
     protected $jsonHelperMock;