From ea249ca9c8542d3a465cb8abd6c6ed904c5dbc69 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 13 Apr 2009 22:57:39 +0200 Subject: [PATCH] Minor testing fixes. --- .../test/Horde/Kolab/Server/OrgPersonTest.php | 55 ++++++++++++++++++---- .../test/Horde/Kolab/Server/PersonTest.php | 2 +- .../test/Horde/Kolab/Server/ServerTest.php | 2 +- 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php index 51ddf248f..bc3f38899 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php @@ -102,19 +102,19 @@ class Horde_Kolab_Server_OrgPersonTest extends Horde_Kolab_Test_Server } /** - * Test handling a job title. + * Test handling simple attributes. * * @dataProvider provideServers * * @return NULL */ - public function testHandlingAJobTitle($server) + public function testSimpleAttributes($server) { $person = $this->assertAdd($server, $this->objects[0], array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_JOBTITLE => '')); - $this->assertSimpleSequence($person, $server, - Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_JOBTITLE, - array('Teacher', 'öäü/)(="§%$&§§$\'*', '', '0')); + $this->assertSimpleAttributes($person, $server, + array( + )); } /** @@ -142,15 +142,50 @@ class Horde_Kolab_Server_OrgPersonTest extends Horde_Kolab_Test_Server array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESSRAW => 'Kolab_Server_OrgPersonTest_123$c/o here$Street 1$12345 Nowhere')); $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTOFFICEBOX => 'öäü/)(="§%$&§§$\'*', - Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => ''), + Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => null), array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESSRAW => 'Kolab_Server_OrgPersonTest_123$c/o here$öäü/)(="§%\24&§§\24\'*$12345 Nowhere')); $this->assertStoreFetch($person, $server, - array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => '', - Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALCODE => '', + array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => null, + Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALCODE => null, + //FIXME: Why does this need a string? Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => '', - Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTOFFICEBOX => '', - Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_CITY => ''), + Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTOFFICEBOX => null, + Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_CITY => null), array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESSRAW => 'Kolab_Server_OrgPersonTest_123$$$ ')); } + + + /** + * Test handling easy attributes. + * + * @dataProvider provideServers + * + * @return NULL + */ + public function testEasyAttributes($server) + { + $person = $this->assertAdd($server, $this->objects[0], + array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_JOBTITLE => '')); + $this->assertEasyAttributes($person, $server, + array( + Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_JOBTITLE => array( + 'Teacher', + '0', + 'Something', + null, + '', + array('This', 'That'), + ), + Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_FAX => array( + '123456789', + '+1234567890', + array('1', '2'), + '0', + //FIXME: How to delete? + //null + ) + ) + ); + } } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php index 64cc4607e..c12e5a738 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php @@ -298,6 +298,6 @@ class Horde_Kolab_Server_PersonTest extends Horde_Kolab_Test_Server array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_TELNO => '')); $this->assertSimpleSequence($person, $server, Horde_Kolab_Server_Object_Person::ATTRIBUTE_TELNO, - array('123456789', '1234567890', '', '0')); + array('123456789', '+1234567890', array('1', '2'), null, '0'), true); } } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php index f20b84dc5..1e04b27bc 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php @@ -122,7 +122,7 @@ class Horde_Kolab_Server_None extends Horde_Kolab_Server */ public function read($uid, $attrs = null) { - throw new Horde_Kolab_Server_Exception('Not implemented!'); + return false; } /** -- 2.11.0