Changeset 368

Timestamp:

12/09/06 15:25:44 (7 years ago)

Author:

ivorw

Message:

r1332@slazula: ivor | 2006-12-09 15:24:24 +0100
0.12 Fix failing tests

Location:

wiki-toolkit-plugin-diff/trunk

Files:

• Changes (modified) (1 diff)
• Makefile.PL (modified) (1 diff)
• lib/Wiki/Toolkit/Plugin/Diff.pm (modified) (1 diff)
• t/02_diff.t (modified) (7 diffs)

wiki-toolkit-plugin-diff/trunk/Changes

@@ -1 +1 @@
 Revision history for Perl extension Wiki::Toolkit::Plugin::Diff.
+
+0.12  Sat Dec  9 2006
+    - Fix tests for VCS::Lite 0.08 or later
 
 0.11  Sat Aug 12 20006

wiki-toolkit-plugin-diff/trunk/Makefile.PL

@@ -8 +8 @@
                             Wiki::Toolkit => 0,
                             Module::Optional => 0,
+                            Params::Validate => 0,
                             }, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005

wiki-toolkit-plugin-diff/trunk/lib/Wiki/Toolkit/Plugin/Diff.pm

@@ -4 +4 @@
 use warnings;
 
-our $VERSION = '0.11';
+our $VERSION = '0.12';
 
 use base 'Wiki::Toolkit::Plugin';

wiki-toolkit-plugin-diff/trunk/t/02_diff.t

@@ -2 +2 @@
 use Wiki::Toolkit::TestLib;
 use Test::More;
-
+use VCS::Lite;
+
+my $newlite = (VCS::Lite->VERSION >= 0.08);
 my $iterator = Wiki::Toolkit::TestLib->new_wiki_maker;
 plan tests => ( 1 + $iterator->number * 18 );
@@ -137 +139 @@
                         right => "== Line 1 ==\n"},
                 "First element is line number on right");
-      TODO: {
-          local $TODO = "Ivor tells me he needs to fix these but it's a bug in the test";
-      is_deeply( $bodydiff{diff}[1], {
+                
+      is_deeply( $bodydiff{diff}[1], $newlite ? {
+                        left => '<span class="diff1">Pub </span>'.
+                                'in Clerkenwell with St Peter\'s beer.'.
+                                "<br />",
+                        right => '<span class="diff2">Tiny pub </span>'.
+                                'in Clerkenwell with St Peter\'s beer.'.
+                                '<span class="diff2"><br />'.
+                                "\nNear Farringdon station</span>".
+                                "<br />",
+                                } : {
                         left => '<span class="diff1">Pub </span>'.
                                 'in Clerkenwell with St Peter\'s beer.'.
@@ -161 +171 @@
                         right => "== Line 2 ==\n"},
                 "First element is line number on right");
-      is_deeply( $metadiff{diff}[1], {
+      is_deeply( $metadiff{diff}[1], $newlite ? {
+                        left => "\ncategory='Pubs'\nlocale='Farringdon'",
+                        right => "\ncategory='Pubs'\n".
+                                '<span class="diff2">category=\'Pubs,Real Ale\'<br />'.
+                                "\n</span>locale='Farringdon'",
+                                } : {
                         left => "category='Pubs'",
                         right => "category='Pubs".
@@ -178 +193 @@
                         right => "== Line 11 ==\n"},
                 "Diff finds the right line number on right");
-        is_deeply( $bodydiff{diff}[1], {
+        is_deeply( $bodydiff{diff}[1], $newlite ? {
+                        left => "\nmetatest='Moo'\nmetatest='Boo'",
+                        right => "\nmetatest='Moo'\n".
+                                '<span class="diff2">'.
+                                "[[IvorW's Test Page]]<br />\n".
+                                "<br />\n</span>".
+                                "metatest='Boo'"
+                                } : {
                         left => "metatest='".
                                 '<span class="diff1">Moo</span>\'',
@@ -197 +219 @@
                         right => "== Line 13 ==\n"},
                 "Diff finds the right line number on right");
-        is_deeply( $bodydiff{diff}[1], {
+        is_deeply( $bodydiff{diff}[1], $newlite ? {
+                        left => "\nmetatest='Boo'\nmetatest='Quack'",
+                        right => "\nmetatest='Boo'\n".
+                                '<span class="diff2">'.
+                                "[[Another Test Page]]<br />\n".
+                                "<br />\n</span>".
+                                "metatest='Quack'",
+                                } : {
                         left => "metatest='".
                                 '<span class="diff1">Boo</span>\'',
@@ -224 +253 @@
                         right => "== Line 0 ==\n" },
                 "Diff finds the right line numbers");
-        is_deeply( $bodydiff{diff}[1], {
+        is_deeply( $bodydiff{diff}[1], $newlite ? {
+                        left => "Tiny pub in Clerkenwell with St Peter's beer".
+                                ".<br />",
+                        right => "Tiny pub in Clerkenwell with St Peter's beer".
+                                ' <span class="diff2">but no food</span>.'.
+                                "<br />",
+                                } : {
                         left => "Tiny pub in Clerkenwell with St Peter's beer".
                                 ".<br />\n",
@@ -238 +273 @@
                         right_version => 2 ) };
         is( $@, "", "differences doesn't die when only difference is a newline");
-    } # end of TODO
 }