MAGETWO-38823: Stabilize builds

 - fix unit test failures

Author: Cari Spruiell

app/code/Magento/CheckoutAgreements/Test/Unit/Model/CheckoutAgreementsRepositoryTest.php

@@ -120,10 +120,7 @@ public function testGetListReturnsTheListOfActiveCheckoutAgreements()
     {
         $this->extensionAttributesJoinProcessorMock->expects($this->once())
             ->method('process')
-            ->with(
-                $this->isInstanceOf('Magento\CheckoutAgreements\Model\Resource\Agreement\Collection'),
-                '\Magento\CheckoutAgreements\Api\Data\AgreementInterface'
-            );
+            ->with($this->isInstanceOf('Magento\CheckoutAgreements\Model\Resource\Agreement\Collection'));
 
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')

app/code/Magento/Eav/Test/Unit/Model/AttributeSetRepositoryTest.php

@@ -42,6 +42,11 @@ class AttributeSetRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     private $resultFactoryMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $extensionAttributesJoinProcessorMock;
+
     /**
      * @return void
      */
@@ -76,12 +81,20 @@ protected function setUp()
             '',
             false
         );
+        $this->extensionAttributesJoinProcessorMock = $this->getMock(
+            '\Magento\Framework\Api\ExtensionAttribute\JoinProcessor',
+            ['process'],
+            [],
+            '',
+            false
+        );
         $this->model = new \Magento\Eav\Model\AttributeSetRepository(
             $this->resourceMock,
             $this->setFactoryMock,
             $this->collectionFactoryMock,
             $this->eavConfigMock,
-            $this->resultFactoryMock
+            $this->resultFactoryMock,
+            $this->extensionAttributesJoinProcessorMock
         );
     }
 

lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php

@@ -44,14 +44,14 @@ class DataObjectHelperTest extends \PHPUnit_Framework_TestCase
     protected $attributeValueFactoryMock;
 
     /**
-     * @var \Magento\Framework\Api\ExtensionAttributesFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Reflection\MethodsMap|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $extensionFactoryMock;
+    protected $methodsMapProcessor;
 
     /**
-     * @var \Magento\Framework\Reflection\MethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessor|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $methodsMapProcessor;
+    protected $joinProcessorMock;
 
     public function setUp()
     {
@@ -69,22 +69,23 @@ public function setUp()
         $this->attributeValueFactoryMock = $this->getMockBuilder('Magento\Framework\Api\AttributeValueFactory')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->extensionFactoryMock = $this->getMockBuilder('Magento\Framework\Api\ExtensionAttributesFactory')
+        $this->joinProcessorMock = $this->getMockBuilder('\Magento\Framework\Api\ExtensionAttribute\JoinProcessor')
             ->setMethods(['extractExtensionAttributes'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->extensionFactoryMock->expects($this->any())
+        $this->joinProcessorMock->expects($this->any())
             ->method('extractExtensionAttributes')
             ->willReturnArgument(1);
         $this->typeProcessor = $this->objectManager->getObject('Magento\Framework\Reflection\TypeProcessor');
+
         $this->dataObjectHelper = $this->objectManager->getObject(
             'Magento\Framework\Api\DataObjectHelper',
             [
                 'objectFactory' => $this->objectFactoryMock,
                 'typeProcessor' => $this->typeProcessor,
                 'objectProcessor' => $this->objectProcessorMock,
-                'extensionFactory' => $this->extensionFactoryMock,
                 'methodsMapProcessor' => $this->methodsMapProcessor,
+                'joinProcessor' => $this->joinProcessorMock
             ]
         );
     }