From: Chuck Hagenbuch Date: Sat, 30 May 2009 15:32:48 +0000 (-0400) Subject: use addHelper('string') syntax; test helpers through the views X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=709383c31c0ed0ac62d9b0db0f5610153a259726;p=horde.git use addHelper('string') syntax; test helpers through the views --- diff --git a/framework/View/test/Horde/View/Helper/FormTest.php b/framework/View/test/Horde/View/Helper/FormTest.php index 163ec790e..7e5ccdd36 100644 --- a/framework/View/test/Horde/View/Helper/FormTest.php +++ b/framework/View/test/Horde/View/Helper/FormTest.php @@ -27,9 +27,9 @@ class Horde_View_Helper_FormTest extends Horde_Test_Case public function setUp() { $this->view = new Horde_View(); - $this->view->addHelper(new Horde_View_Helper_Form($this->view)); - $this->view->addHelper(new Horde_View_Helper_FormTag($this->view)); - $this->view->addHelper(new Horde_View_Helper_Tag($this->view)); + $this->view->addHelper('Form'); + $this->view->addHelper('FormTag'); + $this->view->addHelper('Tag'); $this->view->addHelper(new Horde_View_Helper_FormTest_MockUrlHelper($this->view)); $this->post = (object)array('title', 'authorName', 'body', diff --git a/framework/View/test/Horde/View/Helper/JavascriptTest.php b/framework/View/test/Horde/View/Helper/JavascriptTest.php index a7e99d44f..600368092 100644 --- a/framework/View/test/Horde/View/Helper/JavascriptTest.php +++ b/framework/View/test/Horde/View/Helper/JavascriptTest.php @@ -27,8 +27,8 @@ class Horde_View_Helper_JavascriptTest extends Horde_Test_Case public function setUp() { $this->view = new Horde_View(); - $this->view->addHelper(new Horde_View_Helper_Tag($this->view)); - $this->view->addHelper(new Horde_View_Helper_Javascript($this->view)); + $this->view->addHelper('Javascript'); + $this->view->addHelper('Tag'); } public function testJavascriptTag() diff --git a/framework/View/test/Horde/View/Helper/TagTest.php b/framework/View/test/Horde/View/Helper/TagTest.php index 61ca02f69..098f44e00 100644 --- a/framework/View/test/Horde/View/Helper/TagTest.php +++ b/framework/View/test/Horde/View/Helper/TagTest.php @@ -26,59 +26,60 @@ class Horde_View_Helper_TagTest extends Horde_Test_Case { public function setUp() { - $this->helper = new Horde_View_Helper_Tag(new Horde_View()); + $this->view = new Horde_View(); + $this->view->addHelper('Tag'); } public function testTag() { - $this->assertEquals('
', $this->helper->tag('br')); + $this->assertEquals('
', $this->view->tag('br')); $this->assertEquals('
', - $this->helper->tag('br', array('clear' => 'left'))); + $this->view->tag('br', array('clear' => 'left'))); $this->assertEquals('
', - $this->helper->tag('br', null, true)); + $this->view->tag('br', null, true)); } public function testTagOptions() { $this->assertRegExp('/\A

\z/', - $this->helper->tag('p', array('class' => 'show', - 'class' => 'elsewhere'))); + $this->view->tag('p', array('class' => 'show', + 'class' => 'elsewhere'))); } public function testTagOptionsRejectsNullOption() { $this->assertEquals('

', - $this->helper->tag('p', array('ignored' => null))); + $this->view->tag('p', array('ignored' => null))); } public function testTagOptionsAcceptsBlankOption() { $this->assertEquals('

', - $this->helper->tag('p', array('included' => ''))); + $this->view->tag('p', array('included' => ''))); } public function testTagOptionsConvertsBooleanOption() { $this->assertEquals('

', - $this->helper->tag('p', array('disabled' => true, - 'multiple' => true, - 'readonly' => true))); + $this->view->tag('p', array('disabled' => true, + 'multiple' => true, + 'readonly' => true))); } public function testContentTag() { $this->assertEquals('Create', - $this->helper->contentTag('a', 'Create', array('href' => 'create'))); + $this->view->contentTag('a', 'Create', array('href' => 'create'))); } public function testCdataSection() { - $this->assertEquals(']]>', $this->helper->cdataSection('')); + $this->assertEquals(']]>', $this->view->cdataSection('')); } public function testEscapeOnce() { - $this->assertEquals('1 < 2 & 3', $this->helper->escapeOnce('1 < 2 & 3')); + $this->assertEquals('1 < 2 & 3', $this->view->escapeOnce('1 < 2 & 3')); } public function testDoubleEscapingAttributes() @@ -86,7 +87,7 @@ class Horde_View_Helper_TagTest extends Horde_Test_Case $attributes = array('1&2', '1 < 2', '“test“'); foreach ($attributes as $escaped) { $this->assertEquals("", - $this->helper->tag('a', array('href' => $escaped))); + $this->view->tag('a', array('href' => $escaped))); } } @@ -95,7 +96,7 @@ class Horde_View_Helper_TagTest extends Horde_Test_Case $attributes = array('&1;', 'dfa3;', '& #123;'); foreach ($attributes as $escaped) { $this->assertEquals('', - $this->helper->tag('a', array('href' => $escaped))); + $this->view->tag('a', array('href' => $escaped))); } } diff --git a/framework/View/test/Horde/View/Helper/TextTest.php b/framework/View/test/Horde/View/Helper/TextTest.php index 215fad13c..5af98fdbe 100644 --- a/framework/View/test/Horde/View/Helper/TextTest.php +++ b/framework/View/test/Horde/View/Helper/TextTest.php @@ -26,7 +26,8 @@ class Horde_View_Helper_TextTest extends Horde_Test_Case { public function setUp() { - $this->helper = new Horde_View_Helper_Text(new Horde_View()); + $this->view = new Horde_View(); + $this->view->addHelper('Text'); } // test escaping data @@ -34,7 +35,7 @@ class Horde_View_Helper_TextTest extends Horde_Test_Case { $text = "Test 'escaping html' \"quotes\" and & amps"; $expected = "Test 'escaping html' "quotes" and & amps"; - $this->assertEquals($expected, $this->helper->h($text)); + $this->assertEquals($expected, $this->view->h($text)); } // test truncate @@ -42,7 +43,7 @@ class Horde_View_Helper_TextTest extends Horde_Test_Case { $str = 'The quick brown fox jumps over the lazy dog tomorrow morning.'; $expected = 'The quick brown fox jumps over the la...'; - $this->assertEquals($expected, $this->helper->truncate($str, 40)); + $this->assertEquals($expected, $this->view->truncate($str, 40)); } // test truncate @@ -50,7 +51,7 @@ class Horde_View_Helper_TextTest extends Horde_Test_Case { $str = 'The quick brown fox jumps over the lazy dog tomorrow morning.'; $expected = 'The quick brown fox... tomorrow morning.'; - $this->assertEquals($expected, $this->helper->truncateMiddle($str, 40)); + $this->assertEquals($expected, $this->view->truncateMiddle($str, 40)); } // text too short to trucate @@ -58,7 +59,7 @@ class Horde_View_Helper_TextTest extends Horde_Test_Case { $str = 'The quick brown fox jumps over the dog.'; $expected = 'The quick brown fox jumps over the dog.'; - $this->assertEquals($expected, $this->helper->truncateMiddle($str, 40)); + $this->assertEquals($expected, $this->view->truncateMiddle($str, 40)); } @@ -67,7 +68,7 @@ class Horde_View_Helper_TextTest extends Horde_Test_Case { $str = 'The quick brown fox jumps over the dog.'; $expected = 'The quick brown fox jumps over the dog.'; - $this->assertEquals($expected, $this->helper->highlight($str, 'brown')); + $this->assertEquals($expected, $this->view->highlight($str, 'brown')); } // test failure to highlight @@ -75,14 +76,14 @@ class Horde_View_Helper_TextTest extends Horde_Test_Case { $str = 'The quick brown fox jumps over the dog.'; $expected = 'The quick brown fox jumps over the dog.'; - $this->assertEquals($expected, $this->helper->highlight($str, 'brown', '$1')); + $this->assertEquals($expected, $this->view->highlight($str, 'brown', '$1')); } // test failure to highlight public function testHighlightNoMatch() { $str = 'The quick brown fox jumps over the dog.'; - $this->assertEquals($str, $this->helper->highlight($str, 'black')); + $this->assertEquals($str, $this->view->highlight($str, 'black')); } public function testCycleClass() @@ -119,64 +120,64 @@ class Horde_View_Helper_TextTest extends Horde_Test_Case public function testCycleResetsWithNewValues() { - $this->assertEquals('even', (string)$this->helper->cycle('even', 'odd')); - $this->assertEquals('odd', (string)$this->helper->cycle('even', 'odd')); - $this->assertEquals('even', (string)$this->helper->cycle('even', 'odd')); - $this->assertEquals('1', (string)$this->helper->cycle(1, 2, 3)); - $this->assertEquals('2', (string)$this->helper->cycle(1, 2, 3)); - $this->assertEquals('3', (string)$this->helper->cycle(1, 2, 3)); + $this->assertEquals('even', (string)$this->view->cycle('even', 'odd')); + $this->assertEquals('odd', (string)$this->view->cycle('even', 'odd')); + $this->assertEquals('even', (string)$this->view->cycle('even', 'odd')); + $this->assertEquals('1', (string)$this->view->cycle(1, 2, 3)); + $this->assertEquals('2', (string)$this->view->cycle(1, 2, 3)); + $this->assertEquals('3', (string)$this->view->cycle(1, 2, 3)); } public function testNamedCycles() { - $this->assertEquals('1', (string)$this->helper->cycle(1, 2, 3, array('name' => 'numbers'))); - $this->assertEquals('red', (string)$this->helper->cycle('red', 'blue', array('name' => 'colors'))); - $this->assertEquals('2', (string)$this->helper->cycle(1, 2, 3, array('name' => 'numbers'))); - $this->assertEquals('blue', (string)$this->helper->cycle('red', 'blue', array('name' => 'colors'))); - $this->assertEquals('3', (string)$this->helper->cycle(1, 2, 3, array('name' => 'numbers'))); - $this->assertEquals('red', (string)$this->helper->cycle('red', 'blue', array('name' => 'colors'))); + $this->assertEquals('1', (string)$this->view->cycle(1, 2, 3, array('name' => 'numbers'))); + $this->assertEquals('red', (string)$this->view->cycle('red', 'blue', array('name' => 'colors'))); + $this->assertEquals('2', (string)$this->view->cycle(1, 2, 3, array('name' => 'numbers'))); + $this->assertEquals('blue', (string)$this->view->cycle('red', 'blue', array('name' => 'colors'))); + $this->assertEquals('3', (string)$this->view->cycle(1, 2, 3, array('name' => 'numbers'))); + $this->assertEquals('red', (string)$this->view->cycle('red', 'blue', array('name' => 'colors'))); } public function testDefaultNamedCycle() { - $this->assertEquals('1', (string)$this->helper->cycle(1, 2, 3)); - $this->assertEquals('2', (string)$this->helper->cycle(1, 2, 3, array('name' => 'default'))); - $this->assertEquals('3', (string)$this->helper->cycle(1, 2, 3)); + $this->assertEquals('1', (string)$this->view->cycle(1, 2, 3)); + $this->assertEquals('2', (string)$this->view->cycle(1, 2, 3, array('name' => 'default'))); + $this->assertEquals('3', (string)$this->view->cycle(1, 2, 3)); } public function testResetCycle() { - $this->assertEquals('1', (string)$this->helper->cycle(1, 2, 3)); - $this->assertEquals('2', (string)$this->helper->cycle(1, 2, 3)); - $this->helper->resetCycle(); - $this->assertEquals('1', (string)$this->helper->cycle(1, 2, 3)); + $this->assertEquals('1', (string)$this->view->cycle(1, 2, 3)); + $this->assertEquals('2', (string)$this->view->cycle(1, 2, 3)); + $this->view->resetCycle(); + $this->assertEquals('1', (string)$this->view->cycle(1, 2, 3)); } public function testResetUnknownCycle() { - $this->helper->resetCycle('colors'); + $this->view->resetCycle('colors'); } public function testResetNamedCycle() { - $this->assertEquals('1', (string)$this->helper->cycle(1, 2, 3, array('name' => 'numbers'))); - $this->assertEquals('red', (string)$this->helper->cycle('red', 'blue', array('name' => 'colors'))); - $this->helper->resetCycle('numbers'); - $this->assertEquals('1', (string)$this->helper->cycle(1, 2, 3, array('name' => 'numbers'))); - $this->assertEquals('blue', (string)$this->helper->cycle('red', 'blue', array('name' => 'colors'))); - $this->assertEquals('2', (string)$this->helper->cycle(1, 2, 3, array('name' => 'numbers'))); - $this->assertEquals('red', (string)$this->helper->cycle('red', 'blue', array('name' => 'colors'))); + $this->assertEquals('1', (string)$this->view->cycle(1, 2, 3, array('name' => 'numbers'))); + $this->assertEquals('red', (string)$this->view->cycle('red', 'blue', array('name' => 'colors'))); + $this->view->resetCycle('numbers'); + $this->assertEquals('1', (string)$this->view->cycle(1, 2, 3, array('name' => 'numbers'))); + $this->assertEquals('blue', (string)$this->view->cycle('red', 'blue', array('name' => 'colors'))); + $this->assertEquals('2', (string)$this->view->cycle(1, 2, 3, array('name' => 'numbers'))); + $this->assertEquals('red', (string)$this->view->cycle('red', 'blue', array('name' => 'colors'))); } public function testPluralization() { - $this->assertEquals('1 count', $this->helper->pluralize(1, 'count')); - $this->assertEquals('2 counts', $this->helper->pluralize(2, 'count')); - $this->assertEquals('1 count', $this->helper->pluralize('1', 'count')); - $this->assertEquals('2 counts', $this->helper->pluralize('2', 'count')); - $this->assertEquals('1,066 counts', $this->helper->pluralize('1,066', 'count')); - $this->assertEquals('1.25 counts', $this->helper->pluralize('1.25', 'count')); - $this->assertEquals('2 counters', $this->helper->pluralize('2', 'count', 'counters')); + $this->assertEquals('1 count', $this->view->pluralize(1, 'count')); + $this->assertEquals('2 counts', $this->view->pluralize(2, 'count')); + $this->assertEquals('1 count', $this->view->pluralize('1', 'count')); + $this->assertEquals('2 counts', $this->view->pluralize('2', 'count')); + $this->assertEquals('1,066 counts', $this->view->pluralize('1,066', 'count')); + $this->assertEquals('1.25 counts', $this->view->pluralize('1.25', 'count')); + $this->assertEquals('2 counters', $this->view->pluralize('2', 'count', 'counters')); } }