Changeset 401

Timestamp:

04/11/08 20:29:15 (4 years ago)

Author:

kake

Message:

Made Test::MockObject? optional.

Location:

wiki-toolkit-formatter-usemod/trunk

Files:

• Changes (modified) (1 diff)
• Makefile.PL (modified) (1 diff)
• t/links.t (modified) (1 diff)
• t/node-suffix.t (modified) (1 diff)
• t/usemod.t (modified) (2 diffs)

wiki-toolkit-formatter-usemod/trunk/Changes

@@ +1 @@
+0.21
+        Made Test::MockObject optional.
+
 0.20    6 June 2006
         Update copyright notice.

wiki-toolkit-formatter-usemod/trunk/Makefile.PL

@@ -6 +6 @@
                                  'HTML::PullParser' => 0,
                                  'Test::More'       => 0,
-                                 'Test::MockObject' => '0.07', #earlier no mock
                                  'URI::Escape'      => 0,
                                  'URI::Find::Delimited' => '0.02'#earlier buggy

wiki-toolkit-formatter-usemod/trunk/t/links.t

@@ -1 +1 @@
 use strict;
-use Test::MockObject;
-use Test::More tests => 4;
+use Test::More;
+
+eval { require Test::MockObject; };
+if ( $@ ) {
+    plan skip_all => "Can't find Test::MockObject";
+}
+
+plan tests => 4;
 
 my $wikitext = <<WIKITEXT;

wiki-toolkit-formatter-usemod/trunk/t/node-suffix.t

@@ -1 +1 @@
 use strict;
-use Test::More tests => 2;
+use Test::More;
 use Wiki::Toolkit::Formatter::UseMod;
-use Test::MockObject;
+
+eval { require Test::MockObject; };
+if ( $@ ) {
+    plan skip_all => "Can't find Test::MockObject";
+}
+
+plan tests => 2;
 
 my $wikitext = <<WIKITEXT;

wiki-toolkit-formatter-usemod/trunk/t/usemod.t

@@ -3 +3 @@
 
 use Test::More tests => 25;
-use Test::MockObject;
 
 use_ok( "Wiki::Toolkit::Formatter::UseMod" );
@@ -88 +87 @@
 WIKITEXT
 
-my $wiki = Test::MockObject->new;
-$wiki->mock( "node_exists",
-            sub { my ($self, $node) = @_;
-                  if ( $node eq "Extended Link" or $node eq "Extended Link Two"
-                       or $node eq "Another Link" ) {
-                      return 1;
-                  } else {
-                      return 0;
-                  }
-                }
-);
+my $have_mockobject;
+eval { require Test::MockObject; };
+if ( !$@ ) {
+    $have_mockobject = 1;
+}
 
-# Test with munged URLs.
-$formatter = Wiki::Toolkit::Formatter::UseMod->new( extended_links => 1,
-                                                munge_urls     => 1 );
-$html = $formatter->format($wikitext, $wiki);
+SKIP: {
+    skip "Can't find Test::MockObject", 11 unless $have_mockobject;
 
-like( $html, qr|<a href="wiki.pl\?Extended_Link">Extended Link</a>|,
-      "extended links work" );
-like( $html, qr|<a href="wiki.pl\?Extended_Link">extended link</a>|,
-      "...and are forced ucfirst" );
-like( $html, qr|<a href="wiki.pl\?Extended_Link">titled extended link</a>|,
-      "...and titles work" );
-like( $html, qr|[^ ]title with leading whitespace|,
-      "...and don't show leading whitespace" );
-like( $html, qr|<a href="wiki.pl\?Extended_Link_Two">|,
-      "...and titled nodes with trailing whitespace are munged correctly before formatting" );
+    my $wiki = Test::MockObject->new;
+    $wiki->mock( "node_exists",
+                  sub {
+                        my ($self, $node) = @_;
+                        if ( $node eq "Extended Link"
+                             or $node eq "Extended Link Two"
+                             or $node eq "Another Link" ) {
+                            return 1;
+                        } else {
+                            return 0;
+                        }
+                      }
+    );
 
-# Test with unmunged URLs.
-$formatter = Wiki::Toolkit::Formatter::UseMod->new( extended_links => 1 );
-$html = $formatter->format($wikitext, $wiki);
+    # Test with munged URLs.
+    $formatter = Wiki::Toolkit::Formatter::UseMod->new( extended_links => 1,
+                                                        munge_urls     => 1 );
+    $html = $formatter->format($wikitext, $wiki);
 
-like( $html, qr|<a href="wiki.pl\?Extended%20Link">Extended Link</a>|,
-      "extended links work with unmunged URLs" );
-like( $html, qr|<a href="wiki.pl\?Extended%20Link">extended link</a>|,
-      "...and are forced ucfirst" );
-like( $html, qr|<a href="wiki.pl\?Extended%20Link">titled extended link</a>|,
-      "...and titles work" );
+    like( $html, qr|<a href="wiki.pl\?Extended_Link">Extended Link</a>|,
+          "extended links work" );
+    like( $html, qr|<a href="wiki.pl\?Extended_Link">extended link</a>|,
+          "...and are forced ucfirst" );
+    like( $html, qr|<a href="wiki.pl\?Extended_Link">titled extended link</a>|,
+          "...and titles work" );
+    like( $html, qr|[^ ]title with leading whitespace|,
+          "...and don't show leading whitespace" );
+    like( $html, qr|<a href="wiki.pl\?Extended_Link_Two">|,
+          "...and titled nodes with trailing whitespace are munged correctly "
+          . "before formatting" );
 
-@links = $formatter->find_internal_links($wikitext);
-print "# Found links: " . join(", ", @links) . "\n";
-my %linkhash = map { $_ => 1 } @links;
-ok( ! defined $linkhash{"extended link"},
-    "find_internal_links respects ucfirst" );
-ok( ! defined $linkhash{"Extended Link "},
-    "...and drops trailing whitespace" );
-is_deeply( \@links, [ "Extended Link", "Extended Link", "Extended Link", "Extended Link Two", "Another Link" ], "...and gets the right order" );
+    # Test with unmunged URLs.
+    $formatter = Wiki::Toolkit::Formatter::UseMod->new( extended_links => 1 );
+    $html = $formatter->format($wikitext, $wiki);
+
+    like( $html, qr|<a href="wiki.pl\?Extended%20Link">Extended Link</a>|,
+          "extended links work with unmunged URLs" );
+    like( $html, qr|<a href="wiki.pl\?Extended%20Link">extended link</a>|,
+          "...and are forced ucfirst" );
+    like( $html,
+          qr|<a href="wiki.pl\?Extended%20Link">titled extended link</a>|,
+          "...and titles work" );
+
+    @links = $formatter->find_internal_links($wikitext);
+    print "# Found links: " . join(", ", @links) . "\n";
+    my %linkhash = map { $_ => 1 } @links;
+    ok( ! defined $linkhash{"extended link"},
+        "find_internal_links respects ucfirst" );
+    ok( ! defined $linkhash{"Extended Link "},
+        "...and drops trailing whitespace" );
+    is_deeply( \@links,
+               [ "Extended Link", "Extended Link", "Extended Link",
+                  "Extended Link Two", "Another Link" ],
+               "...and gets the right order" );
+}