From 1c32a899a2854c23618a86b6cf7233b12dc6f627 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Tue, 21 Apr 2009 15:23:34 +0200 Subject: [PATCH] Recursive testing for a positive result. --- framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php index 9bec31b7b..2bd17245d 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php @@ -157,13 +157,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase if (!isset($world['result'])) { $this->fail('Did not receive a result!'); } - foreach ($world['result'] as $result) { - if ($result instanceOf Horde_Kolab_Server_Exception) { - $this->assertEquals('', $result->getMessage()); - } else { - $this->assertTrue($result); - } - } + $this->assertNoError($world['result']); break; case 'the result should indicate an error with': if (!isset($world['result'])) { @@ -769,7 +763,11 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase */ public function assertNoError($var) { - if ($var instanceOf Horde_Kolab_Server_Exception) { + if (is_array($var)) { + foreach ($var as $element) { + $this->assertNoError($element); + } + } elseif ($var instanceOf Exception) { $this->assertEquals('', $var->getMessage()); } else if ($var instanceOf PEAR_Error) { $this->assertEquals('', $var->getMessage()); -- 2.11.0