From 2e3d96e442d4e2051d0d79e03f5e5878748443bf Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Thu, 11 Mar 2010 20:15:32 +0100
Subject: [PATCH] Allow running the tests on a very basic level.

---
 .../test/Horde/Kolab/Storage/FolderTest.php        | 28 ++++++++++++----------
 .../test/Horde/Kolab/Storage/PermsTest.php         |  3 ++-
 .../test/Horde/Kolab/Storage/phpunit.xml           |  8 +++++++
 3 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 framework/Kolab_Storage/test/Horde/Kolab/Storage/phpunit.xml

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
index b9392df3d..107b97207 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/FolderTest.php
@@ -37,17 +37,14 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function setUp()
     {
-        // No 'auth' in world, so this won't work yet. Skip it.
-        $this->markTestSkipped();
+        /* $world = $this->prepareBasicSetup(); */
 
-        $world = $this->prepareBasicSetup();
+        /* $this->storage = $this->authenticate($world['auth'], */
+        /*                  'wrobel@example.org', */
+        /*                  'none'); */
 
-        $this->storage = $this->authenticate($world['auth'],
-                         'wrobel@example.org',
-                         'none');
-
-        $this->prepareNewFolder($this->storage, 'Contacts', 'contact', true);
-        $this->prepareNewFolder($this->storage, 'NewContacts', 'contact');
+        /* $this->prepareNewFolder($this->storage, 'Contacts', 'contact', true); */
+        /* $this->prepareNewFolder($this->storage, 'NewContacts', 'contact'); */
     }
 
     /**
@@ -55,10 +52,10 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function tearDown()
     {
-        Horde_Imap_Client_Mock::clean();
-        if ($this->storage) {
-            $this->storage->clean();
-        }
+        /* Horde_Imap_Client_Mock::clean(); */
+        /* if ($this->storage) { */
+        /*     $this->storage->clean(); */
+        /* } */
     }
 
     /**
@@ -78,6 +75,7 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function testSetName()
     {
+        $GLOBALS['language'] = 'de_DE';
         $folder = new Horde_Kolab_Storage_Folder('INBOX/Contacts');
         $folder->setName('TestAÖÜ');
         $this->assertEquals(Horde_String::convertCharset('INBOX/TestAÖÜ', Horde_Nls::getCharset(), 'UTF7-IMAP'), $folder->new_name);
@@ -88,6 +86,7 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function testSave()
     {
+        $this->markTestIncomplete('Currently broken');
         $folder = $this->storage->getNewFolder();
 
         try {
@@ -169,6 +168,7 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function testGetImapFailNoServer()
     {
+        $this->markTestIncomplete('Currently broken');
         $session = Horde_Kolab_Session::singleton('anonymous', null, true);
         $imap = $session->getImapParams();
         $this->assertEquals('localhost', $imap['hostspec']);
@@ -179,6 +179,7 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function testTriggerOwn()
     {
+        $this->markTestIncomplete('Currently broken');
         $folder = $this->getMock('Horde_Kolab_Storage_Folder', array('triggerUrl'));
         $folder->expects($this->once())
             ->method('triggerUrl')
@@ -195,6 +196,7 @@ class Horde_Kolab_Storage_FolderTest extends Horde_Kolab_Storage_Scenario
      */
     public function testTriggerForeign()
     {
+        $this->markTestIncomplete('Currently broken');
         $folder = $this->getMock('Horde_Kolab_Storage_Folder', array('triggerUrl'));
         $folder->expects($this->exactly(2))
             ->method('triggerUrl')
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermsTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermsTest.php
index fd7586c86..a3e2d5c89 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermsTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermsTest.php
@@ -54,6 +54,7 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
      */
     public function testGetPerm()
     {
+        $this->markTestIncomplete('Currently broken');
         $GLOBALS['conf']['auth']['driver'] = 'auto';
         $GLOBALS['conf']['group']['driver'] = 'mock';
 
@@ -124,7 +125,7 @@ class Horde_Kolab_Storage_PermsTest extends PHPUnit_Framework_TestCase
         $GLOBALS['conf']['group']['driver'] = 'mock';
 
         $folder = new DummyFolder(array(), 'wrobel');
-        $hperms = new Horde_Permission('test');
+        $hperms = new Horde_Perms_Permission('test');
         $hperms->addUserPermission('wrobel', Horde_Perms::SHOW, false);
         $perms = new Horde_Kolab_Storage_Permission($folder, $hperms->data);
         $perms->save();
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/phpunit.xml b/framework/Kolab_Storage/test/Horde/Kolab/Storage/phpunit.xml
new file mode 100644
index 000000000..0148736fe
--- /dev/null
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">../../../../lib</directory>
+    </whitelist>
+  </filter>
+</phpunit>
-- 
2.11.0