From 8dd6c787542a35772d874c9bebe40f9c85abf9b7 Mon Sep 17 00:00:00 2001 From: nate Date: Mon, 9 Jul 2007 17:33:03 +0000 Subject: [PATCH] Modifying HtmlHelper::style() for use in attribute arrays, adding core helper tests git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5429 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/view/helpers/html.php | 2 +- .../cases/libs/view/helpers/cache.test.php | 57 +++++++++++++++++++ .../cases/libs/view/helpers/html.test.php | 2 +- .../tests/cases/libs/view/helpers/js.test.php | 57 +++++++++++++++++++ .../cases/libs/view/helpers/rss.test.php | 57 +++++++++++++++++++ .../cases/libs/view/helpers/session.test.php | 57 +++++++++++++++++++ .../cases/libs/view/helpers/time.test.php | 57 +++++++++++++++++++ .../cases/libs/view/helpers/xml.test.php | 57 +++++++++++++++++++ 8 files changed, 344 insertions(+), 2 deletions(-) create mode 100644 cake/tests/cases/libs/view/helpers/cache.test.php create mode 100644 cake/tests/cases/libs/view/helpers/js.test.php create mode 100644 cake/tests/cases/libs/view/helpers/rss.test.php create mode 100644 cake/tests/cases/libs/view/helpers/session.test.php create mode 100644 cake/tests/cases/libs/view/helpers/time.test.php create mode 100644 cake/tests/cases/libs/view/helpers/xml.test.php diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php index c6ea54078..7c3ad55d4 100644 --- a/cake/libs/view/helpers/html.php +++ b/cake/libs/view/helpers/html.php @@ -343,7 +343,7 @@ class HtmlHelper extends AppHelper { $out[] = $key.':'.$value.';'; } if ($inline) { - return 'style="'.join(' ', $out).'"'; + return join(' ', $out); } return join("\n", $out); } diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/cake/tests/cases/libs/view/helpers/cache.test.php new file mode 100644 index 000000000..0e2f0c81d --- /dev/null +++ b/cake/tests/cases/libs/view/helpers/cache.test.php @@ -0,0 +1,57 @@ + + * Copyright 2005-2007, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2007, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + * @since CakePHP(tm) v 1.2.0.4206 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { + define('CAKEPHP_UNIT_TEST_EXECUTION', 1); +} + +require_once CAKE.'app_helper.php'; +uses('controller'.DS.'controller', 'model'.DS.'model', 'view'.DS.'helper', 'view'.DS.'helpers'.DS.'cache'); + +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + */ +class CacheTest extends UnitTestCase { + + function skip() { + $this->skipIf(true, 'CacheHelper test not implemented'); + } + + function setUp() { + $this->Cache = new CacheHelper(); + } + + function tearDown() { + unset($this->Cache); + } +} + +?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/cake/tests/cases/libs/view/helpers/html.test.php index 96b34d3d6..276703c49 100644 --- a/cake/tests/cases/libs/view/helpers/html.test.php +++ b/cake/tests/cases/libs/view/helpers/html.test.php @@ -65,7 +65,7 @@ class HtmlHelperTest extends UnitTestCase { function testStyle() { $result = $this->Html->style(array('display'=> 'none', 'margin'=>'10px')); - $expected = 'style="display:none; margin:10px;"'; + $expected = 'display:none; margin:10px;'; $this->assertEqual($expected, $result); $result = $this->Html->style(array('display'=> 'none', 'margin'=>'10px'), false); diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php new file mode 100644 index 000000000..557f24d03 --- /dev/null +++ b/cake/tests/cases/libs/view/helpers/js.test.php @@ -0,0 +1,57 @@ + + * Copyright 2005-2007, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2007, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + * @since CakePHP(tm) v 1.2.0.4206 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { + define('CAKEPHP_UNIT_TEST_EXECUTION', 1); +} + +require_once CAKE.'app_helper.php'; +uses('controller'.DS.'controller', 'model'.DS.'model', 'view'.DS.'helper', 'view'.DS.'helpers'.DS.'js'); + +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + */ +class JsTest extends UnitTestCase { + + function skip() { + $this->skipIf(true, 'JsHelper test not implemented'); + } + + function setUp() { + $this->Js = new JsHelper(); + } + + function tearDown() { + unset($this->Js); + } +} + +?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/cake/tests/cases/libs/view/helpers/rss.test.php new file mode 100644 index 000000000..7e4045488 --- /dev/null +++ b/cake/tests/cases/libs/view/helpers/rss.test.php @@ -0,0 +1,57 @@ + + * Copyright 2005-2007, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2007, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + * @since CakePHP(tm) v 1.2.0.4206 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { + define('CAKEPHP_UNIT_TEST_EXECUTION', 1); +} + +require_once CAKE.'app_helper.php'; +uses('controller'.DS.'controller', 'model'.DS.'model', 'view'.DS.'helper', 'view'.DS.'helpers'.DS.'rss'); + +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + */ +class RssTest extends UnitTestCase { + + function skip() { + $this->skipIf(true, 'RssHelper test not implemented'); + } + + function setUp() { + $this->Rss = new RssHelper(); + } + + function tearDown() { + unset($this->Rss); + } +} + +?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php new file mode 100644 index 000000000..b70bb55f6 --- /dev/null +++ b/cake/tests/cases/libs/view/helpers/session.test.php @@ -0,0 +1,57 @@ + + * Copyright 2005-2007, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2007, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + * @since CakePHP(tm) v 1.2.0.4206 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { + define('CAKEPHP_UNIT_TEST_EXECUTION', 1); +} + +require_once CAKE.'app_helper.php'; +uses('controller'.DS.'controller', 'model'.DS.'model', 'view'.DS.'helper', 'view'.DS.'helpers'.DS.'session'); + +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + */ +class SessionHelperTest extends UnitTestCase { + + function skip() { + $this->skipIf(true, 'SessionHelper test not implemented'); + } + + function setUp() { + $this->Session = new SessionHelper(); + } + + function tearDown() { + unset($this->Session); + } +} + +?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/cake/tests/cases/libs/view/helpers/time.test.php new file mode 100644 index 000000000..174827aeb --- /dev/null +++ b/cake/tests/cases/libs/view/helpers/time.test.php @@ -0,0 +1,57 @@ + + * Copyright 2005-2007, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2007, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + * @since CakePHP(tm) v 1.2.0.4206 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { + define('CAKEPHP_UNIT_TEST_EXECUTION', 1); +} + +require_once CAKE.'app_helper.php'; +uses('controller'.DS.'controller', 'model'.DS.'model', 'view'.DS.'helper', 'view'.DS.'helpers'.DS.'time'); + +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + */ +class TimeTest extends UnitTestCase { + + function skip() { + $this->skipIf(true, 'TimeHelper test not implemented'); + } + + function setUp() { + $this->Time = new TimeHelper(); + } + + function tearDown() { + unset($this->Time); + } +} + +?> \ No newline at end of file diff --git a/cake/tests/cases/libs/view/helpers/xml.test.php b/cake/tests/cases/libs/view/helpers/xml.test.php new file mode 100644 index 000000000..c01a2709d --- /dev/null +++ b/cake/tests/cases/libs/view/helpers/xml.test.php @@ -0,0 +1,57 @@ + + * Copyright 2005-2007, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2007, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + * @since CakePHP(tm) v 1.2.0.4206 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { + define('CAKEPHP_UNIT_TEST_EXECUTION', 1); +} + +require_once CAKE.'app_helper.php'; +uses('controller'.DS.'controller', 'model'.DS.'model', 'view'.DS.'helper', 'view'.DS.'helpers'.DS.'xml'); + +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.cases.libs.view.helpers + */ +class XmlHelperTest extends UnitTestCase { + + function skip() { + $this->skipIf(true, 'XmlHelper test not implemented'); + } + + function setUp() { + $this->Xml = new XmlHelper(); + } + + function tearDown() { + unset($this->Xml); + } +} + +?> \ No newline at end of file