Correct some class names to fix additional tests.

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Decorator/CleanTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Decorator/CleanTest.php
index eefda48..a43f3b6 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Decorator/CleanTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Decorator/CleanTest.php
@@ -86,16 +86,16 @@ class Horde_Kolab_Server_Class_Server_Decorator_CleanTest extends PHPUnit_Framew
 
     public function testMethodFindHasPostconditionThatTheCallWasDelegatedToTheServer()
     {
-        $result = $this->getMock('Horde_Kolab_Server_Result');
+        $result = $this->getMock('Horde_Kolab_Server_Result_Interface');
         $query = $this->getMock(
-            'Horde_Kolab_Server_Query_Element', array(), array(), '', false
+            'Horde_Kolab_Server_Query_Element_Interface', array(), array(), '', false
         );
         $this->server->expects($this->exactly(1))
             ->method('find')
             ->with($query)
             ->will($this->returnValue($result));
         $this->assertType(
-            'Horde_Kolab_Server_Result',
+            'Horde_Kolab_Server_Result_Interface',
             $this->cleaner->find($query)
         );
     }
@@ -104,7 +104,7 @@ class Horde_Kolab_Server_Class_Server_Decorator_CleanTest extends PHPUnit_Framew
     {
         $result = $this->getMock('Horde_Kolab_Server_Result_Interface');
         $query = $this->getMock(
-            'Horde_Kolab_Server_Query_Element', array(), array(), '', false
+            'Horde_Kolab_Server_Query_Element_Interface', array(), array(), '', false
         );
         $this->server->expects($this->exactly(1))
             ->method('findBelow')

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Decorator/LogTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Decorator/LogTest.php
index 1bd1496..64d6e38 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Decorator/LogTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Decorator/LogTest.php
@@ -89,7 +89,7 @@ class Horde_Kolab_Server_Class_Server_Decorator_LogTest extends PHPUnit_Framewor
 
     public function testMethodFindHasPostconditionThatTheCallWasDelegatedToTheServer()
     {
-        $result = $this->getMock('Horde_Kolab_Server_Result');
+        $result = $this->getMock('Horde_Kolab_Server_Result_Interface');
         $query = $this->getMock(
             'Horde_Kolab_Server_Query_Element', array(), array(), '', false
         );
@@ -98,14 +98,14 @@ class Horde_Kolab_Server_Class_Server_Decorator_LogTest extends PHPUnit_Framewor
             ->with($query)
             ->will($this->returnValue($result));
         $this->assertType(
-            'Horde_Kolab_Server_Result',
+            'Horde_Kolab_Server_Result_Interface',
             $this->logged->find($query)
         );
     }
 
     public function testMethodFindbelowHasPostconditionThatTheCallWasDelegatedToTheServer()
     {
-        $result = $this->getMock('Horde_Kolab_Server_Result');
+        $result = $this->getMock('Horde_Kolab_Server_Result_Interface');
         $query = $this->getMock(
             'Horde_Kolab_Server_Query_Element', array(), array(), '', false
         );

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Object/Attribute/ValueTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Object/Attribute/ValueTest.php
index bb55ad7..8744b23 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Object/Attribute/ValueTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Object/Attribute/ValueTest.php
@@ -35,14 +35,14 @@ extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
+        $this->markTestIncomplete('Needs to be fixed');
+
         $this->object = $this->getMock(
-            'Horde_Kolab_Server_Object', array(), array(), '', false
+            'Horde_Kolab_Server_Object_Base', array(), array(), '', false
         );
         $this->composite = $this->getMock(
             'Horde_Kolab_Server_Composite', array(), array(), '', false
         );
-
-        $this->markTestIncomplete('Needs to be fixed');
     }
 
     public function testMethodValueHasResultArrayTheValuesOfTheAttribute()