From 1e28b6f25e1b6aef7044cb858f7c1a0183d768a2 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 9 Mar 2009 07:17:40 +0000 Subject: [PATCH] Adapt unit testing to the recent changes. --- framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php | 2 +- framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php index 5fb1e98c0..fa20330e2 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php @@ -730,7 +730,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase */ public function assertError($var, $msg = null) { - $this->assertEquals('Horde_Kolab_Server_Exception', get_class($var)); + $this->assertType('Horde_Kolab_Server_Exception', $var); if (isset($msg)) { $this->assertEquals($msg, $var->getMessage()); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php index a6d07a316..7d81c52d0 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php @@ -141,7 +141,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server } catch (Horde_Kolab_Server_Exception $classes) { } $this->assertError($classes, - 'LDAP Error: No such object: cn=DOES NOT EXIST,dc=example,dc=org: No such object'); + 'No such object: cn=DOES NOT EXIST,dc=example,dc=org'); $classes = $server->getObjectClasses('cn=The Administrator,dc=example,dc=org'); $this->assertNoError($classes); -- 2.11.0