Skip to content

Commit

Permalink
Update tests to match actual white space behaviour
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chris--S
Chris--S committed Oct 15, 2013
1 parent ae66244 commit 96f6944
Showing 1 changed file with 40 additions and 44 deletions.
84 changes: 40 additions & 44 deletions _test/syntax.test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class plugin_definitionlist_syntax_test extends DokuWikiTest {
function test_basic() {
$in1 = "\n"
." ; Term\n"
." : Definition\n";
." :Definition\n";
$in2 = "\n ; Term : Definition\n";
$expected = "\n<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd>Definition</dd>\n"
."</dl>\n";

Expand All @@ -28,10 +28,10 @@ function test_multiple_definitions() {
." ; Term\n"
." : Definition one\n"
." : Definition two\n";
$expected = "\n<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Definition one</dd>\n"
."<dd>Definition two</dd>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd> Definition one</dd>\n"
."<dd> Definition two</dd>\n"
."</dl>\n";

$renderer = new Doku_Renderer_xhtml();
Expand All @@ -44,9 +44,9 @@ function test_newline_in_definition() {
." ; Term\n"
." : Definition one\n"
."continues\n";
$expected = "\n<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Definition one\ncontinues</dd>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd> Definition one\ncontinues</dd>\n"
."</dl>\n";

$renderer = new Doku_Renderer_xhtml();
Expand All @@ -61,9 +61,9 @@ function test_newline_in_definition_with_following_para() {
."continues\n"
."\n"
."Then new paragraph.\n";
$expected = "\n<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Definition one\ncontinues</dd>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd> Definition one\ncontinues</dd>\n"
."</dl>\n"
."\n"
."<p>\nThen new paragraph.\n</p>\n";
Expand All @@ -78,9 +78,9 @@ function test_basic_with_following_preformatted() {
." : Definition\n"
."\n"
." Preformatted\n";
$expected = "\n<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Definition</dd>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd> Definition</dd>\n"
."</dl>\n"
."<pre class=\"code\">Preformatted</pre>\n";
$renderer = new Doku_Renderer_xhtml();
Expand All @@ -92,10 +92,10 @@ function test_nonfancy() {
global $conf;
$in1 = "\n"
." ; Term\n"
." : Definition\n";
." :Definition\n";
$in2 = "\n ; Term : Definition\n";
$expected = "\n<dl class=\"plugin_definitionlist\">\n"
."<dt>Term</dt>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt> Term</dt>\n"
."<dd>Definition</dd>\n"
."</dl>\n";

Expand All @@ -113,9 +113,9 @@ function test_custom_class_name() {
$in = "\n"
." ; Term\n"
." : Definition\n";
$expected = "\n<dl class=\"lorem-ipsum\">\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Definition</dd>\n"
$expected = "<dl class=\"lorem-ipsum\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd> Definition</dd>\n"
."</dl>\n";

$conf['plugin']['definitionlist']['classname'] = 'lorem-ipsum';
Expand All @@ -130,14 +130,12 @@ function test_two_dlists_with_blank_line_between() {
." ; Term : Def\n"
."\n"
." ; Another term : Def\n";
$expected = "\n"
."<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd>Def</dd>\n"
."</dl>\n"
."\n"
."<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Another term</span></dt>\n"
."<dt><span class=\"term\"> Another term</span></dt>\n"
."<dd>Def</dd>\n"
."</dl>\n";
$renderer = new Doku_Renderer();
Expand All @@ -151,20 +149,20 @@ function test_dd_with_ul() {
." : Some parts:\n"
." * Part 1\n"
." * Part 2\n"
."\n"
." ; Term 2\n"
." : Def\n";
$expected = "\n"
."<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Some parts:<ul>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd> Some parts:<ul>\n"
."<li class=\"level1\"><div class=\"li\"> Part 1</div>\n"
."</li>\n"
."<li class=\"level1\"><div class=\"li\"> Part 2</div>\n"
."</li>\n"
."</ul>\n"
."</dd>\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Def</dd>\n"
."<dt><span class=\"term\"> Term 2</span></dt>\n"
."<dd> Def</dd>\n"
."</dl>\n";
$renderer = new Doku_Renderer();
$actual = $renderer->render($in, 'xhtml');
Expand All @@ -178,19 +176,18 @@ function test_dd_with_ul_followed_by_ordered_list() {
." * Part 1\n"
." * Part 2\n"
."\n"
."\n"
." - Item\n";
$expected = "\n"
."<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Some parts:<ul>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd> Some parts:<ul>\n"
."<li class=\"level1\"><div class=\"li\"> Part 1</div>\n"
."</li>\n"
."<li class=\"level1\"><div class=\"li\"> Part 2</div>\n"
."</li>\n"
."</ul>\n"
."</dd>\n"
."</dl>\n"
."\n"
."<ol>\n"
."<li class=\"level1\"><div class=\"li\"> Item</div>"
."\n</li>\n"
Expand All @@ -207,21 +204,20 @@ function test_dd_with_ul_followed_by_2nd_dl() {
." * Part 1\n"
." * Part 2\n"
."\n"
."\n"
." ; Another term : Definition\n";
$expected = "\n"
."<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Term</span></dt>\n"
."<dd>Some parts:<ul>\n"
$expected = "<dl class=\"plugin_definitionlist\">\n"
."<dt><span class=\"term\"> Term</span></dt>\n"
."<dd> Some parts:<ul>\n"
."<li class=\"level1\"><div class=\"li\"> Part 1</div>\n"
."</li>\n"
."<li class=\"level1\"><div class=\"li\"> Part 2</div>\n"
."</li>\n"
."</ul>\n"
."</dd>\n"
."</dl>\n"
."\n"
."<dl class=\"plugin_definitionlist\">\n"
."<dt><span class='term'>Another term</span></dt>\n"
."<dt><span class=\"term\"> Another term</span></dt>\n"
."<dd>Definition</dd>\n"
."</dl>\n";
$renderer = new Doku_Renderer();
Expand Down

0 comments on commit 96f6944

Please sign in to comment.