From 56b3636d588103e2400aa957db2318d33329cb68 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Wed, 13 May 2009 09:06:42 +0200 Subject: [PATCH] Fix testing. --- .../Horde/Kolab/Server/KolabgermanbankarrangementTest.php | 10 +--------- .../test/Horde/Kolab/Server/Kolabpop3accountTest.php | 13 ++++++------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/KolabgermanbankarrangementTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/KolabgermanbankarrangementTest.php index 6f160e009..9fa22bc1d 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/KolabgermanbankarrangementTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/KolabgermanbankarrangementTest.php @@ -119,17 +119,9 @@ class Horde_Kolab_Server_KolabgermanbankarrangementTest extends Horde_Kolab_Test $account_data = $this->objects[1]; $account_data[Horde_Kolab_Server_Object_Kolabgermanbankarrangement::ATTRIBUTE_OWNERUID] = $person->getUid(); $account = $this->assertAdd($server, $account_data, - array(Horde_Kolab_Server_Object_Kolabgermanbankarrangement::ATTRIBUTE_OWNERUID => $person->getUid())); + array(Horde_Kolab_Server_Object_Kolabgermanbankarrangement::ATTRIBUTE_OWNERUID => $person->getUid())); $this->assertEasyAttributes($account, $server, array( - Horde_Kolab_Server_Object_Kolabgermanbankarrangement::ATTRIBUTE_BANKCODE => array( - '01234567890123456789', - '0', - '101', - null, - '', - array('101', '202'), - ), Horde_Kolab_Server_Object_Kolabgermanbankarrangement::ATTRIBUTE_HOLDER => array( 'something', 'somewhere', diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Kolabpop3accountTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Kolabpop3accountTest.php index 68e3db72f..74738b79c 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/Kolabpop3accountTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Kolabpop3accountTest.php @@ -48,9 +48,10 @@ class Horde_Kolab_Server_Kolabpop3accountTest extends Horde_Kolab_Test_Server /* Default account */ array( 'type' => 'Horde_Kolab_Server_Object_Kolabpop3account', - Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_SERVER => 'pop3.example.com', + Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_MAIL => 'frank@example.com', + Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_SERVER => 'pop.example.com', Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_LOGINNAME => 'frank', - Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_PASSWORD => ' must3r', + Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_PASSWORD => 'test', ), ); @@ -89,7 +90,7 @@ class Horde_Kolab_Server_Kolabpop3accountTest extends Horde_Kolab_Test_Server $account_data = $this->objects[1]; $account_data[Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_OWNERUID] = $person->getUid(); $a = new Horde_Kolab_Server_Object_Kolabpop3account($server, null, $account_data); - $this->assertContains(Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_CN . '=' . $this->objects[1][Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_LOGINNAME] . '@' . $this->objects[1][Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_SERVER], + $this->assertContains(Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_MAIL . '=' . $this->objects[1][Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_MAIL], $a->get(Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_UID)); } @@ -133,12 +134,10 @@ class Horde_Kolab_Server_Kolabpop3accountTest extends Horde_Kolab_Test_Server null, '', ), - Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_MAIL => array( + Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_SERVER => array( 'something', 'somewhere', - null, array('a', 'b'), - '', ), Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_PORT => array( '110', @@ -213,7 +212,7 @@ class Horde_Kolab_Server_Kolabpop3accountTest extends Horde_Kolab_Test_Server $this->assertEquals($account->get(Horde_Kolab_Server_Object_Kolabpop3account::ATTRIBUTE_SERVER), 'pop3s.example.com'); - $this->assertContains('pop3s.example.com', $account->getUid()); + $this->assertContains('frank@example.com', $account->getUid()); $result = $server->delete($account->getUid()); $this->assertNoError($result); -- 2.11.0