From d3e2e4c1681c359640e12e111d28c15ef5553b07 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 21 Jan 2011 17:05:30 -0700 Subject: [PATCH] Convert horde/Template to PHPUnit tests --- framework/Template/package.xml | 71 +++++++------ .../Template/test/Horde/Template/AllTests.php | 38 +++++++ .../Template/test/Horde/Template/Autoload.php | 28 +++++ .../Template/test/Horde/Template/TemplateTest.php | 116 +++++++++++++++++++++ .../Template/test/Horde/Template/array_assoc.html | 1 - .../Template/test/Horde/Template/array_assoc.phpt | 17 --- .../Template/test/Horde/Template/array_if.html | 8 -- .../Template/test/Horde/Template/array_if.phpt | 22 ---- .../Template/test/Horde/Template/array_nested.html | 10 -- .../Template/test/Horde/Template/array_nested.phpt | 44 -------- .../Template/test/Horde/Template/array_simple.html | 6 -- .../Template/test/Horde/Template/array_simple.phpt | 24 ----- .../Template/test/Horde/Template/divider.phpt | 13 --- framework/Template/test/Horde/Template/if.html | 4 - framework/Template/test/Horde/Template/if.phpt | 22 ---- .../Template/test/Horde/Template/iterator.phpt | 21 ---- framework/Template/test/Horde/Template/scalar.html | 2 - framework/Template/test/Horde/Template/scalar.phpt | 19 ---- 18 files changed, 221 insertions(+), 245 deletions(-) create mode 100644 framework/Template/test/Horde/Template/AllTests.php create mode 100644 framework/Template/test/Horde/Template/Autoload.php create mode 100644 framework/Template/test/Horde/Template/TemplateTest.php delete mode 100644 framework/Template/test/Horde/Template/array_assoc.html delete mode 100644 framework/Template/test/Horde/Template/array_assoc.phpt delete mode 100644 framework/Template/test/Horde/Template/array_if.html delete mode 100644 framework/Template/test/Horde/Template/array_if.phpt delete mode 100644 framework/Template/test/Horde/Template/array_nested.html delete mode 100644 framework/Template/test/Horde/Template/array_nested.phpt delete mode 100644 framework/Template/test/Horde/Template/array_simple.html delete mode 100644 framework/Template/test/Horde/Template/array_simple.phpt delete mode 100644 framework/Template/test/Horde/Template/divider.phpt delete mode 100644 framework/Template/test/Horde/Template/if.html delete mode 100644 framework/Template/test/Horde/Template/if.phpt delete mode 100644 framework/Template/test/Horde/Template/iterator.phpt delete mode 100644 framework/Template/test/Horde/Template/scalar.html delete mode 100644 framework/Template/test/Horde/Template/scalar.phpt diff --git a/framework/Template/package.xml b/framework/Template/package.xml index f960795c9..b40a78fdf 100644 --- a/framework/Template/package.xml +++ b/framework/Template/package.xml @@ -1,13 +1,9 @@ - + Template pear.horde.org Horde Template System - Horde Template system. Adapted from bTemplate, by Brian Lozier <brian@massassi.net>. - + Horde Template system. Adapted from bTemplate, by Brian Lozier <brian@massassi.net>. Chuck Hagenbuch chuck @@ -20,7 +16,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> slusarz@horde.org yes - 2009-06-10 + 2011-01-24 + 0.1.0 0.1.0 @@ -30,11 +27,12 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Remove dependency on Horde_Core. + +* Remove dependency on Horde_Core. * Initial Horde 4 package. - + @@ -43,20 +41,9 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - - - - - - - - - + + + @@ -83,11 +70,29 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + + + + + + 0.0.1 + 0.0.1 + + + alpha + alpha + + 2003-07-05 + LGPL + +Initial release as a PEAR package + + + 2006-05-08 @@ -100,22 +105,24 @@ http://pear.php.net/dtd/package-2.0.xsd"> LGPL - - Converted to package.xml 2.0 for pear.horde.org - - Remove numeric array key constraint (Request #4413). +- Converted to package.xml 2.0 for pear.horde.org +- Remove numeric array key constraint (Request #4413). - 0.0.1 - 0.0.1 + 0.1.0 + 0.1.0 - alpha - alpha + beta + beta - 2003-07-05 + 2011-01-24 LGPL - Initial release as a PEAR package + +* Remove dependency on Horde_Core. + * Initial Horde 4 package. diff --git a/framework/Template/test/Horde/Template/AllTests.php b/framework/Template/test/Horde/Template/AllTests.php new file mode 100644 index 000000000..140d679ae --- /dev/null +++ b/framework/Template/test/Horde/Template/AllTests.php @@ -0,0 +1,38 @@ + + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Template + * @package Template + * @subpackage UnitTests + */ + +/** + * Define the main method + */ +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Horde_Template_AllTests::main'); +} + +/** + * Prepare the test setup. + */ +require_once 'Horde/Test/AllTests.php'; + +/** + * @category Horde + * @package Template + * @subpackage UnitTests + */ +class Horde_Template_AllTests extends Horde_Test_AllTests +{ +} + +Horde_Template_AllTests::init('Horde_Template', __FILE__); + +if (PHPUnit_MAIN_METHOD == 'Horde_Template_AllTests::main') { + Horde_Template_AllTests::main(); +} diff --git a/framework/Template/test/Horde/Template/Autoload.php b/framework/Template/test/Horde/Template/Autoload.php new file mode 100644 index 000000000..44516d30b --- /dev/null +++ b/framework/Template/test/Horde/Template/Autoload.php @@ -0,0 +1,28 @@ + + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Template + */ + +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/Template/test/Horde/Template/TemplateTest.php b/framework/Template/test/Horde/Template/TemplateTest.php new file mode 100644 index 000000000..24b8bdadd --- /dev/null +++ b/framework/Template/test/Horde/Template/TemplateTest.php @@ -0,0 +1,116 @@ + + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Template + * @subpackage UnitTests + */ + +class Horde_Template_TemplateTest extends PHPUnit_Framework_TestCase +{ + // Associative Array Test + public function testAssociativeArray() + { + $template = new Horde_Template(); + + $template->set('foo', array('one' => 'one', 'two' => 2)); + + $this->assertEquals( + 'one 2 ', + $template->parse(' ') + ); + } + + // If Array Test + public function testIfArray() + { + $template = new Horde_Template(); + + $template->set('foo', array('one', 'two', 'three'), true); + $template->set('bar', array(), true); + + $this->assertEquals( + "one two three \nelse", + $template->parse(" \nelse") + ); + } + + // Simple Array Test + public function testSimpleArray() + { + $template = new Horde_Template(); + + $template->set('string', array('one', 'two', 'three')); + $template->set('int', array(1, 2, 3)); + + $this->assertEquals( + "one two three \n1 2 3 ", + $template->parse(" \n ") + ); + } + + // Divider Test + public function testDivider() + { + $template = new Horde_Template(); + + $template->set('a', array('a', 'b', 'c', 'd')); + + $this->assertEquals( + 'a,b,c,d', + $template->parse(",") + ); + } + + // If/Else Test + public function testIfElse() + { + $template = new Horde_Template(); + + $template->set('foo', true, true); + $template->set('bar', false, true); + $template->set('baz', 'baz', true); + + $this->assertEquals( + "foo\n\nfalse\nbaz", + $template->parse("foo\nbar\ntruefalse\n") + ); + } + + // Iterator Test + public function testIterator() + { + $template = new Horde_Template(); + + $s = array('one', 'two', 'three'); + $i = array(1, 2, 3); + $a = array('one' => 'one', 'two' => 2); + + $template->set('s', $s); + $template->set('i', $i); + $template->set('a', $a); + + $this->assertEquals( + "one,two,three,\n1,2,3,\none,2,", + $template->parse(",\n,\n,,") + ); + } + + // Scalar Test + public function testScalar() + { + $template = new Horde_Template(); + + $template->set('one', 'one'); + $template->set('two', 2); + + $this->assertEquals( + "one\n2", + $template->parse("\n") + ); + } + +} diff --git a/framework/Template/test/Horde/Template/array_assoc.html b/framework/Template/test/Horde/Template/array_assoc.html deleted file mode 100644 index f3e92af66..000000000 --- a/framework/Template/test/Horde/Template/array_assoc.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/framework/Template/test/Horde/Template/array_assoc.phpt b/framework/Template/test/Horde/Template/array_assoc.phpt deleted file mode 100644 index 797b0cc31..000000000 --- a/framework/Template/test/Horde/Template/array_assoc.phpt +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -Associative Array Test ---FILE-- - dirname(__FILE__))); -$template->set('foo', array('one' => 'one', 'two' => 2)); -echo $template->fetch('/array_assoc.html'); - -?> ---EXPECT-- -one 2 diff --git a/framework/Template/test/Horde/Template/array_if.html b/framework/Template/test/Horde/Template/array_if.html deleted file mode 100644 index b54f0044b..000000000 --- a/framework/Template/test/Horde/Template/array_if.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - -else - diff --git a/framework/Template/test/Horde/Template/array_if.phpt b/framework/Template/test/Horde/Template/array_if.phpt deleted file mode 100644 index 23a4e6cbc..000000000 --- a/framework/Template/test/Horde/Template/array_if.phpt +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -If Array Test ---FILE-- - dirname(__FILE__))); -$template->set('foo', array('one', 'two', 'three'), true); -$template->set('bar', array(), true); -echo $template->fetch('/array_if.html'); - -?> ---EXPECT-- -one -two -three - -else diff --git a/framework/Template/test/Horde/Template/array_nested.html b/framework/Template/test/Horde/Template/array_nested.html deleted file mode 100644 index 7401e4847..000000000 --- a/framework/Template/test/Horde/Template/array_nested.html +++ /dev/null @@ -1,10 +0,0 @@ - -> - /> -> - - - - - - diff --git a/framework/Template/test/Horde/Template/array_nested.phpt b/framework/Template/test/Horde/Template/array_nested.phpt deleted file mode 100644 index a22e8c3b0..000000000 --- a/framework/Template/test/Horde/Template/array_nested.phpt +++ /dev/null @@ -1,44 +0,0 @@ ---TEST-- -Nested Array Test ---FILE-- - dirname(__FILE__))); -$categories = array('fruit', 'veggie', 'thing'); -$subcats = array('fruit' => array('apple', 'pear'), - 'veggie' => array('tomato', 'potato', 'carrot', 'onion'), - 'thing' => array('spoon', 'paperbag', 'tool')); -$template->set('categories', $categories); -foreach ($categories as $c) { - $template->set('subcat_' . $c, $subcats[$c]); -} -$template->set('keyed', array('widgets' => array( - 'key1' => 'zipit', - 'key2' => 'twisty', - 'key3' => 'doowhopper' -))); -echo $template->fetch('/array_nested.html'); - -?> ---EXPECT-- -fruit - apple - pear -veggie - tomato - potato - carrot - onion -thing - spoon - paperbag - tool -widgets - zipit - twisty - doowhopper diff --git a/framework/Template/test/Horde/Template/array_simple.html b/framework/Template/test/Horde/Template/array_simple.html deleted file mode 100644 index c3c3e63ef..000000000 --- a/framework/Template/test/Horde/Template/array_simple.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/framework/Template/test/Horde/Template/array_simple.phpt b/framework/Template/test/Horde/Template/array_simple.phpt deleted file mode 100644 index 5bbd970a1..000000000 --- a/framework/Template/test/Horde/Template/array_simple.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -Simple Array Test ---FILE-- - dirname(__FILE__))); -$template->set('string', array('one', 'two', 'three')); -$template->set('int', array(1, 2, 3)); -echo $template->fetch('/array_simple.html'); - -?> ---EXPECT-- -one -two -three - -1 -2 -3 diff --git a/framework/Template/test/Horde/Template/divider.phpt b/framework/Template/test/Horde/Template/divider.phpt deleted file mode 100644 index a01c0c4d4..000000000 --- a/framework/Template/test/Horde/Template/divider.phpt +++ /dev/null @@ -1,13 +0,0 @@ ---TEST-- -Divider Test ---FILE-- -set('a', array('a', 'b', 'c', 'd')); -echo $template->parse(","); - -?> ---EXPECT-- -a,b,c,d diff --git a/framework/Template/test/Horde/Template/if.html b/framework/Template/test/Horde/Template/if.html deleted file mode 100644 index 853d01f3d..000000000 --- a/framework/Template/test/Horde/Template/if.html +++ /dev/null @@ -1,4 +0,0 @@ -foo -bar -truefalsevoid - diff --git a/framework/Template/test/Horde/Template/if.phpt b/framework/Template/test/Horde/Template/if.phpt deleted file mode 100644 index 56e5b5484..000000000 --- a/framework/Template/test/Horde/Template/if.phpt +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -If/Else Test ---FILE-- - dirname(__FILE__))); -$template->set('foo', true, true); -$template->set('bar', false, true); -$template->set('baz', 'baz', true); -echo $template->fetch('/if.html'); - -?> ---EXPECT-- -foo - -false -baz diff --git a/framework/Template/test/Horde/Template/iterator.phpt b/framework/Template/test/Horde/Template/iterator.phpt deleted file mode 100644 index 25d6ad57c..000000000 --- a/framework/Template/test/Horde/Template/iterator.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -Iterator Test ---FILE-- - 'one', 'two' => 2)); - -require dirname(__FILE__) . '/../../../lib/Horde/Template.php'; -$template = new Horde_Template(array('basepath' => dirname(__FILE__))); -$template->set('s', $s); -$template->set('i', $i); -$template->set('a', $a); -echo $template->parse(",\n,\n,,"); - -?> ---EXPECT-- -one,two,three, -1,2,3, -one,2, diff --git a/framework/Template/test/Horde/Template/scalar.html b/framework/Template/test/Horde/Template/scalar.html deleted file mode 100644 index 439cfcb79..000000000 --- a/framework/Template/test/Horde/Template/scalar.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/framework/Template/test/Horde/Template/scalar.phpt b/framework/Template/test/Horde/Template/scalar.phpt deleted file mode 100644 index 83989f333..000000000 --- a/framework/Template/test/Horde/Template/scalar.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -Scalar Test ---FILE-- - dirname(__FILE__))); -$template->set('one', 'one'); -$template->set('two', 2); -echo $template->fetch('/scalar.html'); - -?> ---EXPECT-- -one -2 -- 2.11.0