Fix testing.

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/KolabgermanbankarrangementTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/KolabgermanbankarrangementTest.php
index 9fa22bc..e987854 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/KolabgermanbankarrangementTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/KolabgermanbankarrangementTest.php
@@ -65,7 +65,7 @@ class Horde_Kolab_Server_KolabgermanbankarrangementTest extends Horde_Kolab_Test
          * We always use the test server
          */
         $servers[] = array($this->prepareEmptyKolabServer());
-        if (true) {
+        if (false) {
             $real = $this->prepareLdapKolabServer();
             if (!empty($real)) {
                 $servers[] = array($real);

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Kolabpop3accountTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Kolabpop3accountTest.php
index 74738b7..2a37185 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/Kolabpop3accountTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Kolabpop3accountTest.php
@@ -67,7 +67,7 @@ class Horde_Kolab_Server_Kolabpop3accountTest extends Horde_Kolab_Test_Server
          * We always use the test server
          */
         $servers[] = array($this->prepareEmptyKolabServer());
-        if (true) {
+        if (false) {
             $real = $this->prepareLdapKolabServer();
             if (!empty($real)) {
                 $servers[] = array($real);

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php
index c12e5a7..2fcf2b0 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/PersonTest.php
@@ -88,7 +88,6 @@ class Horde_Kolab_Server_PersonTest extends Horde_Kolab_Test_Server
             'type' => 'Horde_Kolab_Server_Object_Person',
             Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN           => 'Kolab_Server_PersonTest_123',
             Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN           => 'Kolab_Server_PersonTest_123',
-            Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX     => 'Kolab_Server_PersonTest_suffix',
             Horde_Kolab_Server_Object_Person::ATTRIBUTE_USERPASSWORD => 'Kolab_Server_PersonTest_123',
         ),
         /* Person for telephone number handling*/
@@ -96,7 +95,6 @@ class Horde_Kolab_Server_PersonTest extends Horde_Kolab_Test_Server
             'type' => 'Horde_Kolab_Server_Object_Person',
             Horde_Kolab_Server_Object_Person::ATTRIBUTE_CN           => 'Kolab_Server_PersonTest_123456',
             Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN           => 'Kolab_Server_PersonTest_123456',
-            Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX     => 'Kolab_Server_PersonTest_suffix',
             Horde_Kolab_Server_Object_Person::ATTRIBUTE_USERPASSWORD => 'Kolab_Server_PersonTest_123456',
         ),
     );
@@ -249,43 +247,6 @@ class Horde_Kolab_Server_PersonTest extends Horde_Kolab_Test_Server
     }
 
     /**
-     * Test a person with a name suffix.
-     *
-     * @dataProvider provideServers
-     *
-     * @return NULL
-     */
-    public function testHandlePersonWithSuffix($server)
-    {
-        $person = $this->assertAdd($server, $this->objects[6],
-                                   array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN => $this->objects[6][Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN],
-                                         Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX => $this->objects[6][Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX]));
-        $this->assertStoreFetch($person, $server,
-                                array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN => 'Kolab_Server_PersonTest_123$123',
-                                      Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX => 'Kolab_Server_PersonTest_123$123'),
-                                array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN => 'Kolab_Server_PersonTest_123$123',
-                                      Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX => 'Kolab_Server_PersonTest_123$123'));
-
-        $this->assertStoreFetch($person, $server,
-                                array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN => 'Kolab_Server_PersonTest_123$456',
-                                      Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX => ''),
-                                array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN => 'Kolab_Server_PersonTest_123$456',
-                                      Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX => ''));
-
-        $this->assertStoreFetch($person, $server,
-                                array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX => 'Kolab_Server_PersonTest_789'),
-                                array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN => 'Kolab_Server_PersonTest_123$456',
-                                      Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX => 'Kolab_Server_PersonTest_789'));
-
-        try {
-            $person->save(array(Horde_Kolab_Server_Object_Person::ATTRIBUTE_SN => '',
-                                Horde_Kolab_Server_Object_Person::ATTRIBUTE_SNSUFFIX => 'test'));
-        } catch (Horde_Kolab_Server_Exception $e) {
-            $this->assertError($e);
-        }
-    }
-
-    /**
      * Test handling a phone number.
      *
      * @dataProvider provideServers