X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fversion.t;h=8a8c209db29522711706936b3be55ff718ee245a;hb=002b9267a385cf8ff0e7534241cdf3798da8636c;hp=c91d988c23f344bf9feb1a09d83f10ecd8a91598;hpb=13f8f3987335c6eed94bd796ae4e7be8f788fdbf;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/version.t b/lib/version.t
index c91d988..8a8c209 100644
--- a/lib/version.t
+++ b/lib/version.t
@@ -4,33 +4,56 @@
 
 #########################
 
-use Test::More tests => 168;
+use Test::More tests => 202;
 
 diag "Tests with base class" unless $ENV{PERL_CORE};
 
-use_ok("version"); # If we made it this far, we are ok.
+BEGIN {
+    use_ok("version", 0.50); # If we made it this far, we are ok.
+}
+
 BaseTests("version");
 
 diag "Tests with empty derived class" unless $ENV{PERL_CORE};
 
 package version::Empty;
-use vars qw($VERSION @ISA);
-use Exporter;
-use version 0.30;
-@ISA = qw(Exporter version);
+use base version;
 $VERSION = 0.01;
+no warnings 'redefine';
+*::qv = sub { return bless version::qv(shift), __PACKAGE__; };
+
+package version::Bad;
+use base version;
+sub new { my($self,$n)=@_;  bless \$n, $self }
 
 package main;
-my $testobj = new version::Empty 1.002_003;
+my $testobj = version::Empty->new(1.002_003);
 isa_ok( $testobj, "version::Empty" );
 ok( $testobj->numify == 1.002003, "Numified correctly" );
-ok( $testobj->stringify eq "1.2.3", "Stringified correctly" );
+ok( $testobj->stringify eq "1.002003", "Stringified correctly" );
+ok( $testobj->normal eq "v1.2.3", "Normalified correctly" );
 
-my $verobj = new version "1.2.4";
+my $verobj = version->new("1.2.4");
 ok( $verobj > $testobj, "Comparison vs parent class" );
 ok( $verobj gt $testobj, "Comparison vs parent class" );
 BaseTests("version::Empty");
 
