Revert "This class is not PHPUnit 4 compatible"

Works just fine, but requires PHPUnit_Story to be installed. This reverts commit 63ade4f.
horde · May 2, 2014 · a1a8739 · a1a8739
1 parent 190dc37
commit a1a8739
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/framework/Kolab_Config/test/Horde/Kolab/Config/ConfigStoryTestCase.php b/framework/Kolab_Config/test/Horde/Kolab/Config/ConfigStoryTestCase.php
@@ -28,8 +28,7 @@
  * @link       http://pear.horde.org/index.php?package=Kolab_Config
  */
 class Horde_Kolab_Config_ConfigStoryTestCase
-//extends PHPUnit_Extensions_Story_TestCase
-extends PHPUnit_Framework_TestCase
+extends PHPUnit_Extensions_Story_TestCase
 {
     /**
      * Handle a "given" step.
@@ -131,4 +130,4 @@ public function runThen(&$world, $action, $arguments)
         }
     }
 
-}
+}
diff --git a/framework/Kolab_Config/test/Horde/Kolab/Config/Integration/ConfigTest.php b/framework/Kolab_Config/test/Horde/Kolab/Config/Integration/ConfigTest.php
@@ -30,14 +30,6 @@
 class Horde_Kolab_Config_Integration_ConfigTest
 extends Horde_Kolab_Config_ConfigStoryTestCase
 {
-    /**
-     */
-    public function setUp()
-    {
-        // Horde_Kolab_Config_ConfigStoryTestCase doesn't work
-        $this->markTestSkipped();
-    }
-
     /**
      * @scenario
      */

diff --git a/framework/Kolab_Filter/test/Horde/Kolab/Filter/StoryTestCase.php b/framework/Kolab_Filter/test/Horde/Kolab/Filter/StoryTestCase.php
@@ -28,8 +28,7 @@
  * @link       http://pear.horde.org/index.php?package=Kolab_Filter
  */
 class Horde_Kolab_Filter_StoryTestCase
-//extends PHPUnit_Extensions_Story_TestCase
-extends PHPUnit_Framework_TestCase
+extends PHPUnit_Extensions_Story_TestCase
 {
     public function setUp()
     {
@@ -175,4 +174,4 @@ private function _cleanAndCompareOutput($received, $expected)
 
         $this->assertEquals($received, $expected);
     }
-}
+}
diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Integration/Scenario.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Integration/Scenario.php
@@ -25,9 +25,7 @@
  * @license  http://www.horde.org/licenses/lgpl21 LGPL 2.1
  * @link     http://pear.horde.org/index.php?package=Share
  */
-class Horde_Kolab_Server_Integration_Scenario
-//extends PHPUnit_Extensions_Story_TestCase
-extends PHPUnit_Framework_TestCase
+class Horde_Kolab_Server_Integration_Scenario extends PHPUnit_Extensions_Story_TestCase
 {
     /** The mock environment */
     const ENVIRONMENT_MOCK = 'mock';