update

diff --git a/t/bestlink.t b/t/bestlink.t
index 825c88ff2fd68b9071487700656282383b215c00..ece900152e0b0648ba686895baa2036e18f1945f 100755 (executable)
--- a/t/bestlink.t
+++ b/t/bestlink.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More tests => 8;
+use Test::More tests => 9;

 
 sub test ($$$) {
        my $page=shift;
 
 sub test ($$$) {
        my $page=shift;


@@ -9,8 +9,10 @@ sub test ($$$) {
        my @existing_pages=@{shift()};
        
        %IkiWiki::pagecase=();
        my @existing_pages=@{shift()};
        
        %IkiWiki::pagecase=();

+       %IkiWiki::links=();

        foreach my $page (@existing_pages) {
                $IkiWiki::pagecase{lc $page}=$page;
        foreach my $page (@existing_pages) {
                $IkiWiki::pagecase{lc $page}=$page;

+               $IkiWiki::links{$page}=[];

        }
 
        return IkiWiki::bestlink($page, $link);
        }
 
        return IkiWiki::bestlink($page, $link);


@@ -23,5 +25,6 @@ is(test("bar", "foo", ["bar", "foo"]), "foo", "simple link");
 is(test("bar", "FoO", ["bar", "foo"]), "foo", "simple link with different input case");
 is(test("bar", "foo", ["bar", "fOo"]), "fOo", "simple link with different page case");
 is(test("bar", "FoO", ["bar", "fOo"]), "fOo", "simple link with different page and input case");
 is(test("bar", "FoO", ["bar", "foo"]), "foo", "simple link with different input case");
 is(test("bar", "foo", ["bar", "fOo"]), "fOo", "simple link with different page case");
 is(test("bar", "FoO", ["bar", "fOo"]), "fOo", "simple link with different page and input case");

+is(test("bar", "Foo", ["bar", "fOo", "foo", "fOO", "Foo", "fOo"]), "Foo", "in case of ambiguity, like case wins");

 is(test("bar", "foo", ["bar", "foo", "bar/foo"]), "bar/foo", "simple subpage link");
 is(test("bar", "foo/subpage", ["bar", "foo", "bar/subpage", "foo/subpage"]), "foo/subpage", "cross subpage link");
 is(test("bar", "foo", ["bar", "foo", "bar/foo"]), "bar/foo", "simple subpage link");
 is(test("bar", "foo/subpage", ["bar", "foo", "bar/subpage", "foo/subpage"]), "foo/subpage", "cross subpage link");

diff --git a/t/linkify.t b/t/linkify.t
index 82f5f368bee49d30b5e98d557a82d63caef33972..2ed3face30db096b4ade26ccf9f93544393d3cb5 100755 (executable)
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -13,8 +13,10 @@ sub linkify ($$$$) {
        # This is what linkify and htmllink need set right now to work.
        # This could change, if so, update it..
        %IkiWiki::pagecase=();
        # This is what linkify and htmllink need set right now to work.
        # This could change, if so, update it..
        %IkiWiki::pagecase=();

+       %IkiWiki::links=();

        foreach my $page (@existing_pages) {
                $IkiWiki::pagecase{lc $page}=$page;
        foreach my $page (@existing_pages) {
                $IkiWiki::pagecase{lc $page}=$page;

+               $IkiWiki::links{$page}=[];

                $IkiWiki::renderedfiles{"$page.mdwn"}=$page;
        }
        %IkiWiki::config=IkiWiki::defaultconfig();
                $IkiWiki::renderedfiles{"$page.mdwn"}=$page;
        }
        %IkiWiki::config=IkiWiki::defaultconfig();