From 7af08fe2f91c3a1f9fa5330522485ff0b3b3d070 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Tue, 16 Jun 2009 15:13:44 +0200 Subject: [PATCH] Fix testing. --- .../lib/Horde/Kolab/Server/Object/Organizationalperson.php | 1 - .../test/Horde/Kolab/Server/InetorgpersonTest.php | 12 ++++++------ .../Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php | 11 +++++------ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php index e6564de3a..c66539b78 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php @@ -74,7 +74,6 @@ class Horde_Kolab_Server_Object_Organizationalperson extends Horde_Kolab_Server_ self::ATTRIBUTE_SN, self::ATTRIBUTE_STREET, self::ATTRIBUTE_POSTOFFICEBOX, - self::ATTRIBUTE_POSTALADDRESS, self::ATTRIBUTE_POSTALCODE, self::ATTRIBUTE_CITY, ), diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/InetorgpersonTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/InetorgpersonTest.php index 45f645a31..4797c75db 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/InetorgpersonTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/InetorgpersonTest.php @@ -173,16 +173,16 @@ class Horde_Kolab_Server_InetorgpersonTest extends Horde_Kolab_Test_Server $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => 'http://a.example.com', 'b' => 'http://b.example.com')), - array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => 'http://a.example.com', - 'b' => 'http://b.example.com'))); + array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => array('http://a.example.com'), + 'b' => array('http://b.example.com')))); $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => 'http://a.example.com', 'b' => 'http://b.example.com', 'c' => 'http://c.example.com')), - array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => 'http://a.example.com', - 'b' => 'http://b.example.com', - 'c' => 'http://c.example.com'))); + array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => array('http://a.example.com'), + 'b' => array('http://b.example.com'), + 'c' => array('http://c.example.com')))); $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array()), @@ -190,7 +190,7 @@ class Horde_Kolab_Server_InetorgpersonTest extends Horde_Kolab_Test_Server $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => 'http://a.example.com')), - array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => 'http://a.example.com'))); + array(Horde_Kolab_Server_Object_Inetorgperson::ATTRARRAY_LABELEDURI => array('a' => array('http://a.example.com')))); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php index bc3f38899..775d3a825 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php @@ -127,23 +127,22 @@ class Horde_Kolab_Server_OrgPersonTest extends Horde_Kolab_Test_Server public function testHandlingAPostalAddress($server) { $person = $this->assertAdd($server, $this->objects[0], - array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESSRAW => 'Kolab_Server_OrgPersonTest_123$$$ ')); + array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => 'Kolab_Server_OrgPersonTest_123$$$ ')); $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_SN => 'Kolab_Server_OrgPersonTest_456'), - array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESSRAW => 'Kolab_Server_OrgPersonTest_456$$$ ')); + array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_456$$$ '))); $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_SN => 'Kolab_Server_OrgPersonTest_123', Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => 'Street 1', Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALCODE => '12345', - Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => 'c/o here', Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_CITY => 'Nowhere'), - array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESSRAW => 'Kolab_Server_OrgPersonTest_123$c/o here$Street 1$12345 Nowhere')); + array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$$Street 1$12345 Nowhere'))); $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTOFFICEBOX => 'öäü/)(="§%$&§§$\'*', 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')); + array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$$öäü/)(="§%\24&§§\24\'*$12345 Nowhere'))); $this->assertStoreFetch($person, $server, array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => null, @@ -152,7 +151,7 @@ class Horde_Kolab_Server_OrgPersonTest extends Horde_Kolab_Test_Server Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => '', 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$$$ ')); + array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$$$ '))); } -- 2.11.0