Commit 52f967e6 authored by David Surville's avatar David Surville
Browse files

[Fix] Erreur namespace

parent 05c5e3b4
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ use UnicaenZimbra\Entity\Filter\Test\Header as FilterTestHeader;
use UnicaenZimbra\Entity\Filter\Action\FileInto as FilterActionFileInto;
use UnicaenZimbra\Entity\Filter\Action\Keep as FilterActionKeep;
use UnicaenZimbra\Options\ModuleOptions;
use UnicaenZimbra\Service\Folder as FolderService;
use UnicaenZimbra\Service\ZimbraFolderService;
use UnicaenZimbra\Service\ZimbraGalService;

class ZimbraBoiteGeneriqueProcessus extends AbstractProcessus
@@ -310,9 +310,9 @@ class ZimbraBoiteGeneriqueProcessus extends AbstractProcessus
        $grant->setGrantee($userAccount);
        $grant->perm = Grant::PERM_MANAGE;

        $folderService->addGrant($inputFolder, $grant, FolderService::GRANT_ACTION_NONE)
        $folderService->addGrant($inputFolder, $grant, ZimbraFolderService::GRANT_ACTION_NONE)
            ->createMountPoint($inputFolder, $userAccount, $inputFolder->absFolderPath)
            ->addGrant($sentFolder, $grant, FolderService::GRANT_ACTION_NONE)
            ->addGrant($sentFolder, $grant, ZimbraFolderService::GRANT_ACTION_NONE)
            ->createMountPoint($sentFolder, $userAccount, $sentFolder->absFolderPath);

        // Travail sur la boite utilisateur
+14 −14
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@
namespace UnicaenZimbraTest\Service;

use PHPUnit_Framework_TestCase;
use UnicaenZimbra\Service\Account;
use UnicaenZimbra\Entity\Account as AccountEntity;
use UnicaenZimbra\Entity\Account;
use UnicaenZimbra\Service\ZimbraAccountService;

/**
 * @group Account
@@ -13,7 +13,7 @@ class AccountTest extends PHPUnit_Framework_TestCase
{
    /**
     *
     * @var Account
     * @var ZimbraAccountService
     */
    protected $service;

