svn: /pear/packages/Text_Wiki/trunk/ Text/Wiki/Render/Tiki/List.php tests/Text_Wiki_Render_Tiki_Tests.php
tests/fixtures/test_mediawiki_to_tiki_output.txt

rodrigosprimo Tue, 04 Aug 2009 15:25:26 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286811 Log: Improve Text_Wiki_Render_Tiki_List Changed paths: U pear/packages/Text_Wiki/trunk/Text/Wiki/Render/Tiki/List.php U pear/packages/Text_Wiki/trunk/tests/Text_Wiki_Render_Tiki_Tests.php U pear/packages/Text_Wiki/trunk/tests/fixtures/test_mediawiki_to_tiki_output.txt Modified: pear/packages/Text_Wiki/trunk/Text/Wiki/Render/Tiki/List.php =================================================================== --- pear/packages/Text_Wiki/trunk/Text/Wiki/Render/Tiki/List.php 2009-08-04 15:13:00 UTC (rev 286810) +++ pear/packages/Text_Wiki/trunk/Text/Wiki/Render/Tiki/List.php 2009-08-04 15:25:26 UTC (rev 286811) @@ -24,24 +24,26 @@ switch ($options['type']) { - case 'bullet_item_start': - return "\n".str_pad('', $options['level'], '*'); + case 'bullet_list_start': + case 'number_list_start': + return ''; break; - case 'number_item_start': - return "\n".str_pad('', $options['level'], '#'); - break; case 'bullet_list_end': case 'number_list_end': if ($options['level'] == 0) { - return "\n\n"; + return "\n"; } break; + case 'bullet_item_start': + return str_pad('', $options['level'], '*'); + break; + case 'number_item_start': + return str_pad('', $options['level'], '#'); + break; case 'bullet_item_end': case 'number_item_end': - case 'bullet_list_start': - case 'number_list_start': default: - return ''; + return "\n"; break; } } Modified: pear/packages/Text_Wiki/trunk/tests/Text_Wiki_Render_Tiki_Tests.php =================================================================== --- pear/packages/Text_Wiki/trunk/tests/Text_Wiki_Render_Tiki_Tests.php 2009-08-04 15:13:00 UTC (rev 286810) +++ pear/packages/Text_Wiki/trunk/tests/Text_Wiki_Render_Tiki_Tests.php 2009-08-04 15:25:26 UTC (rev 286811) @@ -419,42 +419,49 @@ class Text_Wiki_Render_Tiki_List_Test extends Text_Wiki_Render_Tiki_SetUp_Tests { - public function testTikiRenderNumberListStart() + public function testTikiRenderNumberItemStart() { $options = array('type' => 'number_item_start', 'level' => 1); - $this->assertEquals("\n#", $this->t->token($options)); + $this->assertEquals("#", $this->t->token($options)); $options = array('type' => 'number_item_start', 'level' => 3); - $this->assertEquals("\n###", $this->t->token($options)); + $this->assertEquals("###", $this->t->token($options)); } - public function testTikiRenderBulletListStart() + public function testTikiRenderBulletItemStart() { $options = array('type' => 'bullet_item_start', 'level' => 1); - $this->assertEquals("\n*", $this->t->token($options)); + $this->assertEquals("*", $this->t->token($options)); $options = array('type' => 'bullet_item_start', 'level' => 3); - $this->assertEquals("\n***", $this->t->token($options)); + $this->assertEquals("***", $this->t->token($options)); } public function testTikiRenderBulletAndNumberedListEnd() { $options = array('type' => 'bullet_list_end', 'level' => 0); - $this->assertEquals("\n\n", $this->t->token($options)); + $this->assertEquals("\n", $this->t->token($options)); $options = array('type' => 'number_list_end', 'level' => 0); - $this->assertEquals("\n\n", $this->t->token($options)); + $this->assertEquals("\n", $this->t->token($options)); $options = array('type' => 'bullet_list_end', 'level' => 1); $this->assertEquals("", $this->t->token($options)); - $options = array('type' => 'bullet_list_end', 'level' => 1); + $options = array('type' => 'number_list_end', 'level' => 1); $this->assertEquals("", $this->t->token($options)); } - public function testTikiRenderListOtherTypes() + public function testTikiRenderBulletAndNumberedListStart() { - $otherTypes = array('bullet_item_end', 'number_item_end', 'bullet_list_start', 'number_list_start'); - foreach ($otherTypes as $type) { - $options = array('type' => $type); - $this->assertEquals('', $this->t->token($options)); - } + $options = array('type' => 'bullet_list_start'); + $this->assertEquals("", $this->t->token($options)); + $options = array('type' => 'number_list_start'); + $this->assertEquals("", $this->t->token($options)); } + + public function testTikiRenderBullerAndNumberedItemEnd() + { + $options = array('type' => 'bullet_item_end'); + $this->assertEquals("\n", $this->t->token($options)); + $options = array('type' => 'number_item_end'); + $this->assertEquals("\n", $this->t->token($options)); + } } Modified: pear/packages/Text_Wiki/trunk/tests/fixtures/test_mediawiki_to_tiki_output.txt =================================================================== --- pear/packages/Text_Wiki/trunk/tests/fixtures/test_mediawiki_to_tiki_output.txt 2009-08-04 15:13:00 UTC (rev 286810) +++ pear/packages/Text_Wiki/trunk/tests/fixtures/test_mediawiki_to_tiki_output.txt 2009-08-04 15:25:26 UTC (rev 286811) @@ -27,24 +27,20 @@ Como diretor, ele dava aulas de álgebra, geometria e trabalhos manuais. Geralmente dizia que admirava mais aqueles que possuíam habilidades para o trabalho manual do que aqueles que se restringiam ao trabalho intelectual. Durante um período trabalhava individualmente com alguns alunos numa espécie de sessão de terapia. Após algum tempo abandonou esse trabalho individual, pois concluiu que com as sessões ou sem os alunos resolviam seus problemas de qualquer forma. A liberdade era a responsável por isso. !!Obras - *((1960)): ''Liberdade sem medo'' (''Sumerhill'') *((1966)): ''Liberdade sem excesso'' (''Freedom - Not License!'') *((1967)): ''Liberdade no lar'' (''The problem family'') *((1967)): ''Liberdade na escola'' (''Talking of Summerhill'') !!Referências - * NEILL, A. S. “Liberdade sem medo”. São Paulo: Ibrasa, 1963. !!Ver também - *((Escola da Ponte)) *((Escolas democráticas)) *((Pedagogia libertária)) !!Ligações externas - *[http://www.summerhillschool.co.uk|Summerhill Schooll] ~pp~The pre tag ignores [[Wiki]] ''markup''.