Loading src/UnicaenZimbra/Entity/Filter/Filter.php +9 −4 Changes for src/UnicaenZimbra/Entity/Filter/Filter.php: 9 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -9,7 +9,7 @@ namespace UnicaenZimbra\Entity\Filter; use Test\Test; use UnicaenZimbra\Entity\Filter\Test\Test as FilterTest; use Action\Action; use UnicaenZimbra\Entity\Entity; use Exception; Loading Loading @@ -179,8 +179,13 @@ class Filter extends Entity */ public function populate( SimpleXMLElement $object ) { $this->setName( (string)$object->attributes()->name ); $this->setActive( (integer)$object->attributes()->active == 1 ); $this->setCondition( (string)$object->filterTests->attributes()->condition ); $this->id = (string)$object['name']; $this->setName( (string)$object['name'] ); $this->setActive( (integer)$object['active'] === 1 ); $this->setCondition( (string)$object->filterTests['condition'] ); $this->tests = array(); foreach( $object->filterTests->children() as $filterTestXml ){ $this->tests[] = FilterTest::factory($filterTestXml); } } } No newline at end of file src/UnicaenZimbra/Entity/Filter/Test/Header.php 0 → 100644 +120 −0 Changes for src/UnicaenZimbra/Entity/Filter/Test/Header.php: 120 added lines, 0 removed lines. Original line number Diff line number Diff line <?php /** * Test d'adresse pour filtre Zimbra * * @author Laurent LECLUSE <laurent.lecluse at unicaen.fr> * @license http://www.gnu.org/licenses/gpl.txt */ namespace UnicaenZimbra\Entity\Filter\Test; use SimpleXMLElement; class Header extends Test { /** * Adresse mail * * @var string */ protected $value; /** * Comparateur de chaîne (is, etc.) * * @var string */ protected $stringComparison; /** * Champ à tester * * @var string */ protected $header; /** * Retourne la valeur à tester * * @return string */ public function getValue() { return $this->value; } /** * Modifie la valeur à tester * * @param string $value * @return self */ public function setValue( $value ) { $this->value = $value; return $this; } /** * Retourne le critère de comparaison à tester * * @return string */ public function getStringComparison() { return $this->stringComparison; } /** * Modifie le critère de comparaison à tester * * @param string $stringComparison * @return self */ public function setStringComparison( $stringComparison ) { $this->stringComparison = $stringComparison; return $this; } /** * Retourne le nom du champ à tester * * @return string */ public function getHeader() { return $this->header; } /** * Modifie le nom du champ à tester * * @param string $value * @return self */ public function setHeader( $header ) { $this->header = $header; return $this; } /** * * @param SimpleXMLElement $node * @return self */ protected function populate( SimpleXMLElement $node ) { $this->setValue((string)$node['value']) ->setStringComparison((string)$node['stringComparison']) ->setHeader((string)$node['header']); return $this; } } No newline at end of file src/UnicaenZimbra/Entity/Filter/Test/Test.php +20 −1 Changes for src/UnicaenZimbra/Entity/Filter/Test/Test.php: 20 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -7,8 +7,27 @@ * @license http://www.gnu.org/licenses/gpl.txt */ namespace UnicaenZimbra\Entity\Filter; namespace UnicaenZimbra\Entity\Filter\Test; use SimpleXMLElement; use Exception; abstract class Test { public static function factory( SimpleXMLElement $node ) { $nodeName = $node->getName(); switch( $nodeName ){ case 'addressTest': $test = new Address; $test->populate( $node ); return $test; default: throw new Exception( 'Type de test de filtre "'.$nodeName.'" non pris en charge.'); } } abstract protected function populate( SimpleXMLElement $node ); } No newline at end of file tests/UnicaenZimbraTest/Service/FilterTest.php +3 −52 Changes for tests/UnicaenZimbraTest/Service/FilterTest.php: 3 added lines, 52 removed lines. Original line number Diff line number Diff line Loading @@ -87,65 +87,16 @@ class FilterTest extends \UnicaenZimbraTest\BaseServiceTest return $res;*/ } /** * * @depends testGet */ public function testGetEmptyAlias( AccountEntity $account ) { /* $alias = $account->getAlias(); $alias2 = $this->service->getAlias($account); $this->assertEquals( $alias, $alias2 ); $this->assertEquals(array(), $alias);*/ } /** * @depends testGet */ public function testAddAlias( AccountEntity $account ) { /* $this->assertEquals( $this->service, $this->service->addAlias($account, 'alias.testunitaire@pp.unicaen.fr') ); $alias = $this->service->getAlias($account->getId()); $aalias = $account->getAlias(); $this->assertEquals($alias, $aalias); $this->assertCount(1, $alias); return $account;*/ } /** * @depends testAddAlias */ public function testGetOneAlias( AccountEntity $account ) { /* $alias = $account->getAlias(); $this->assertEquals(array('alias.testunitaire@pp.unicaen.fr'), $alias);*/ } /** * * @depends testAddAlias * @param \UnicaenZimbra\Entity\Account $account */ public function testRemoveAlias(AccountEntity $account ) { /* $this->service->removeAlias($account, 'alias.testunitaire@pp.unicaen.fr'); $alias = $this->service->getAlias($account->getId()); $aalias = $account->getAlias(); $this->assertEquals($alias, $aalias); $this->assertCount(0, $alias);*/ } /** * @depends testGet */ public function testModify( AccountEntity $account ) { // public function testModify( FilterEntity $filter ) // { /* $account->givenName = 'Test 3'; $this->service->modify($account); $res = $this->service->get($this->data['name']); $this->assertEquals('Test 3', $res->givenName);*/ } // } /** * Loading tests/phpunit.xml +0 −5 Changes for tests/phpunit.xml: 0 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -20,10 +20,5 @@ </filter> <groups> <include> <group>test</group> </include> <exclude> </exclude> </groups> </phpunit> Loading
src/UnicaenZimbra/Entity/Filter/Filter.php +9 −4 Changes for src/UnicaenZimbra/Entity/Filter/Filter.php: 9 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -9,7 +9,7 @@ namespace UnicaenZimbra\Entity\Filter; use Test\Test; use UnicaenZimbra\Entity\Filter\Test\Test as FilterTest; use Action\Action; use UnicaenZimbra\Entity\Entity; use Exception; Loading Loading @@ -179,8 +179,13 @@ class Filter extends Entity */ public function populate( SimpleXMLElement $object ) { $this->setName( (string)$object->attributes()->name ); $this->setActive( (integer)$object->attributes()->active == 1 ); $this->setCondition( (string)$object->filterTests->attributes()->condition ); $this->id = (string)$object['name']; $this->setName( (string)$object['name'] ); $this->setActive( (integer)$object['active'] === 1 ); $this->setCondition( (string)$object->filterTests['condition'] ); $this->tests = array(); foreach( $object->filterTests->children() as $filterTestXml ){ $this->tests[] = FilterTest::factory($filterTestXml); } } } No newline at end of file
src/UnicaenZimbra/Entity/Filter/Test/Header.php 0 → 100644 +120 −0 Changes for src/UnicaenZimbra/Entity/Filter/Test/Header.php: 120 added lines, 0 removed lines. Original line number Diff line number Diff line <?php /** * Test d'adresse pour filtre Zimbra * * @author Laurent LECLUSE <laurent.lecluse at unicaen.fr> * @license http://www.gnu.org/licenses/gpl.txt */ namespace UnicaenZimbra\Entity\Filter\Test; use SimpleXMLElement; class Header extends Test { /** * Adresse mail * * @var string */ protected $value; /** * Comparateur de chaîne (is, etc.) * * @var string */ protected $stringComparison; /** * Champ à tester * * @var string */ protected $header; /** * Retourne la valeur à tester * * @return string */ public function getValue() { return $this->value; } /** * Modifie la valeur à tester * * @param string $value * @return self */ public function setValue( $value ) { $this->value = $value; return $this; } /** * Retourne le critère de comparaison à tester * * @return string */ public function getStringComparison() { return $this->stringComparison; } /** * Modifie le critère de comparaison à tester * * @param string $stringComparison * @return self */ public function setStringComparison( $stringComparison ) { $this->stringComparison = $stringComparison; return $this; } /** * Retourne le nom du champ à tester * * @return string */ public function getHeader() { return $this->header; } /** * Modifie le nom du champ à tester * * @param string $value * @return self */ public function setHeader( $header ) { $this->header = $header; return $this; } /** * * @param SimpleXMLElement $node * @return self */ protected function populate( SimpleXMLElement $node ) { $this->setValue((string)$node['value']) ->setStringComparison((string)$node['stringComparison']) ->setHeader((string)$node['header']); return $this; } } No newline at end of file
src/UnicaenZimbra/Entity/Filter/Test/Test.php +20 −1 Changes for src/UnicaenZimbra/Entity/Filter/Test/Test.php: 20 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -7,8 +7,27 @@ * @license http://www.gnu.org/licenses/gpl.txt */ namespace UnicaenZimbra\Entity\Filter; namespace UnicaenZimbra\Entity\Filter\Test; use SimpleXMLElement; use Exception; abstract class Test { public static function factory( SimpleXMLElement $node ) { $nodeName = $node->getName(); switch( $nodeName ){ case 'addressTest': $test = new Address; $test->populate( $node ); return $test; default: throw new Exception( 'Type de test de filtre "'.$nodeName.'" non pris en charge.'); } } abstract protected function populate( SimpleXMLElement $node ); } No newline at end of file
tests/UnicaenZimbraTest/Service/FilterTest.php +3 −52 Changes for tests/UnicaenZimbraTest/Service/FilterTest.php: 3 added lines, 52 removed lines. Original line number Diff line number Diff line Loading @@ -87,65 +87,16 @@ class FilterTest extends \UnicaenZimbraTest\BaseServiceTest return $res;*/ } /** * * @depends testGet */ public function testGetEmptyAlias( AccountEntity $account ) { /* $alias = $account->getAlias(); $alias2 = $this->service->getAlias($account); $this->assertEquals( $alias, $alias2 ); $this->assertEquals(array(), $alias);*/ } /** * @depends testGet */ public function testAddAlias( AccountEntity $account ) { /* $this->assertEquals( $this->service, $this->service->addAlias($account, 'alias.testunitaire@pp.unicaen.fr') ); $alias = $this->service->getAlias($account->getId()); $aalias = $account->getAlias(); $this->assertEquals($alias, $aalias); $this->assertCount(1, $alias); return $account;*/ } /** * @depends testAddAlias */ public function testGetOneAlias( AccountEntity $account ) { /* $alias = $account->getAlias(); $this->assertEquals(array('alias.testunitaire@pp.unicaen.fr'), $alias);*/ } /** * * @depends testAddAlias * @param \UnicaenZimbra\Entity\Account $account */ public function testRemoveAlias(AccountEntity $account ) { /* $this->service->removeAlias($account, 'alias.testunitaire@pp.unicaen.fr'); $alias = $this->service->getAlias($account->getId()); $aalias = $account->getAlias(); $this->assertEquals($alias, $aalias); $this->assertCount(0, $alias);*/ } /** * @depends testGet */ public function testModify( AccountEntity $account ) { // public function testModify( FilterEntity $filter ) // { /* $account->givenName = 'Test 3'; $this->service->modify($account); $res = $this->service->get($this->data['name']); $this->assertEquals('Test 3', $res->givenName);*/ } // } /** * Loading
tests/phpunit.xml +0 −5 Changes for tests/phpunit.xml: 0 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -20,10 +20,5 @@ </filter> <groups> <include> <group>test</group> </include> <exclude> </exclude> </groups> </phpunit>