Merge pull request #384 from svycka/improove-roleservice-tests

Improve RoleService tests

Author: basz

src/Service/RoleService.php

@@ -86,7 +86,7 @@ public function getIdentityRoles(IdentityInterface $identity = null, $context =
      * @param  array|Traversable $roles
      * @return RoleInterface[]
      */
-    protected function convertRoles($roles): array
+    private function convertRoles($roles): array
     {
         if ($roles instanceof Traversable) {
             $roles = iterator_to_array($roles);

test/Service/RoleServiceTest.php

@@ -22,8 +22,13 @@
 namespace ZfcRbacTest\Service;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use ZfcRbac\Identity\IdentityInterface;
+use ZfcRbac\Role\HierarchicalRole;
 use ZfcRbac\Role\InMemoryRoleProvider;
+use ZfcRbac\Role\Role;
 use ZfcRbac\Role\RoleInterface;
+use ZfcRbac\Role\RoleProviderInterface;
 use ZfcRbac\Service\RoleService;
 use ZfcRbacTest\Asset\Identity;
 
@@ -61,4 +66,54 @@ public function testReturnGuestRoleIfGuestIdentityIsGiven(): void
         $this->assertInstanceOf(RoleInterface::class, $result[0]);
         $this->assertEquals('guest', $result[0]->getName());
     }
+
+    public function testReturnTraversableRolesFromIdentityGiven(): void
+    {
+        $roleService = new RoleService(new InMemoryRoleProvider([]));
+        $identity = $this->prophesize(IdentityInterface::class);
+        $identity->getRoles()->willReturn($roles = new \ArrayIterator(['first', 'second', 'third']));
+
+        $result = $roleService->getIdentityRoles($identity->reveal());
+
+        $this->assertCount(3, $result);
+        $this->assertInstanceOf(RoleInterface::class, $result[0]);
+        $this->assertEquals($roles[0], $result[0]->getName());
+        $this->assertEquals($roles[1], $result[1]->getName());
+        $this->assertEquals($roles[2], $result[2]->getName());
+    }
+
+    public function testWillNotInvokeRoleProviderIfAllRolesCollected(): void
+    {
+        $roleProvider = $this->prophesize(RoleProviderInterface::class);
+        $roleProvider->getRoles(Argument::any())->shouldNotBeCalled();
+
+        $roleService = new RoleService($roleProvider->reveal());
+        $roles = [new Role('first'), new HierarchicalRole('second'), new Role('third')];
+        $identity = new Identity($roles);
+
+        $result = $roleService->getIdentityRoles($identity);
+
+        $this->assertCount(3, $result);
+        $this->assertInstanceOf(RoleInterface::class, $result[0]);
+        $this->assertEquals($roles, $result);
+    }
+
+    public function testWillCollectRolesOnlyIfRequired(): void
+    {
+        $roleProvider = $this->prophesize(RoleProviderInterface::class);
+        $roles = [new Role('first'), new HierarchicalRole('second'), 'third'];
+        $roleProvider->getRoles(['third'])->shouldBeCalled()->willReturn([new Role('third')]);
+
+        $roleService = new RoleService($roleProvider->reveal());
+        $identity = new Identity($roles);
+
+        $result = $roleService->getIdentityRoles($identity);
+
+        $this->assertCount(3, $result);
+        $this->assertInstanceOf(RoleInterface::class, $result[0]);
+
+        $this->assertEquals($roles[0]->getName(), $result[0]->getName());
+        $this->assertEquals($roles[1]->getName(), $result[1]->getName());
+        $this->assertEquals($roles[2], $result[2]->getName());
+    }
 }