MAGETWO-34457: Merge and Fix tests

- fix test related to customAttributesMap

Author: arkadiych

dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php

@@ -12,6 +12,9 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
     /**  @var \Magento\Webapi\Model\Soap\Wsdl\Generator */
     protected $_wsdlGenerator;
 
+    /**  @var \Magento\Framework\Object */
+    protected $customAttributeMap;
+
     /**  @var \Magento\Webapi\Model\Soap\Config|\PHPUnit_Framework_MockObject_MockObject */
     protected $_soapConfigMock;
 
@@ -88,16 +91,18 @@ protected function setUp()
             ->method('getCode')
             ->will($this->returnValue('store_code'));
 
-        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->_wsdlGenerator = $helper->getObject(
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->customAttributeMap = $objectManager->getObject('Magento\Framework\Object');
+        $this->_wsdlGenerator = $objectManager->getObject(
             'Magento\Webapi\Model\Soap\Wsdl\Generator',
             [
                 'apiConfig' => $this->_soapConfigMock,
                 'wsdlFactory' => $this->_wsdlFactoryMock,
                 'cache' => $this->_cacheMock,
                 'typeProcessor' => $this->_typeProcessor,
                 'storeManagerMock' => $this->storeManagerMock,
-                'customAttributeMap' => new \Magento\Framework\Api\CustomAttributeMap()
+                'customAttributeMap' => $this->customAttributeMap
             ]
         );
 
@@ -191,7 +196,7 @@ public function testHandleWithException()
                 $this->_cacheMock,
                 $this->_typeProcessor,
                 $this->storeManagerMock,
-                new \Magento\Framework\Api\CustomAttributeMap()
+                $this->customAttributeMap
             ]
         )->getMock();