Additional Kolab_Server test fixes.

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 64d6e38..318b932 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
@@ -91,7 +91,7 @@ class Horde_Kolab_Server_Class_Server_Decorator_LogTest extends PHPUnit_Framewor
     {
         $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')
@@ -107,14 +107,14 @@ class Horde_Kolab_Server_Class_Server_Decorator_LogTest extends PHPUnit_Framewor
     {
         $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')
             ->with($query, 'none')
             ->will($this->returnValue($result));
         $this->assertType(
-            'Horde_Kolab_Server_Result',
+            'Horde_Kolab_Server_Result_Interface',
             $this->logged->findBelow($query, 'none')
         );
     }

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConstructorTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConstructorTest.php
index 9ce80bd..10d4b5b 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConstructorTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConstructorTest.php
@@ -97,7 +97,7 @@ extends Horde_Kolab_Server_LdapTestCase
             ->method('getConnection')
             ->will(
                 $this->returnValue(
-                    $this->getMock('Horde_Kolab_Server_Connection')
+                    $this->getMock('Horde_Kolab_Server_Connection_Interface')
                 )
             );
         $factory = new Horde_Kolab_Server_Factory_Constructor(
@@ -105,7 +105,7 @@ extends Horde_Kolab_Server_LdapTestCase
             $this->search, $this->schema, array('basedn' => 'test')
         );
         $this->assertType(
-            'Horde_Kolab_Server_Connection',
+            'Horde_Kolab_Server_Connection_Interface',
             $factory->getConnection()
         );
     }

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 8744b23..3549e7c 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
@@ -38,7 +38,7 @@ extends PHPUnit_Framework_TestCase
         $this->markTestIncomplete('Needs to be fixed');
 
         $this->object = $this->getMock(
-            'Horde_Kolab_Server_Object_Base', array(), array(), '', false
+            'Horde_Kolab_Server_Object_Interface', array(), array(), '', false
         );
         $this->composite = $this->getMock(
             'Horde_Kolab_Server_Composite', array(), array(), '', false

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php
index 3ec2b9f..bde26fd 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php
@@ -47,14 +47,14 @@ class Horde_Kolab_Server_Class_Server_Structure_LdapTest extends Horde_Kolab_Ser
     public function testMethodFindHasResultServerResultTheSearchResult()
     {
         $this->skipIfNoLdap();
-        $result = $this->getMock('Horde_Kolab_Server_Result');
+        $result = $this->getMock('Horde_Kolab_Server_Result_Interface');
         $this->composite->server->expects($this->exactly(1))
             ->method('find')
             ->with('(objectClass=equals)', array())
             ->will($this->returnValue($result));
         $equals = new Horde_Kolab_Server_Query_Element_Equals('objectClass', 'equals');
         $this->assertType(
-            'Horde_Kolab_Server_Result',
+            'Horde_Kolab_Server_Result_Interface',
             $this->composite->structure->find($equals, array())
         );
     }
@@ -62,14 +62,14 @@ class Horde_Kolab_Server_Class_Server_Structure_LdapTest extends Horde_Kolab_Ser
     public function testMethodFindBelowHasResultServerResultTheSearchResult()
     {
         $this->skipIfNoLdap();
-        $result = $this->getMock('Horde_Kolab_Server_Result');
+        $result = $this->getMock('Horde_Kolab_Server_Result_Interface');
         $this->composite->server->expects($this->exactly(1))
             ->method('findBelow')
             ->with('(objectClass=equals)', 'base', array())
             ->will($this->returnValue($result));
         $equals = new Horde_Kolab_Server_Query_Element_Equals('objectClass', 'equals');
         $this->assertType(
-            'Horde_Kolab_Server_Result',
+            'Horde_Kolab_Server_Result_Interface',
             $this->composite->structure->findBelow($equals, 'base', array())
         );
     }