X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fversion.t;h=09fecc91f3a559c384d0907a389cc034b28194ee;hb=97a504ba76c612b4a75b812be186d7ed5f1593ef;hp=06afb26966b2c98a5048964f386050520ac41002;hpb=8dd049801f67fc018c2d3f2b647bf7aa24933c09;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/version.t b/lib/version.t index 06afb26..09fecc9 100644 --- a/lib/version.t +++ b/lib/version.t @@ -73,25 +73,25 @@ sub BaseTests { # Test bare number processing diag "tests with bare numbers" if $Verbose; $version = $CLASS->new(5.005_03); - is ( "$version" , "5.005030" , '5.005_03 eq 5.5.30' ); + is ( "$version" , "5.00503" , '5.005_03 eq 5.00503' ); $version = $CLASS->new(1.23); - is ( "$version" , "1.230" , '1.23 eq "1.230"' ); + is ( "$version" , "1.23" , '1.23 eq "1.23"' ); # Test quoted number processing diag "tests with quoted numbers" if $Verbose; $version = $CLASS->new("5.005_03"); - is ( "$version" , "5.005_030" , '"5.005_03" eq "5.005_030"' ); + is ( "$version" , "5.005_03" , '"5.005_03" eq "5.005_03"' ); $version = $CLASS->new("v1.23"); - is ( "$version" , "v1.23.0" , '"v1.23" eq "v1.23.0"' ); + is ( "$version" , "v1.23" , '"v1.23" eq "v1.23"' ); # Test stringify operator diag "tests with stringify" if $Verbose; $version = $CLASS->new("5.005"); is ( "$version" , "5.005" , '5.005 eq "5.005"' ); $version = $CLASS->new("5.006.001"); - is ( "$version" , "v5.6.1" , '5.006.001 eq v5.6.1' ); + is ( "$version" , "5.006.001" , '5.006.001 eq v5.6.1' ); $version = $CLASS->new("1.2.3_4"); - is ( "$version" , "v1.2.3_4" , 'alpha version 1.2.3_4 eq v1.2.3_4' ); + is ( "$version" , "1.2.3_4" , 'alpha version 1.2.3_4 eq v1.2.3_4' ); # test illegal formats diag "test illegal formats" if $Verbose; @@ -119,13 +119,14 @@ sub BaseTests { "Version string contains invalid data; ignoring"); # from here on out capture the warning and test independently + { my $warning; local $SIG{__WARN__} = sub { $warning = $_[0] }; $version = $CLASS->new("99 and 44/100 pure"); like($warning, qr/$warnregex/, "Version string contains invalid data; ignoring"); - ok ("$version" eq "99.000", '$version eq "99.000"'); + is ("$version", "99", '$version eq "99"'); ok ($version->numify == 99.0, '$version->numify == 99.0'); ok ($version->normal eq "v99.0.0", '$version->normal eq v99.0.0'); @@ -145,33 +146,12 @@ sub BaseTests { # Test comparison operators with self diag "tests with self" if $Verbose; - ok ( $version eq $version, '$version eq $version' ); - is ( $version cmp $version, 0, '$version cmp $version == 0' ); + is ( $version <=> $version, 0, '$version <=> $version == 0' ); ok ( $version == $version, '$version == $version' ); - # test first with non-object - $version = $CLASS->new("5.006.001"); - $new_version = "5.8.0"; - diag "tests with non-objects" if $Verbose; - ok ( $version ne $new_version, '$version ne $new_version' ); - ok ( $version lt $new_version, '$version lt $new_version' ); - ok ( $new_version gt $version, '$new_version gt $version' ); - ok ( ref(\$new_version) eq 'SCALAR', 'no auto-upgrade'); - $new_version = "$version"; - ok ( $version eq $new_version, '$version eq $new_version' ); - ok ( $new_version eq $version, '$new_version eq $version' ); - - # now test with existing object - $new_version = $CLASS->new("5.8.0"); - diag "tests with objects" if $Verbose; - ok ( $version ne $new_version, '$version ne $new_version' ); - ok ( $version lt $new_version, '$version lt $new_version' ); - ok ( $new_version gt $version, '$new_version gt $version' ); - $new_version = $CLASS->new("$version"); - ok ( $version eq $new_version, '$version eq $new_version' ); - # Test Numeric Comparison operators # test first with non-object + $version = $CLASS->new("5.006.001"); $new_version = "5.8.0"; diag "numeric tests with non-objects" if $Verbose; ok ( $version == $version, '$version == $version' ); @@ -196,20 +176,20 @@ sub BaseTests { # test with long decimals diag "Tests with extended decimal versions" if $Verbose; $version = $CLASS->new(1.002003); - ok ( $version eq "1.2.3", '$version eq "1.2.3"'); + ok ( $version == "1.2.3", '$version == "1.2.3"'); ok ( $version->numify == 1.002003, '$version->numify == 1.002003'); $version = $CLASS->new("2002.09.30.1"); - ok ( $version eq "2002.9.30.1",'$version eq 2002.9.30.1'); + ok ( $version == "2002.9.30.1",'$version == 2002.9.30.1'); ok ( $version->numify == 2002.009030001, '$version->numify == 2002.009030001'); # now test with alpha version form with string $version = $CLASS->new("1.2.3"); $new_version = "1.2.3_4"; - diag "tests with alpha-style non-objects" if $Verbose; - ok ( $version lt $new_version, '$version lt $new_version' ); - ok ( $new_version gt $version, '$new_version gt $version' ); - ok ( $version ne $new_version, '$version ne $new_version' ); + diag "numeric tests with alpha-style non-objects" if $Verbose; + ok ( $version < $new_version, '$version < $new_version' ); + ok ( $new_version > $version, '$new_version > $version' ); + ok ( $version != $new_version, '$version != $new_version' ); $version = $CLASS->new("1.2.4"); diag "numeric tests with alpha-style non-objects" @@ -269,9 +249,9 @@ SKIP: { # test the qv() sub diag "testing qv" if $Verbose; $version = qv("1.2"); - cmp_ok ( $version, "eq", "v1.2.0", 'qv("1.2") eq "1.2.0"' ); + is ( "$version", "v1.2", 'qv("1.2") == "1.2.0"' ); $version = qv(1.2); - cmp_ok ( $version, "eq", "v1.2.0", 'qv(1.2) eq "1.2.0"' ); + is ( "$version", "v1.2", 'qv(1.2) == "1.2.0"' ); isa_ok( qv('5.008'), $CLASS ); } @@ -282,76 +262,93 @@ SKIP: { ok ($new_version == $version, "class->new($version) identical"); $new_version = $version->new(); isa_ok ($new_version, $CLASS ); - is ($new_version, "0.000", "version->new() doesn't clone"); + is ($new_version, "0", "version->new() doesn't clone"); $new_version = $version->new("1.2.3"); - is ($new_version, "v1.2.3" , '$version->new("1.2.3") works too'); + is ($new_version, "1.2.3" , '$version->new("1.2.3") works too'); # test the CVS revision mode diag "testing CVS Revision" if $Verbose; $version = new $CLASS qw$Revision: 1.2$; - ok ( $version eq "1.2.0", 'qw$Revision: 1.2$ eq 1.2.0' ); + ok ( $version == "1.2.0", 'qw$Revision: 1.2$ == 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' ); + ok ( $version == "1.2.3.4", 'qw$Revision: 1.2.3.4$ == 1.2.3.4' ); # test the CPAN style reduced significant digit form diag "testing CPAN-style versions" if $Verbose; $version = $CLASS->new("1.23_01"); - is ( "$version" , "1.23_0100", "CPAN-style alpha version" ); + is ( "$version" , "1.23_01", "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" if $Verbose; + + my $error_regex = $] < 5.006 + ? 'version \d required' + : 'does not define \$...::VERSION'; - # we know this file is here since we require it ourselves - $version = $Test::More::VERSION; - eval "use Test::More $version"; - unlike($@, qr/Test::More version $version/, - 'Replacement eval works with exact version'); - - # test as class method - $new_version = Test::More->VERSION; - cmp_ok($new_version,'cmp',$version, "Called as class method"); - - # this should fail even with old UNIVERSAL::VERSION - $version = $Test::More::VERSION+0.01; - eval "use Test::More $version"; - like($@, qr/Test::More version $version/, - 'Replacement eval works with incremented version'); - - TODO: { - local $TODO = "Test fails with Test::More versions ending in _0X"; - $version =~ s/\.0$//; #convert to string and remove trailing '.0' - chop($version); # shorten by 1 digit, should still succeed - eval "use Test::More $version"; - unlike($@, qr/Test::More version $version/, - 'Replacement eval works with single digit'); - } + { + open F, ">aaa.pm" or die "Cannot open aaa.pm: $!\n"; + print F "package aaa;\n\$aaa::VERSION=0.58;\n1;\n"; + close F; - $version += 0.1; # this would fail with old UNIVERSAL::VERSION - eval "use Test::More $version"; - like($@, qr/Test::More version $version/, - 'Replacement eval works with incremented digit'); + $version = 0.58; + eval "use lib '.'; use aaa $version"; + unlike($@, qr/aaa version $version/, + 'Replacement eval works with exact version'); + + # test as class method + $new_version = "aaa"->VERSION; + cmp_ok($new_version,'==',$version, "Called as class method"); + + eval "print Completely::Unknown::Module->VERSION"; + if ( $] < 5.008 ) { + unlike($@, qr/$error_regex/, + "Don't freak if the module doesn't even exist"); + } + else { + unlike($@, qr/defines neither package nor VERSION/, + "Don't freak if the module doesn't even exist"); + } + + # this should fail even with old UNIVERSAL::VERSION + $version += 0.01; + eval "use lib '.'; use aaa $version"; + like($@, qr/aaa version $version/, + 'Replacement eval works with incremented version'); + + $version =~ s/0+$//; #convert to string and remove trailing 0's + chop($version); # shorten by 1 digit, should still succeed + eval "use lib '.'; use aaa $version"; + unlike($@, qr/aaa version $version/, + 'Replacement eval works with single digit'); + + # this would fail with old UNIVERSAL::VERSION + $version += 0.1; + eval "use lib '.'; use aaa $version"; + like($@, qr/aaa version $version/, + 'Replacement eval works with incremented digit'); + unlink 'aaa.pm'; + } { # dummy up some variously broken modules for testing open F, ">xxx.pm" or die "Cannot open xxx.pm: $!\n"; print F "1;\n"; close F; - my $error_regex; + + eval "use lib '.'; use xxx 3;"; if ( $] < 5.008 ) { - $error_regex = 'xxx does not define \$xxx::VERSION'; + like($@, qr/$error_regex/, + 'Replacement handles modules without package or VERSION'); } else { - $error_regex = 'xxx defines neither package nor VERSION'; + like($@, qr/defines neither package nor VERSION/, + 'Replacement handles modules without package or VERSION'); } - - eval "use lib '.'; use xxx 3;"; - like ($@, qr/$error_regex/, - 'Replacement handles modules without package or VERSION'); - eval "use lib '.'; use xxx; $version = xxx->VERSION"; + eval "use lib '.'; use xxx; \$version = xxx->VERSION"; unlike ($@, qr/$error_regex/, 'Replacement handles modules without package or VERSION'); - ok (defined($version), "Called as class method"); + ok (!defined($version), "Called as class method"); unlink 'xxx.pm'; } @@ -360,10 +357,10 @@ SKIP: { print F "package yyy;\n#look ma no VERSION\n1;\n"; close F; eval "use lib '.'; use yyy 3;"; - like ($@, qr/^yyy does not define \$yyy::VERSION/, + like ($@, qr/$error_regex/, 'Replacement handles modules without VERSION'); eval "use lib '.'; use yyy; print yyy->VERSION"; - unlike ($@, qr/^yyy does not define \$yyy::VERSION/, + unlike ($@, qr/$error_regex/, 'Replacement handles modules without VERSION'); unlink 'yyy.pm'; } @@ -373,28 +370,27 @@ SKIP: { print F "package zzz;\n\@VERSION = ();\n1;\n"; close F; eval "use lib '.'; use zzz 3;"; - like ($@, qr/^zzz does not define \$zzz::VERSION/, + like ($@, qr/$error_regex/, 'Replacement handles modules without VERSION'); eval "use lib '.'; use zzz; print zzz->VERSION"; - unlike ($@, qr/^zzz does not define \$zzz::VERSION/, + unlike ($@, qr/$error_regex/, 'Replacement handles modules without VERSION'); unlink 'zzz.pm'; } SKIP: { - skip 'Cannot test bare v-strings with Perl < 5.8.1', 4 - if $] < 5.008_001; + skip 'Cannot test bare v-strings with Perl < 5.6.0', 4 + if $] < 5.006_000; diag "Tests with v-strings" if $Verbose; $version = $CLASS->new(1.2.3); - ok("$version" eq "v1.2.3", '"$version" eq 1.2.3'); + ok("$version" == "v1.2.3", '"$version" == 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'); skip "version require'd instead of use'd, cannot test qv", 1 if defined $no_qv; $version = qv(1.2.3); - ok("$version" eq "v1.2.3", 'v-string initialized qv()'); + ok("$version" == "v1.2.3", 'v-string initialized qv()'); } diag "Tests with real-world (malformed) data" if $Verbose; @@ -418,8 +414,8 @@ SKIP: { ok($version->numify eq "1.700", "leading space ignored"); # RT 19517 - deal with undef and 'undef' initialization - ok($version ne 'undef', "Undef version comparison #1"); - ok($version ne undef, "Undef version comparison #2"); + ok("$version" ne 'undef', "Undef version comparison #1"); + ok("$version" ne undef, "Undef version comparison #2"); $version = $CLASS->new('undef'); unlike($warning, qr/^Version string 'undef' contains invalid data/, "Version string 'undef'"); @@ -427,16 +423,17 @@ SKIP: { $version = $CLASS->new(undef); like($warning, qr/^Use of uninitialized value/, "Version string 'undef'"); - ok($version eq 'undef', "Undef version comparison #3"); - ok($version eq undef, "Undef version comparison #4"); + ok($version == 'undef', "Undef version comparison #3"); + ok($version == undef, "Undef version comparison #4"); eval "\$version = \$CLASS->new()"; # no parameter at all unlike($@, qr/^Bizarre copy of CODE/, "No initializer at all"); - ok($version eq 'undef', "Undef version comparison #5"); - ok($version eq undef, "Undef version comparison #6"); + ok($version == 'undef', "Undef version comparison #5"); + ok($version == undef, "Undef version comparison #6"); $version = $CLASS->new(0.000001); unlike($warning, qr/^Version string '1e-06' contains invalid data/, "Very small version objects"); + } SKIP: { # dummy up a legal module for testing RT#19017 @@ -449,25 +446,27 @@ EOF close F; eval "use lib '.'; use www 0.000008;"; - like ($@, qr/^www version 0.000008 \(v0.0.8\) required/, + like ($@, qr/^www version 0.000008 required/, "Make sure very small versions don't freak"); eval "use lib '.'; use www 1;"; - like ($@, qr/^www version 1.000 \(v1.0.0\) required/, + like ($@, qr/^www version 1 required/, "Comparing vs. version with no decimal"); eval "use lib '.'; use www 1.;"; - like ($@, qr/^www version 1.000 \(v1.0.0\) required/, + like ($@, qr/^www version 1 required/, "Comparing vs. version with decimal only"); - skip 'Cannot "use" extended versions with Perl < 5.6.2', 1 - if $] < 5.006_002; - eval "use lib '.'; use www 0.0.8;"; - like ($@, qr/^www version 0.000008 \(v0.0.8\) required/, - "Make sure very small versions don't freak"); + if ( $] < 5.006_000 ) { + unlink 'www.pm'; + skip 'Cannot "use" extended versions with Perl < 5.6.0', 3; + } + eval "use lib '.'; use www v0.0.8;"; + my $regex = "^www version v0.0.8 required"; + like ($@, qr/$regex/, "Make sure very small versions don't freak"); - eval "use lib '.'; use www 0.0.4;"; - unlike($@, qr/^www version 0.000004 \(v0.0.4\) required/, - 'Succeed - required == VERSION'); - cmp_ok ( "www"->VERSION, 'eq', '0.000004', 'No undef warnings' ); + $regex =~ s/8/4/; # set for second test + eval "use lib '.'; use www v0.0.4;"; + unlike($@, qr/$regex/, 'Succeed - required == VERSION'); + cmp_ok ( "www"->VERSION, 'eq', '0.0.4', 'No undef warnings' ); unlink 'www.pm'; } @@ -486,6 +485,225 @@ EOF ok(defined(&{"main\::qv"}), "make sure we exported qv() properly"); isa_ok( qv(1.2), "vvv"); unlink 'vvv.pm'; + +SKIP: { + if ( $] < 5.006_000 ) { + skip 'Cannot "use" extended versions with Perl < 5.6.0', 3; + } + open F, ">uuu.pm" or die "Cannot open uuu.pm: $!\n"; + print F <<"EOF"; +package uuu; +\$VERSION = 1.0; +1; +EOF + close F; + eval "use lib '.'; use uuu 1.001;"; + like ($@, qr/^uuu version 1.001 required/, + "User typed numeric so we error with numeric"); + eval "use lib '.'; use uuu v1.1.0;"; + like ($@, qr/^uuu version v1.1.0 required/, + "User typed extended so we error with extended"); + unlink 'uuu.pm'; + } + +SKIP: { + # test locale handling + my $warning; + local $SIG{__WARN__} = sub { $warning = $_[0] }; + my $ver = 1.23; # has to be floating point number + my $loc; + while () { + chomp; + $loc = POSIX::setlocale( &POSIX::LC_ALL, $_); + last if POSIX::localeconv()->{decimal_point} eq ','; + } + skip 'Cannot test locale handling without a comma locale', 4 + unless ( $loc and ($ver eq '1,23') ); + + diag ("Testing locale handling with $loc") if $Verbose; + + my $v = $CLASS->new($ver); + unlike($warning,qr/Version string '1,23' contains invalid data/, + "Process locale-dependent floating point"); + is ($v, "1.23", "Locale doesn't apply to version objects"); + ok ($v == $ver, "Comparison to locale floating point"); + } + + eval 'my $v = $CLASS->new("1._1");'; + unlike($@, qr/^Invalid version format \(alpha with zero width\)/, + "Invalid version format 1._1"); + } 1; + +__DATA__ +af_ZA +af_ZA.utf8 +an_ES +an_ES.utf8 +az_AZ.utf8 +be_BY +be_BY.utf8 +bg_BG +bg_BG.utf8 +br_FR +br_FR@euro +br_FR.utf8 +bs_BA +bs_BA.utf8 +ca_ES +ca_ES@euro +ca_ES.utf8 +cs_CZ +cs_CZ.utf8 +da_DK +da_DK.utf8 +de_AT +de_AT@euro +de_AT.utf8 +de_BE +de_BE@euro +de_BE.utf8 +de_DE +de_DE@euro +de_DE.utf8 +de_LU +de_LU@euro +de_LU.utf8 +el_GR +el_GR.utf8 +en_DK +en_DK.utf8 +es_AR +es_AR.utf8 +es_BO +es_BO.utf8 +es_CL +es_CL.utf8 +es_CO +es_CO.utf8 +es_EC +es_EC.utf8 +es_ES +es_ES@euro +es_ES.utf8 +es_PY +es_PY.utf8 +es_UY +es_UY.utf8 +es_VE +es_VE.utf8 +et_EE +et_EE.iso885915 +et_EE.utf8 +eu_ES +eu_ES@euro +eu_ES.utf8 +fi_FI +fi_FI@euro +fi_FI.utf8 +fo_FO +fo_FO.utf8 +fr_BE +fr_BE@euro +fr_BE.utf8 +fr_CA +fr_CA.utf8 +fr_CH +fr_CH.utf8 +fr_FR +fr_FR@euro +fr_FR.utf8 +fr_LU +fr_LU@euro +fr_LU.utf8 +gl_ES +gl_ES@euro +gl_ES.utf8 +hr_HR +hr_HR.utf8 +hu_HU +hu_HU.utf8 +id_ID +id_ID.utf8 +is_IS +is_IS.utf8 +it_CH +it_CH.utf8 +it_IT +it_IT@euro +it_IT.utf8 +ka_GE +ka_GE.utf8 +kk_KZ +kk_KZ.utf8 +kl_GL +kl_GL.utf8 +lt_LT +lt_LT.utf8 +lv_LV +lv_LV.utf8 +mk_MK +mk_MK.utf8 +mn_MN +mn_MN.utf8 +nb_NO +nb_NO.utf8 +nl_BE +nl_BE@euro +nl_BE.utf8 +nl_NL +nl_NL@euro +nl_NL.utf8 +nn_NO +nn_NO.utf8 +no_NO +no_NO.utf8 +oc_FR +oc_FR.utf8 +pl_PL +pl_PL.utf8 +pt_BR +pt_BR.utf8 +pt_PT +pt_PT@euro +pt_PT.utf8 +ro_RO +ro_RO.utf8 +ru_RU +ru_RU.koi8r +ru_RU.utf8 +ru_UA +ru_UA.utf8 +se_NO +se_NO.utf8 +sh_YU +sh_YU.utf8 +sk_SK +sk_SK.utf8 +sl_SI +sl_SI.utf8 +sq_AL +sq_AL.utf8 +sr_CS +sr_CS.utf8 +sv_FI +sv_FI@euro +sv_FI.utf8 +sv_SE +sv_SE.iso885915 +sv_SE.utf8 +tg_TJ +tg_TJ.utf8 +tr_TR +tr_TR.utf8 +tt_RU.utf8 +uk_UA +uk_UA.utf8 +vi_VN +vi_VN.tcvn +wa_BE +wa_BE@euro +wa_BE.utf8 +