From c7c145e635982ad69645a883779f61d3fe04cd1b Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 30 Sep 2010 16:53:38 -0600 Subject: [PATCH] Convert Text_Flowed to using PHPUnit --- framework/Text_Flowed/package.xml | 11 +++- framework/Text_Flowed/test/Horde/Text/Flowed.phpt | 68 --------------------- .../test/Horde/Text/Flowed/AllTests.php | 38 ++++++++++++ .../test/Horde/Text/Flowed/Autoload.php | 28 +++++++++ .../test/Horde/Text/Flowed/FlowedTest.php | 69 ++++++++++++++++++++++ .../Text_Flowed/test/Horde/Text/Flowed/phpunit.xml | 8 +++ 6 files changed, 153 insertions(+), 69 deletions(-) delete mode 100644 framework/Text_Flowed/test/Horde/Text/Flowed.phpt create mode 100644 framework/Text_Flowed/test/Horde/Text/Flowed/AllTests.php create mode 100644 framework/Text_Flowed/test/Horde/Text/Flowed/Autoload.php create mode 100644 framework/Text_Flowed/test/Horde/Text/Flowed/FlowedTest.php create mode 100644 framework/Text_Flowed/test/Horde/Text/Flowed/phpunit.xml diff --git a/framework/Text_Flowed/package.xml b/framework/Text_Flowed/package.xml index 183876b62..48447b15f 100644 --- a/framework/Text_Flowed/package.xml +++ b/framework/Text_Flowed/package.xml @@ -33,7 +33,12 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + + + + + + @@ -63,6 +68,10 @@ http://pear.php.net/dtd/package-2.0.xsd"> + + + + diff --git a/framework/Text_Flowed/test/Horde/Text/Flowed.phpt b/framework/Text_Flowed/test/Horde/Text/Flowed.phpt deleted file mode 100644 index 9d350223c..000000000 --- a/framework/Text_Flowed/test/Horde/Text/Flowed.phpt +++ /dev/null @@ -1,68 +0,0 @@ ---TEST-- -Horde_Text_Flowed:: tests ---FILE-- - FLOWED]\n"; - -$flowed = new Horde_Text_Flowed("Hello, world!"); -echo $flowed->toFlowed() . "\n"; - -$flowed = new Horde_Text_Flowed("Hello, \nworld!"); -echo $flowed->toFlowed() . "\n"; - -$flowed = new Horde_Text_Flowed("Hello, \n world!"); -echo $flowed->toFlowed() . "\n"; - -$flowed = new Horde_Text_Flowed("From"); -echo $flowed->toFlowed() . "\n"; - -// See Bug #2969 -$flowed = new Horde_Text_Flowed(" >--------------------------------------------------------------------------------------------------------------------------------"); -echo $flowed->toFlowed() . "\n"; - -echo "[FLOWED -> FIXED]\n"; - -$flowed = new Horde_Text_Flowed(">line 1 \n>line 2 \n>line 3"); -echo $flowed->toFixed() . "\n\n"; -$flowed = new Horde_Text_Flowed(">line 1 \n>line 2 \n>line 3"); -echo $flowed->toFixed() . "\n\n"; - -// See Bug #4832 -$flowed = new Horde_Text_Flowed("line 1\n>from line 2\nline 3"); -echo $flowed->toFixed() . "\n\n"; -$flowed = new Horde_Text_Flowed("line 1\n From line 2\nline 3"); -echo $flowed->toFixed() . "\n"; - -?> ---EXPECT-- -[FIXED -> FLOWED] -Hello, world! - -Hello, -world! - -Hello, - world! - - From - - ->-------------------------------------------------------------------------------------------------------------------------------- - -[FLOWED -> FIXED] ->line 1 line 2 line 3 - ->line 1 line 2 line 3 - -line 1 ->from line 2 -line 3 - -line 1 -From line 2 -line 3 diff --git a/framework/Text_Flowed/test/Horde/Text/Flowed/AllTests.php b/framework/Text_Flowed/test/Horde/Text/Flowed/AllTests.php new file mode 100644 index 000000000..96ab06741 --- /dev/null +++ b/framework/Text_Flowed/test/Horde/Text/Flowed/AllTests.php @@ -0,0 +1,38 @@ + + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Text_Flowed + */ + +/** + * Define the main method + */ +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Horde_Text_Flowed_AllTests::main'); +} + +/** + * Prepare the test setup. + */ +require_once 'Horde/Test/AllTests.php'; + +/** + * @package Text_Flowed + * @subpackage UnitTests + */ +class Horde_Text_Flowed_AllTests extends Horde_Test_AllTests +{ +} + +Horde_Text_Flowed_AllTests::init('Horde_Text_Flowed', __FILE__); + +if (PHPUnit_MAIN_METHOD == 'Horde_Text_Flowed_AllTests::main') { + Horde_Text_Flowed_AllTests::main(); +} diff --git a/framework/Text_Flowed/test/Horde/Text/Flowed/Autoload.php b/framework/Text_Flowed/test/Horde/Text/Flowed/Autoload.php new file mode 100644 index 000000000..e2f60bb91 --- /dev/null +++ b/framework/Text_Flowed/test/Horde/Text/Flowed/Autoload.php @@ -0,0 +1,28 @@ + + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Text_Flowed + */ + +if (!spl_autoload_functions()) { + spl_autoload_register( + create_function( + '$class', + '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class);' + . '$err_mask = E_ALL ^ E_WARNING;' + . '$oldErrorReporting = error_reporting($err_mask);' + . 'include "$filename.php";' + . 'error_reporting($oldErrorReporting);' + ) + ); +} + +/** Catch strict standards */ +error_reporting(E_ALL | E_STRICT); diff --git a/framework/Text_Flowed/test/Horde/Text/Flowed/FlowedTest.php b/framework/Text_Flowed/test/Horde/Text/Flowed/FlowedTest.php new file mode 100644 index 000000000..d4e3e41d6 --- /dev/null +++ b/framework/Text_Flowed/test/Horde/Text/Flowed/FlowedTest.php @@ -0,0 +1,69 @@ + + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Text_Flowed + * @subpackage UnitTests + */ + +class Horde_Text_Flowed_FlowedTest extends PHPUnit_Framework_TestCase +{ + public function testFixedToFlowed() + { + $flowed = new Horde_Text_Flowed("Hello, world!"); + $this->assertEquals( + "Hello, world!\n", + $flowed->toFlowed() + ); + + $flowed = new Horde_Text_Flowed("Hello, \nworld!"); + $this->assertEquals( + "Hello,\nworld!\n", + $flowed->toFlowed() + ); + + $flowed = new Horde_Text_Flowed("Hello, \n world!"); + $this->assertEquals( + "Hello,\n world!\n", + $flowed->toFlowed() + ); + + $flowed = new Horde_Text_Flowed("From"); + $this->assertEquals( + " From\n", + $flowed->toFlowed() + ); + + // See Bug #2969 + $flowed = new Horde_Text_Flowed(" >--------------------------------------------------------------------------------------------------------------------------------"); + $this->assertEquals( + " \n>-------------------------------------------------------------------------------------------------------------------------------- \n", + $flowed->toFlowed() + ); + } + + public function testFlowedToFixed() + { + $flowed = new Horde_Text_Flowed(">line 1 \n>line 2 \n>line 3"); + $this->assertEquals( + ">line 1 line 2 line 3", + $flowed->toFixed() + ); + + // See Bug #4832 + $flowed = new Horde_Text_Flowed("line 1\n>from line 2\nline 3"); + $this->assertEquals( + "line 1\n>from line 2\nline 3", + $flowed->toFixed() + ); + + $flowed = new Horde_Text_Flowed("line 1\n From line 2\nline 3"); + $this->assertEquals( + "line 1\nFrom line 2\nline 3", + $flowed->toFixed() + ); + } +} diff --git a/framework/Text_Flowed/test/Horde/Text/Flowed/phpunit.xml b/framework/Text_Flowed/test/Horde/Text/Flowed/phpunit.xml new file mode 100644 index 000000000..0148736fe --- /dev/null +++ b/framework/Text_Flowed/test/Horde/Text/Flowed/phpunit.xml @@ -0,0 +1,8 @@ + + + + + ../../../../lib + + + -- 2.11.0