+diag "tests with bad subclass" unless $ENV{PERL_CORE};
+$testobj = version::Bad->new(1.002_003);
+isa_ok( $testobj, "version::Bad" );
+eval { my $string = $testobj->numify };
+like($@, qr/Invalid version object/,
+    "Bad subclass numify");
+eval { my $string = $testobj->normal };
+like($@, qr/Invalid version object/,
+    "Bad subclass normal");
+eval { my $string = $testobj->stringify };
+like($@, qr/Invalid version object/,
+    "Bad subclass stringify");
+eval { my $test = $testobj > 1.0 };
+like($@, qr/Invalid version object/,
+    "Bad subclass vcmp");
+
 sub BaseTests {
 
 	my $CLASS = shift;
@@ -41,25 +64,25 @@ sub BaseTests {
 	# Test bare number processing
 	diag "tests with bare numbers" unless $ENV{PERL_CORE};
 	$version = $CLASS->new(5.005_03);
-	is ( "$version" , "5.5.30" , '5.005_03 eq 5.5.30' );
+	is ( "$version" , "5.005030" , '5.005_03 eq 5.5.30' );
 	$version = $CLASS->new(1.23);
 	is ( "$version" , "1.230" , '1.23 eq "1.230"' );
 	
 	# Test quoted number processing
 	diag "tests with quoted numbers" unless $ENV{PERL_CORE};
 	$version = $CLASS->new("5.005_03");
-	is ( "$version" , "5.5_30" , '"5.005_03" eq "5.5_30"' );
+	is ( "$version" , "5.005_030" , '"5.005_03" eq "5.005_030"' );
 	$version = $CLASS->new("v1.23");
-	is ( "$version" , "1.23.0" , '"v1.23" eq "1.23.0"' );
+	is ( "$version" , "v1.23.0" , '"v1.23" eq "v1.23.0"' );
 	
 	# Test stringify operator
 	diag "tests with stringify" unless $ENV{PERL_CORE};
 	$version = $CLASS->new("5.005");
 	is ( "$version" , "5.005" , '5.005 eq "5.005"' );
 	$version = $CLASS->new("5.006.001");
-	is ( "$version" , "5.6.1" , '5.006.001 eq 5.6.1' );
+	is ( "$version" , "v5.6.1" , '5.006.001 eq v5.6.1' );
 	$version = $CLASS->new("1.2.3_4");
-	is ( "$version" , "1.2.3_4" , 'alpha version 1.2.3_4 eq 1.2.3_4' );
+	is ( "$version" , "v1.2.3_4" , 'alpha version 1.2.3_4 eq v1.2.3_4' );
 	
 	# test illegal formats
 	diag "test illegal formats" unless $ENV{PERL_CORE};
@@ -74,6 +97,7 @@ sub BaseTests {
 	$version = $CLASS->new("99 and 44/100 pure");
 	ok ("$version" eq "99.000", '$version eq "99.000"');
 	ok ($version->numify == 99.0, '$version->numify == 99.0');
+	ok ($version->normal eq "v99.0.0", '$version->normal eq v99.0.0');
 	
 	$version = $CLASS->new("something");
 	ok (defined $version, 'defined $version');
@@ -85,7 +109,7 @@ sub BaseTests {
 	ok ($version, 'boolean');
 	
 	# Test class membership
-	isa_ok ( $version, "version" );
+	isa_ok ( $version, $CLASS );
 	
 	# Test comparison operators with self
 	diag "tests with self" unless $ENV{PERL_CORE};
@@ -211,18 +235,32 @@ sub BaseTests {
 	ok ( $version eq "1.2.0", 'qv("1.2") eq "1.2.0"' );
 	$version = qv(1.2);
 	ok ( $version eq "1.2.0", 'qv(1.2) eq "1.2.0"' );
+	isa_ok( qv('5.008'), $CLASS );
 
 	# test creation from existing version object
 	diag "create new from existing version" unless $ENV{PERL_CORE};
-	ok (eval {$new_version = version->new($version)},
+	ok (eval {$new_version = $CLASS->new($version)},
 		"new from existing object");
-	ok ($new_version == $version, "duped object identical");
+	ok ($new_version == $version, "class->new($version) identical");
+	$new_version = $version->new();
+	ok ($new_version == $version, "$version->new() also identical");
+	$new_version = $version->new("1.2.3");
+	is ($new_version, "v1.2.3" , '$version->new("1.2.3") works too');
 
 	# test the CVS revision mode
 	diag "testing CVS Revision" unless $ENV{PERL_CORE};
-	$version = new version qw$Revision: 1.2$;
+	$version = new $CLASS qw$Revision: 1.2$;
 	ok ( $version eq "1.2.0", 'qw$Revision: 1.2$ eq 1.2.0' );
+	$version = new $CLASS qw$Revision: 1.2.3.4$;
+	ok ( $version eq "1.2.3.4", 'qw$Revision: 1.2.3.4$ eq 1.2.3.4' );
 	
+	# test the CPAN style reduced significant digit form
+	diag "testing CPAN-style versions" unless $ENV{PERL_CORE};
+	$version = $CLASS->new("1.23_01");
+	is ( "$version" , "1.23_0100", "CPAN-style alpha version" );
+	ok ( $version > 1.23, "1.23_01 > 1.23");
+	ok ( $version < 1.24, "1.23_01 < 1.24");
+
 	# test reformed UNIVERSAL::VERSION
 	diag "Replacement UNIVERSAL::VERSION tests" unless $ENV{PERL_CORE};
 	
@@ -253,12 +291,35 @@ SKIP: 	{
 		    if $] < 5.008_001; 
 	    diag "Tests with v-strings" unless $ENV{PERL_CORE};
 	    $version = $CLASS->new(1.2.3);
-	    ok("$version" eq "1.2.3", '"$version" eq 1.2.3');
+	    ok("$version" eq "v1.2.3", '"$version" eq 1.2.3');
 	    $version = $CLASS->new(1.0.0);
 	    $new_version = $CLASS->new(1);
 	    ok($version == $new_version, '$version == $new_version');
 	    ok($version eq $new_version, '$version eq $new_version');
 	    $version = qv(1.2.3);
-	    ok("$version" eq "1.2.3", 'v-string initialized qv()');
+	    ok("$version" eq "v1.2.3", 'v-string initialized qv()');
 	}
+
+	diag "Tests with real-world (malformed) data" unless $ENV{PERL_CORE};
+
+	# trailing zero testing (reported by Andreas Koenig).
+	$version = $CLASS->new("1");
+	ok($version->numify eq "1.000", "trailing zeros preserved");
+	$version = $CLASS->new("1.0");
+	ok($version->numify eq "1.000", "trailing zeros preserved");
+	$version = $CLASS->new("1.0.0");
+	ok($version->numify eq "1.000000", "trailing zeros preserved");
+	$version = $CLASS->new("1.0.0.0");
+	ok($version->numify eq "1.000000000", "trailing zeros preserved");
+	
+	# leading zero testing (reported by Andreas Koenig).
+	$version = $CLASS->new(".7");
+	ok($version->numify eq "0.700", "leading zero inferred");
+
+	# leading space testing (reported by Andreas Koenig).
+	$version = $CLASS->new(" 1.7");
+	ok($version->numify eq "1.700", "leading space ignored");
+
 }
+
+1;