@@ -28,12 +28,12 @@ class AccountTest extends PHPUnit_Framework_TestCase
    protected function setUp()
    {
        \UnicaenZimbraTest\Bootstrap::getServiceManager()->get('zimbra')->connect();
        $this->service = \UnicaenZimbraTest\Bootstrap::getServiceManager()->get('zimbraServiceAccount');
        $this->service = \UnicaenZimbraTest\Bootstrap::getServiceManager()->get(ZimbraAccountService::class);
    }

    public function testCreate()
    {
        $account = new AccountEntity;
        $account = new Account;
        $account->setName($this->data['name']);
        $properties = $this->data;
        unset($properties['name']);
@@ -66,13 +66,13 @@ class AccountTest extends PHPUnit_Framework_TestCase

        $this->assertArrayHasKey($id, $res);
        $this->assertEquals( $this->service->getLastCount(), count($res) );
        $this->assertInstanceOf('\UnicaenZimbra\Entity\Account', $res[$id]);
        $this->assertInstanceOf(Account::class, $res[$id]);
        $this->assertEquals($id, $res[$id]->getId());
    }

    /**
     * @depends testCreate
     * @return AccountEntity
     * @return Account
     */
    public function testGet( $id )
    {
@@ -80,7 +80,7 @@ class AccountTest extends PHPUnit_Framework_TestCase

        $resByName = $this->service->get( $res->getName() );

        $this->assertInstanceOf('\UnicaenZimbra\Entity\Account', $res);
        $this->assertInstanceOf(Account::class, $res);
        $this->assertEquals($id, $resByName->getId());
        $this->assertEquals($res, $resByName);

@@ -96,7 +96,7 @@ class AccountTest extends PHPUnit_Framework_TestCase
     * 
     * @depends testGet
     */
    public function testGetEmptyAlias( AccountEntity $account )
    public function testGetEmptyAlias( Account $account )
    {
        $alias = $account->getAlias();
        $alias2 = $this->service->getAlias($account);
@@ -108,7 +108,7 @@ class AccountTest extends PHPUnit_Framework_TestCase
    /**
     * @depends testGet
     */
    public function testAddAlias( AccountEntity $account )
    public function testAddAlias( Account $account )
    {
        $this->assertEquals( $this->service, $this->service->addAlias($account, 'alias.testunitaire@pp.unicaen.fr') );
        $alias = $this->service->getAlias($account->getId());
@@ -121,7 +121,7 @@ class AccountTest extends PHPUnit_Framework_TestCase
    /**
     * @depends testAddAlias
     */
    public function testGetOneAlias( AccountEntity $account )
    public function testGetOneAlias( Account $account )
    {
        $alias = $account->getAlias();
        $this->assertEquals(array('alias.testunitaire@pp.unicaen.fr'), $alias);
@@ -132,7 +132,7 @@ class AccountTest extends PHPUnit_Framework_TestCase
     * @depends testAddAlias
     * @param \UnicaenZimbra\Entity\Account $account
     */
    public function testRemoveAlias(AccountEntity $account )
    public function testRemoveAlias(Account $account )
    {
        $this->service->removeAlias($account, 'alias.testunitaire@pp.unicaen.fr');
        $alias = $this->service->getAlias($account->getId());
@@ -144,7 +144,7 @@ class AccountTest extends PHPUnit_Framework_TestCase
    /**
     * @depends testGet
     */
    public function testModify( AccountEntity $account )
    public function testModify( Account $account )
    {
        $account->givenName = 'Test 3';
        $this->service->modify($account);
@@ -161,7 +161,7 @@ class AccountTest extends PHPUnit_Framework_TestCase
        $this->assertArrayHasKey($id, $res);

        $account = $res[$id];
        $this->assertInstanceOf('\UnicaenZimbra\Entity\Account', $account);
        $this->assertInstanceOf(Account::class, $account);
    }

    /**
+6 −6
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@
namespace UnicaenZimbraTest\Service;

use PHPUnit_Framework_TestCase;
use UnicaenZimbra\Service\Alias;
use UnicaenZimbra\Entity\Alias as AliasEntity;
use UnicaenZimbra\Entity\Alias;
use UnicaenZimbra\Service\ZimbraAliasService;

/**
 * @group Alias
@@ -13,7 +13,7 @@ class AliasTest extends PHPUnit_Framework_TestCase
{
    /**
     *
     * @var Alias
     * @var ZimbraAliasService
     */
    protected $service;

@@ -25,7 +25,7 @@ class AliasTest extends PHPUnit_Framework_TestCase
    protected function setUp()
    {
        \UnicaenZimbraTest\Bootstrap::getServiceManager()->get('zimbra')->connect();
        $this->service = \UnicaenZimbraTest\Bootstrap::getServiceManager()->get('zimbraServiceAlias');
        $this->service = \UnicaenZimbraTest\Bootstrap::getServiceManager()->get(ZimbraAliasService::class);
    }

    public function testExists()
@@ -43,7 +43,7 @@ class AliasTest extends PHPUnit_Framework_TestCase

        $this->assertArrayHasKey($id, $res);
        $this->assertInternalType( 'integer', $this->service->getLastCount() );
        $this->assertInstanceOf('\UnicaenZimbra\Entity\Alias', $res[$id]);
        $this->assertInstanceOf(Alias::class, $res[$id]);
        $this->assertEquals($id, $res[$id]->getId());
        $this->assertEquals($name, $res[$id]->getName());
    }
@@ -54,7 +54,7 @@ class AliasTest extends PHPUnit_Framework_TestCase
        $name = $this->data['name'];
        
        $alias = $this->service->get( $name );
        $this->assertInstanceOf('\UnicaenZimbra\Entity\Alias', $alias);
        $this->assertInstanceOf(Alias::class, $alias);
        $this->assertEquals($id, $alias->getId());
        $this->assertEquals($name, $alias->getName());
    }
+6 −6
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@
namespace UnicaenZimbraTest\Service;

use PHPUnit_Framework_TestCase;
use UnicaenZimbra\Service\Cos;
use UnicaenZimbra\Entity\Cos as CosEntity;
use UnicaenZimbra\Entity\Cos;
use UnicaenZimbra\Service\ZimbraCosService;

/**
 * @group Cos
@@ -13,7 +13,7 @@ class CosTest extends PHPUnit_Framework_TestCase
{
    /**
     *
     * @var Cos
     * @var ZimbraCosService
     */
    protected $service;

@@ -25,7 +25,7 @@ class CosTest extends PHPUnit_Framework_TestCase
    protected function setUp()
    {
        \UnicaenZimbraTest\Bootstrap::getServiceManager()->get('zimbra')->connect();
        $this->service = \UnicaenZimbraTest\Bootstrap::getServiceManager()->get('zimbraServiceCos');
        $this->service = \UnicaenZimbraTest\Bootstrap::getServiceManager()->get(ZimbraCosService::class);
    }

    public function testExists()
@@ -41,13 +41,13 @@ class CosTest extends PHPUnit_Framework_TestCase
        $this->assertArrayHasKey($this->data['id'], $res);
        $cos = $res[$this->data['id']];
        $this->assertEquals($this->data['cn'], $cos->cn);
        $this->assertInstanceOf('\UnicaenZimbra\Entity\Cos', $cos);
        $this->assertInstanceOf(Cos::class, $cos);
    }

    public function testGet()
    {
        $cos = $this->service->get($this->data['cn']);
        $this->assertEquals($this->data['id'], $cos->getId());
        $this->assertInstanceOf('\UnicaenZimbra\Entity\Cos', $cos);
        $this->assertInstanceOf(Cos::class, $cos);
    }
}
 No newline at end of file
+18 −18
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@
namespace UnicaenZimbraTest\Service;

use PHPUnit_Framework_TestCase;
use UnicaenZimbra\Service\DistributionList;
use UnicaenZimbra\Entity\DistributionList as DistributionListEntity;
use UnicaenZimbra\Entity\Account as AccountEntity;
use UnicaenZimbra\Entity\Account;
use UnicaenZimbra\Entity\DistributionList;
use UnicaenZimbra\Service\ZimbraDistributionListService;

/**
 * @group DistributionList
@@ -14,7 +14,7 @@ class DistributionListTest extends PHPUnit_Framework_TestCase
{
    /**
     *
     * @var DistributionList
     * @var ZimbraDistributionListService
     */
    protected $service;

@@ -33,12 +33,12 @@ class DistributionListTest extends PHPUnit_Framework_TestCase
    protected function setUp()
    {
        \UnicaenZimbraTest\Bootstrap::getServiceManager()->get('zimbra')->connect();
        $this->service = \UnicaenZimbraTest\Bootstrap::getServiceManager()->get('zimbraServiceDistributionList');
        $this->service = \UnicaenZimbraTest\Bootstrap::getServiceManager()->get(ZimbraDistributionListService::class);
    }

    public function testCreate()
    {
        $dl = new DistributionListEntity;
        $dl = new DistributionList;
        $dl->setName($this->data['name']);
        $properties = $this->data;
        unset($properties['name']);
@@ -72,13 +72,13 @@ class DistributionListTest extends PHPUnit_Framework_TestCase

        $this->assertArrayHasKey($id, $res);
        $this->assertEquals( $this->service->getLastCount(), count($res) );
        $this->assertInstanceOf('\UnicaenZimbra\Entity\DistributionList', $res[$id]);
        $this->assertInstanceOf(DistributionList::class, $res[$id]);
        $this->assertEquals($id, $res[$id]->getId());
    }

    /**
     * @depends testCreate
     * @return DistributionListEntity
     * @return DistributionList
     */
    public function testGet( $id )
    {
@@ -86,7 +86,7 @@ class DistributionListTest extends PHPUnit_Framework_TestCase

        $resByName = $this->service->get( $res->getName() );

        $this->assertInstanceOf('\UnicaenZimbra\Entity\DistributionList', $res);
        $this->assertInstanceOf(DistributionList::class, $res);
        $this->assertEquals($id, $resByName->getId());
        $this->assertEquals($res, $resByName);

@@ -102,13 +102,13 @@ class DistributionListTest extends PHPUnit_Framework_TestCase
     * @depends testGet
     * @param \UnicaenZimbra\Entity\DistributionList $dl
     */
    public function testAddMembers( DistributionListEntity $dl )
    public function testAddMembers( DistributionList $dl )
    {
        $this->service->addMembers($dl, $this->listMembers[0]);
        $this->service->addMembers($dl, array($this->listMembers[1]) );
        $account1 = new AccountEntity;
        $account1 = new Account;
        $account1->setName($this->listMembers[2]);
        $account2 = new AccountEntity;
        $account2 = new Account;
        $account2->setName($this->listMembers[3]);

        $this->service->addMembers($dl, $account1);
@@ -120,7 +120,7 @@ class DistributionListTest extends PHPUnit_Framework_TestCase
     * @depends testAddMembers
     * @param \UnicaenZimbra\Entity\DistributionList $dl
     */
    public function testGetMembers( DistributionListEntity $dl )
    public function testGetMembers( DistributionList $dl )
    {
        $members = $this->service->getMembers($dl);
        /* Tri des deux tableaux pour les comparer */
@@ -134,10 +134,10 @@ class DistributionListTest extends PHPUnit_Framework_TestCase
     * @depends testAddMembers
     * @param \UnicaenZimbra\Entity\DistributionList $dl
     */
    public function testRemoveMembers( DistributionListEntity $dl )
    public function testRemoveMembers( DistributionList $dl )
    {
        $members = $this->listMembers;
        $account1 = new AccountEntity;
        $account1 = new Account;
        $account1->setName($this->listMembers[2]);
        $members[2] = $account1;

@@ -149,7 +149,7 @@ class DistributionListTest extends PHPUnit_Framework_TestCase
     * @depends testRemoveMembers
     * @param \UnicaenZimbra\Entity\DistributionList $dl
     */
    public function testGetNoMembers( DistributionListEntity $dl )
    public function testGetNoMembers( DistributionList $dl )
    {
        $members = $this->service->getMembers($dl);
        $this->assertEmpty($members);
@@ -159,7 +159,7 @@ class DistributionListTest extends PHPUnit_Framework_TestCase
    /**
     * @depends testGet
     */
    public function testModify(DistributionListEntity $dl )
    public function testModify(DistributionList $dl )
    {
        $dl->displayName = 'Test DL 3';
        $this->service->modify($dl);
@@ -186,6 +186,6 @@ class DistributionListTest extends PHPUnit_Framework_TestCase
    public function testDelete( $name )
    {
        $dl = $this->service->get( $name );
        $this->assertInstanceOf('\UnicaenZimbra\Service\DistributionList', $this->service->delete( $dl ));
        $this->assertInstanceOf(DistributionList::class, $this->service->delete( $dl ));
    }
}
 No newline at end of file
Loading