MAGETWO-37605: Define Public API CheckoutAgreements:

-fix after CR

Author: irenelagno

app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php

@@ -16,7 +16,6 @@
 use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
 use Magento\CheckoutAgreements\Model\Resource\Agreement as AgreementResource;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Api\DataObjectHelper;
 use Magento\Store\Model\Store;
 
 /**
@@ -55,11 +54,6 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      */
     private $agreementFactory;
 
-    /**
-     * @var \Magento\Framework\Api\DataObjectHelper
-     */
-    private $dataObjectHelper;
-
     /**
      * Constructs a checkout agreement data object.
      *
@@ -68,22 +62,19 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      * @param ScopeConfigInterface $scopeConfig Scope config.
      * @param AgreementResource $agreementResource
      * @param AgreementFactory $agreementFactory
-     * @param DataObjectHelper $dataObjectHelper
      */
     public function __construct(
         AgreementCollectionFactory $collectionFactory,
         StoreManagerInterface $storeManager,
         ScopeConfigInterface $scopeConfig,
         AgreementResource $agreementResource,
-        AgreementFactory $agreementFactory,
-        DataObjectHelper $dataObjectHelper
+        AgreementFactory $agreementFactory
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
         $this->resourceModel = $agreementResource;
         $this->agreementFactory = $agreementFactory;
-        $this->dataObjectHelper = $dataObjectHelper;
     }
 
     /**

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

@@ -46,11 +46,6 @@ class CheckoutAgreementsRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     private $agrFactoryMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $dataObjHelperMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -82,8 +77,7 @@ protected function setUp()
             '',
             false
         );
-        $this->dataObjHelperMock  = $this->getMock('Magento\Framework\Api\DataObjectHelper', [], [], '', false);
-        $methods = ['addData', 'getData', 'setStores', 'getAgreementId', 'getId', 'setStoreId'];
+        $methods = ['addData', 'getData', 'setStores', 'getAgreementId', 'getId'];
         $this->agreementMock =
             $this->getMock('\Magento\CheckoutAgreements\Model\Agreement', $methods, [], '', false);
         $this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
@@ -92,8 +86,7 @@ protected function setUp()
             $this->storeManagerMock,
             $this->scopeConfigMock,
             $this->resourceMock,
-            $this->agrFactoryMock,
-            $this->dataObjHelperMock
+            $this->agrFactoryMock
         );
     }
 
@@ -150,16 +143,10 @@ public function testUpdate()
             ->expects($this->once())
             ->method('load')
             ->with($this->agreementMock, $agreementId);
-        $this->agreementMock->expects($this->once())->method('setStoreId')->with(1);
         $this->storeManagerMock->expects($this->never())->method('getStore');
         $this->agreementMock->expects($this->once())->method('setStores');
         $this->agreementMock->expects($this->once())->method('getId')->willReturn($agreementId);
         $this->agreementMock->expects($this->any())->method('getData')->willReturn(['data']);
-        $this->dataObjHelperMock
-            ->expects($this->once())
-            ->method('populateWithArray')
-            ->with($this->agreementMock, ['data'], 'Magento\CheckoutAgreements\Api\Data\AgreementInterface')
-        ->willReturn($this->agreementMock);
         $this->agreementMock
             ->expects($this->once())
             ->method('addData')->with(['data'])
@@ -194,14 +181,7 @@ public function testDeleteById()
             ->method('load')
             ->with($this->agreementMock, $agreementId)
             ->willReturn($this->agreementMock);
-        $this->agreementMock->expects($this->any())->method('setStoreId')->with(null);
         $this->agreementMock->expects($this->once())->method('getId')->willReturn($agreementId);
-        $this->agreementMock->expects($this->once())->method('getData')->willReturn(['data']);
-        $this->dataObjHelperMock
-            ->expects($this->once())
-            ->method('populateWithArray')
-            ->with($this->agreementMock, ['data'], 'Magento\CheckoutAgreements\Api\Data\AgreementInterface')
-            ->willReturn($this->agreementMock);
         $this->resourceMock->expects($this->once())->method('delete');
         $this->assertTrue($this->model->deleteById(1));
     }
@@ -218,14 +198,7 @@ public function testDeleteByIdWithException()
             ->method('load')
             ->with($this->agreementMock, $agreementId)
             ->willReturn($this->agreementMock);
-        $this->agreementMock->expects($this->any())->method('setStoreId')->with(null);
         $this->agreementMock->expects($this->once())->method('getId')->willReturn($agreementId);
-        $this->agreementMock->expects($this->once())->method('getData')->willReturn(['data']);
-        $this->dataObjHelperMock
-            ->expects($this->once())
-            ->method('populateWithArray')
-            ->with($this->agreementMock, ['data'], 'Magento\CheckoutAgreements\Api\Data\AgreementInterface')
-            ->willReturn($this->agreementMock);
         $this->resourceMock->expects($this->once())->method('delete')->willThrowException(new \Exception());
         $this->assertTrue($this->model->deleteById(1));
     }