Merge remote-tracking branch 'origin/MAGETWO-36005-TestCoverage-API-S49' into MAGETWO-36005-TestCoverage-API-S49

Author: Cari Spruiell

app/code/Magento/Integration/Test/Unit/Model/AuthorizationServiceTest.php

@@ -18,16 +18,29 @@ class AuthorizationServiceTest extends \PHPUnit_Framework_TestCase
      */
     const ROLE_ID = 1;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|Role */
+    /**
+     * Sample integration id
+     */
+    const INTEGRATION_ID = 22;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Role
+     */
     protected $roleMock;
 
-    /** @var AuthorizationService */
+    /**
+     * @var AuthorizationService
+     */
     protected $integrationAuthorizationService;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|Rules */
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Rules
+     */
     protected $rulesMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|RootResource */
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|RootResource
+     */
     protected $rootAclResourceMock;
 
     /**
@@ -39,14 +52,14 @@ protected function setUp()
     {
         $this->roleMock = $this->getMock(
             'Magento\Authorization\Model\Role',
-            ['load', 'delete', '__wakeup', 'getId'],
+            ['load', 'delete', '__wakeup', 'getId', 'save'],
             [],
             '',
             false
         );
         $this->roleMock->expects($this->any())->method('load')->will($this->returnSelf());
         $this->roleMock->expects($this->any())->method('delete')->will($this->returnSelf());
-        $this->roleMock->expects($this->any())->method('getId')->will($this->returnValue(self::ROLE_ID));
+        $this->roleMock->expects($this->any())->method('save')->will($this->returnSelf());
 
         /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Authorization\Model\RoleFactory $roleFactoryMock */
         $roleFactoryMock = $this->getMock(
@@ -106,45 +119,112 @@ protected function setUp()
 
     public function testRemovePermissions()
     {
-        $integrationId = 22;
-        $roleName = UserContextInterface::USER_TYPE_INTEGRATION . $integrationId;
+        $roleName = UserContextInterface::USER_TYPE_INTEGRATION . self::INTEGRATION_ID;
         $this->roleMock->expects($this->once())->method('load')->with($roleName)->will($this->returnSelf());
-        $this->integrationAuthorizationService->removePermissions($integrationId);
+        $this->integrationAuthorizationService->removePermissions(self::INTEGRATION_ID);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Error happened while deleting role and permissions. Check exception log for details.
+     */
+    public function testRemovePermissionsException()
+    {
+        $roleName = UserContextInterface::USER_TYPE_INTEGRATION . self::INTEGRATION_ID;
+        $this->roleMock->expects($this->once())
+            ->method('load')
+            ->with($roleName)
+            ->will($this->throwException(new \Exception));
+        $this->integrationAuthorizationService->removePermissions(self::INTEGRATION_ID);
     }
 
     public function testGrantPermissions()
     {
-        $integrationId = 22;
         $this->resources = [
             'Magento_Sales::sales',
             'Magento_Sales::sales_operations',
             'Magento_Cart::cart',
             'Magento_Cart::manage'
         ];
 
+        $this->roleMock->expects($this->any())->method('getId')->will($this->returnValue(self::ROLE_ID));
         $this->rulesMock->expects($this->any())->method('setRoleId')->with(self::ROLE_ID)->will($this->returnSelf());
         $this->rulesMock->expects($this->any())
             ->method('setResources')
             ->with($this->resources)
             ->will($this->returnSelf());
         $this->rulesMock->expects($this->any())->method('saveRel')->will($this->returnSelf());
 
-        $this->integrationAuthorizationService->grantPermissions($integrationId, $this->resources);
+        $this->integrationAuthorizationService->grantPermissions(self::INTEGRATION_ID, $this->resources);
+    }
+
+    public function testGrantPermissionsNoRole()
+    {
+        $calculatedRoleId = UserContextInterface::USER_TYPE_INTEGRATION . self::INTEGRATION_ID;
+
+        $this->resources = [
+            'Magento_Sales::sales',
+            'Magento_Sales::sales_operations',
+            'Magento_Cart::cart',
+            'Magento_Cart::manage'
+        ];
+
+        //Return invalid role
+        $this->roleMock->expects($this->any())
+            ->method('getId')
+            ->will($this->onConsecutiveCalls(null, $calculatedRoleId));
+        // Verify if the method is called with the newly created role
+        $this->rulesMock->expects($this->any())
+            ->method('setRoleId')
+            ->with($calculatedRoleId)
+            ->will($this->returnSelf());
+
+        $this->rulesMock->expects($this->any())
+            ->method('setResources')
+            ->with($this->resources)
+            ->will($this->returnSelf());
+        $this->rulesMock->expects($this->any())->method('saveRel')->will($this->returnSelf());
+
+        $this->integrationAuthorizationService->grantPermissions(self::INTEGRATION_ID, $this->resources);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Error happened while granting permissions. Check exception log for details.
+     */
+    public function testGrantPermissionsException()
+    {
+        $this->resources = [
+            'Magento_Sales::sales',
+            'Magento_Sales::sales_operations',
+            'Magento_Cart::cart',
+            'Magento_Cart::manage'
+        ];
+
+        $this->roleMock->expects($this->any())->method('getId')->will($this->returnValue(self::ROLE_ID));
+        $this->rulesMock->expects($this->any())->method('setRoleId')->with(self::ROLE_ID)->will($this->returnSelf());
+        $this->rulesMock->expects($this->any())
+            ->method('setResources')
+            ->with($this->resources)
+            ->will($this->returnSelf());
+        $this->rulesMock->expects($this->any())->method('saveRel')->will($this->throwException(new \Exception));
+
+        $this->integrationAuthorizationService->grantPermissions(self::INTEGRATION_ID, $this->resources);
     }
 
     public function testGrantAllPermissions()
     {
-        $integrationId = 22;
         $rootResource = 'Magento_All:all';
 
         $this->rootAclResourceMock->expects($this->any())->method('getId')->will($this->returnValue($rootResource));
+        $this->roleMock->expects($this->any())->method('getId')->will($this->returnValue(self::ROLE_ID));
         $this->rulesMock->expects($this->any())->method('setRoleId')->with(self::ROLE_ID)->will($this->returnSelf());
         $this->rulesMock->expects($this->any())
             ->method('setResources')
             ->with([$rootResource])
             ->will($this->returnSelf());
         $this->rulesMock->expects($this->any())->method('saveRel')->will($this->returnSelf());
 
-        $this->integrationAuthorizationService->grantAllPermissions($integrationId);
+        $this->integrationAuthorizationService->grantAllPermissions(self::INTEGRATION_ID);
     }
 }

app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Integration\Test\Unit\Model\Oauth;
+namespace Magento\Integration\Test\Unit\Model\Oauth\Token;
 
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Integration\Model\Oauth\Token;