r47708 - in /branches/upstream/liburi-perl/current: Changes META.yml URI.pm t/roy-test.t

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Tue Nov 24 03:05:40 2009
New Revision: 47708

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47708
Log:
[svn-upgrade] Integrating new upstream version, liburi-perl (1.51)

Modified:
    branches/upstream/liburi-perl/current/Changes
    branches/upstream/liburi-perl/current/META.yml
    branches/upstream/liburi-perl/current/URI.pm
    branches/upstream/liburi-perl/current/t/roy-test.t

Modified: branches/upstream/liburi-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liburi-perl/current/Changes?rev=47708&op=diff
==============================================================================
--- branches/upstream/liburi-perl/current/Changes (original)
+++ branches/upstream/liburi-perl/current/Changes Tue Nov 24 03:05:40 2009
@@ -1,3 +1,12 @@
+2009-11-23   Gisle Aas <gisle at ActiveState.com>
+
+   Release 1.51
+
+   Fixup a test that was broken on Windows
+
+
+
+
 2009-11-21   Gisle Aas <gisle at ActiveState.com>
 
    Release 1.50
@@ -42,6 +51,7 @@
       Strip brackets off IPv6 hosts [RT#34309]
 
 
+
 2009-08-14   Gisle Aas <gisle at ActiveState.com>
 
    Release 1.40

Modified: branches/upstream/liburi-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liburi-perl/current/META.yml?rev=47708&op=diff
==============================================================================
--- branches/upstream/liburi-perl/current/META.yml (original)
+++ branches/upstream/liburi-perl/current/META.yml Tue Nov 24 03:05:40 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               URI
-version:            1.50
+version:            1.51
 abstract:           Uniform Resource Identifiers (absolute and relative)
 author:
     - Gisle Aas <gisle at activestate.com>

Modified: branches/upstream/liburi-perl/current/URI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liburi-perl/current/URI.pm?rev=47708&op=diff
==============================================================================
--- branches/upstream/liburi-perl/current/URI.pm (original)
+++ branches/upstream/liburi-perl/current/URI.pm Tue Nov 24 03:05:40 2009
@@ -2,7 +2,7 @@
 
 use strict;
 use vars qw($VERSION);
-$VERSION = "1.50";
+$VERSION = "1.51";
 
 use vars qw($ABS_REMOTE_LEADING_DOTS $ABS_ALLOW_RELATIVE_SCHEME $DEFAULT_QUERY_FORM_DELIMITER);
 

Modified: branches/upstream/liburi-perl/current/t/roy-test.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liburi-perl/current/t/roy-test.t?rev=47708&op=diff
==============================================================================
--- branches/upstream/liburi-perl/current/t/roy-test.t (original)
+++ branches/upstream/liburi-perl/current/t/roy-test.t Tue Nov 24 03:05:40 2009
@@ -1,31 +1,30 @@
 #!perl -w
 
-print "1..102\n";
-
-if (-d "t") {
-   chdir("t") || die "Can't chdir 't': $!";
-   # fix all relative library locations
-   foreach (@INC) {
-      $_ = "../$_" unless m,^/,;
-   }
-}
+use strict;
+use Test qw(plan ok);
+plan tests => 102;
 
 use URI;
-$no = 1;
+use File::Spec::Functions qw(catfile);
 
-for $i (1..5) {
-   my $file = "roytest$i.html";
+my $no = 1;
+
+my @prefix;
+push(@prefix, "t") if -d "t";
+
+for my $i (1..5) {
+   my $file = catfile(@prefix, "roytest$i.html");
 
    open(FILE, $file) || die "Can't open $file: $!";
    print "# $file\n";
-   $base = undef;
+   my $base = undef;
    while (<FILE>) {
        if (/^<BASE href="([^"]+)">/) {
            $base = URI->new($1);
        } elsif (/^<a href="([^"]*)">.*<\/a>\s*=\s*(\S+)/) {
            die "Missing base at line $." unless $base;	    
-           $link = $1;
-           $exp  = $2;
+           my $link = $1;
+           my $exp  = $2;
            $exp = $base if $exp =~ /current/;  # special case test 22
 
 	   # rfc2396bis restores the rfc1808 behaviour
@@ -36,13 +35,8 @@
 	       $exp = "http://a/b/c/d;p?y";
 	   }
 
-           $abs  = URI->new($link)->abs($base);
-           unless ($abs eq $exp) {
-              print "$file:$.:  Expected: $exp\n";
-              print qq(  abs("$link","$base") ==> "$abs"\n);
-              print "not ";
-           }
-           print "ok $no\n";
+	   ok(URI->new($link)->abs($base), $exp);
+
            $no++;
        }
    }