diff options
Diffstat (limited to 'cpan/Unicode-Collate/t')
121 files changed, 1357 insertions, 380 deletions
diff --git a/cpan/Unicode-Collate/t/altern.t b/cpan/Unicode-Collate/t/altern.t index c958f4b58f..d87795c18c 100644 --- a/cpan/Unicode-Collate/t/altern.t +++ b/cpan/Unicode-Collate/t/altern.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 37 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..37\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/backwds.t b/cpan/Unicode-Collate/t/backwds.t index 0f60deb192..02309fd994 100644 --- a/cpan/Unicode-Collate/t/backwds.t +++ b/cpan/Unicode-Collate/t/backwds.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 36 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..36\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/cjk_b5.t b/cpan/Unicode-Collate/t/cjk_b5.t index a973a8455d..6039b71a6e 100644 --- a/cpan/Unicode-Collate/t/cjk_b5.t +++ b/cpan/Unicode-Collate/t/cjk_b5.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 28 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..28\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/cjk_gb.t b/cpan/Unicode-Collate/t/cjk_gb.t index f8fed99df2..768faa3dc6 100644 --- a/cpan/Unicode-Collate/t/cjk_gb.t +++ b/cpan/Unicode-Collate/t/cjk_gb.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 25 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..25\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/cjk_ja.t b/cpan/Unicode-Collate/t/cjk_ja.t index cf78472879..9edd5e0cb1 100644 --- a/cpan/Unicode-Collate/t/cjk_ja.t +++ b/cpan/Unicode-Collate/t/cjk_ja.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 33 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..33\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/cjk_ko.t b/cpan/Unicode-Collate/t/cjk_ko.t index 8be7106594..8773c44d40 100644 --- a/cpan/Unicode-Collate/t/cjk_ko.t +++ b/cpan/Unicode-Collate/t/cjk_ko.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 52 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..52\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/cjk_py.t b/cpan/Unicode-Collate/t/cjk_py.t index 04f3eb3b04..e0802f1e2c 100644 --- a/cpan/Unicode-Collate/t/cjk_py.t +++ b/cpan/Unicode-Collate/t/cjk_py.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 19 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..19\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/cjk_st.t b/cpan/Unicode-Collate/t/cjk_st.t index 1528dac7c5..0b232afaf2 100644 --- a/cpan/Unicode-Collate/t/cjk_st.t +++ b/cpan/Unicode-Collate/t/cjk_st.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 26 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..26\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/cjkrange.t b/cpan/Unicode-Collate/t/cjkrange.t index 144d123d22..37fb9fd279 100644 --- a/cpan/Unicode-Collate/t/cjkrange.t +++ b/cpan/Unicode-Collate/t/cjkrange.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 321 }; # 1 + 40 x @Versions - use strict; use warnings; +BEGIN { $| = 1; print "1..379\n"; } # 1 + 42 x @Versions +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); @@ -34,13 +42,14 @@ my $coll = Unicode::Collate->new( # 9FA6..9FBB are CJK UI since UCA_Version 14 (Unicode 4.1). # 9FBC..9FC3 are CJK UI since UCA_Version 18 (Unicode 5.1). # 9FC4..9FCB are CJK UI since UCA_Version 20 (Unicode 5.2). +# 9FCC is CJK UI since UCA_Version 24 (Unicode 6.1). # 3400..4DB5 are CJK UI Ext.A since UCA_Version 8 (Unicode 3.0). # 20000..2A6D6 are CJK UI Ext.B since UCA_Version 8 (Unicode 3.1). # 2A700..2B734 are CJK UI Ext.C since UCA_Version 20 (Unicode 5.2). # 2B740..2B81D are CJK UI Ext.D since UCA_Version 22 (Unicode 6.0). -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24); for my $v (@Versions) { $coll->change(UCA_Version => $v); @@ -54,7 +63,8 @@ for my $v (@Versions) { ok($coll->cmp("\x{3400}", "\x{9FC3}") == ($v >= 18 ? 1 : -1)); # new ok($coll->cmp("\x{3400}", "\x{9FC4}") == ($v >= 20 ? 1 : -1)); # new ok($coll->cmp("\x{3400}", "\x{9FCB}") == ($v >= 20 ? 1 : -1)); # new - ok($coll->cmp("\x{3400}", "\x{9FCC}") == -1); # na + ok($coll->cmp("\x{3400}", "\x{9FCC}") == ($v >= 24 ? 1 : -1)); # new + ok($coll->cmp("\x{3400}", "\x{9FCD}") == -1); # na ok($coll->cmp("\x{3400}", "\x{9FFF}") == -1); # na # UI < UI @@ -65,8 +75,9 @@ for my $v (@Versions) { ok($coll->cmp("\x{9FBC}", "\x{9FC3}") == -1); # new < new ok($coll->cmp("\x{9FC3}", "\x{9FC4}") == -1); # new < new ok($coll->cmp("\x{9FC4}", "\x{9FCB}") == -1); # new < new - ok($coll->cmp("\x{9FCB}", "\x{9FCC}") == -1); # new < na - ok($coll->cmp("\x{9FCC}", "\x{9FFF}") == -1); # na < na + ok($coll->cmp("\x{9FCB}", "\x{9FCC}") == -1); # new < new + ok($coll->cmp("\x{9FCC}", "\x{9FCD}") == -1); # new < na + ok($coll->cmp("\x{9FCD}", "\x{9FFF}") == -1); # na < na # Ext.A < Ext.B ok($coll->cmp("\x{3400}", "\x{20000}") == -1); diff --git a/cpan/Unicode-Collate/t/compatui.t b/cpan/Unicode-Collate/t/compatui.t index 769debf2c6..6fb01b892c 100644 --- a/cpan/Unicode-Collate/t/compatui.t +++ b/cpan/Unicode-Collate/t/compatui.t @@ -11,18 +11,26 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 561 }; # 1 + 70 x @Versions - use strict; use warnings; +BEGIN { $| = 1; print "1..631\n"; } # 1 + 70 x @Versions +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); ######################### -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24); # 12 compatibility ideographs are treated as unified ideographs: # FA0E, FA0F, FA11, FA13, FA14, FA1F, FA21, FA23, FA24, FA27, FA28, FA29. diff --git a/cpan/Unicode-Collate/t/contract.t b/cpan/Unicode-Collate/t/contract.t index f66733bba6..da7e967ec9 100644 --- a/cpan/Unicode-Collate/t/contract.t +++ b/cpan/Unicode-Collate/t/contract.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 74 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..74\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/default.t b/cpan/Unicode-Collate/t/default.t index e3ada75ef3..bec9c294fd 100644 --- a/cpan/Unicode-Collate/t/default.t +++ b/cpan/Unicode-Collate/t/default.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 60 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..60\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/hangtype.t b/cpan/Unicode-Collate/t/hangtype.t index 6932854b20..b85a308f12 100644 --- a/cpan/Unicode-Collate/t/hangtype.t +++ b/cpan/Unicode-Collate/t/hangtype.t @@ -11,18 +11,26 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 401 }; # 1 + 50 x @Versions - use strict; use warnings; +BEGIN { $| = 1; print "1..451\n"; } # 1 + 50 x @Versions +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); ######################### -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24); for my $v (@Versions) { ok(Unicode::Collate::getHST(0x0000, $v), ''); diff --git a/cpan/Unicode-Collate/t/hangul.t b/cpan/Unicode-Collate/t/hangul.t index 702f8f7564..9df23448d7 100644 --- a/cpan/Unicode-Collate/t/hangul.t +++ b/cpan/Unicode-Collate/t/hangul.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 72 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..72\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/iglevel2.t b/cpan/Unicode-Collate/t/iglevel2.t index 75915ff979..ff519aa076 100644 --- a/cpan/Unicode-Collate/t/iglevel2.t +++ b/cpan/Unicode-Collate/t/iglevel2.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 42 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..42\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/ignor.t b/cpan/Unicode-Collate/t/ignor.t index 693bbfe0d0..6e4a4e8cf9 100644 --- a/cpan/Unicode-Collate/t/ignor.t +++ b/cpan/Unicode-Collate/t/ignor.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 41 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..41\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/illegal.t b/cpan/Unicode-Collate/t/illegal.t index 982518ffc8..5d7999df52 100644 --- a/cpan/Unicode-Collate/t/illegal.t +++ b/cpan/Unicode-Collate/t/illegal.t @@ -11,9 +11,6 @@ BEGIN { } } -use Test; -use strict; -use warnings; BEGIN { use Unicode::Collate; @@ -26,7 +23,18 @@ BEGIN { } } -BEGIN { plan tests => 65 }; +use strict; +use warnings; +BEGIN { $| = 1; print "1..65\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} ok(1); diff --git a/cpan/Unicode-Collate/t/illegalp.t b/cpan/Unicode-Collate/t/illegalp.t index ff1936d353..2cdd590daa 100644 --- a/cpan/Unicode-Collate/t/illegalp.t +++ b/cpan/Unicode-Collate/t/illegalp.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 17 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..17\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + ok(1); diff --git a/cpan/Unicode-Collate/t/index.t b/cpan/Unicode-Collate/t/index.t index f829c5939c..b3433a9e5f 100644 --- a/cpan/Unicode-Collate/t/index.t +++ b/cpan/Unicode-Collate/t/index.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 71 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..71\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_af.t b/cpan/Unicode-Collate/t/loc_af.t index 32b11bf45b..7756c04bf1 100644 --- a/cpan/Unicode-Collate/t/loc_af.t +++ b/cpan/Unicode-Collate/t/loc_af.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 8 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..8\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ar.t b/cpan/Unicode-Collate/t/loc_ar.t index 4faabda1c6..ada2ba37bf 100644 --- a/cpan/Unicode-Collate/t/loc_ar.t +++ b/cpan/Unicode-Collate/t/loc_ar.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 30 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..30\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_as.t b/cpan/Unicode-Collate/t/loc_as.t index 12e513fb40..5fc9527571 100644 --- a/cpan/Unicode-Collate/t/loc_as.t +++ b/cpan/Unicode-Collate/t/loc_as.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 10 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..10\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_az.t b/cpan/Unicode-Collate/t/loc_az.t index a370a1ac51..5f9374a495 100644 --- a/cpan/Unicode-Collate/t/loc_az.t +++ b/cpan/Unicode-Collate/t/loc_az.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 72 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..72\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_be.t b/cpan/Unicode-Collate/t/loc_be.t index 95f35b7fc3..22a045c29a 100644 --- a/cpan/Unicode-Collate/t/loc_be.t +++ b/cpan/Unicode-Collate/t/loc_be.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 189 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..189\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_bg.t b/cpan/Unicode-Collate/t/loc_bg.t index 2299d391dd..a17ef54012 100644 --- a/cpan/Unicode-Collate/t/loc_bg.t +++ b/cpan/Unicode-Collate/t/loc_bg.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 202 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..202\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_bn.t b/cpan/Unicode-Collate/t/loc_bn.t index 052040e3c4..50c6abc75c 100644 --- a/cpan/Unicode-Collate/t/loc_bn.t +++ b/cpan/Unicode-Collate/t/loc_bn.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 6 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..6\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_bs.t b/cpan/Unicode-Collate/t/loc_bs.t index 0ffec2c01b..9325f7597e 100644 --- a/cpan/Unicode-Collate/t/loc_bs.t +++ b/cpan/Unicode-Collate/t/loc_bs.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 118 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..118\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ca.t b/cpan/Unicode-Collate/t/loc_ca.t index 5569cccd8e..f574595749 100644 --- a/cpan/Unicode-Collate/t/loc_ca.t +++ b/cpan/Unicode-Collate/t/loc_ca.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 41 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..41\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_cjk.t b/cpan/Unicode-Collate/t/loc_cjk.t index e7bf40b922..60881e6858 100644 --- a/cpan/Unicode-Collate/t/loc_cjk.t +++ b/cpan/Unicode-Collate/t/loc_cjk.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 2692 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..2692\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_cjkc.t b/cpan/Unicode-Collate/t/loc_cjkc.t index c4fec7c006..12f2afa0bb 100644 --- a/cpan/Unicode-Collate/t/loc_cjkc.t +++ b/cpan/Unicode-Collate/t/loc_cjkc.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 7008 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..7022\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); @@ -785,6 +793,7 @@ for my $obj ($objDefault, $objB, $objG, $objJ, $objK, $objP, $objS) { ok($obj->eq("\x{908F}", "\x{F913}")); ok($obj->eq("\x{9094}", "\x{2F9E2}")); ok($obj->eq("\x{90CE}", "\x{F92C}")); + ok($obj->eq("\x{90DE}", "\x{FA2E}")); ok($obj->eq("\x{90F1}", "\x{2F9E3}")); ok($obj->eq("\x{90FD}", "\x{FA26}")); ok($obj->eq("\x{9111}", "\x{2F9E4}")); @@ -816,6 +825,7 @@ for my $obj ($objDefault, $objB, $objG, $objJ, $objK, $objP, $objS) { ok($obj->eq("\x{967C}", "\x{FAC6}")); ok($obj->eq("\x{9686}", "\x{F9DC}")); ok($obj->eq("\x{96A3}", "\x{F9F1}")); + ok($obj->eq("\x{96B7}", "\x{FA2F}")); ok($obj->eq("\x{96B8}", "\x{F9B8}")); ok($obj->eq("\x{96C3}", "\x{2F9F3}")); ok($obj->eq("\x{96E2}", "\x{F9EA}")); diff --git a/cpan/Unicode-Collate/t/loc_cs.t b/cpan/Unicode-Collate/t/loc_cs.t index de04fdcd5d..0c27c8bd62 100644 --- a/cpan/Unicode-Collate/t/loc_cs.t +++ b/cpan/Unicode-Collate/t/loc_cs.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 34 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..34\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_cy.t b/cpan/Unicode-Collate/t/loc_cy.t index 24f9eeacb1..9daf66167b 100644 --- a/cpan/Unicode-Collate/t/loc_cy.t +++ b/cpan/Unicode-Collate/t/loc_cy.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 74 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..74\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_cyrl.t b/cpan/Unicode-Collate/t/loc_cyrl.t index eee5639b14..47cb27d9aa 100644 --- a/cpan/Unicode-Collate/t/loc_cyrl.t +++ b/cpan/Unicode-Collate/t/loc_cyrl.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 130 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..130\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_da.t b/cpan/Unicode-Collate/t/loc_da.t index f8ca07dbd2..48639e2aad 100644 --- a/cpan/Unicode-Collate/t/loc_da.t +++ b/cpan/Unicode-Collate/t/loc_da.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 117 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..117\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_de.t b/cpan/Unicode-Collate/t/loc_de.t index 6908b098d1..402be02767 100644 --- a/cpan/Unicode-Collate/t/loc_de.t +++ b/cpan/Unicode-Collate/t/loc_de.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 32 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..32\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_deph.t b/cpan/Unicode-Collate/t/loc_deph.t index 0f0b15033f..a9c9d2b5ba 100644 --- a/cpan/Unicode-Collate/t/loc_deph.t +++ b/cpan/Unicode-Collate/t/loc_deph.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 42 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..42\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_eo.t b/cpan/Unicode-Collate/t/loc_eo.t index 5fdec234bc..997a0458ea 100644 --- a/cpan/Unicode-Collate/t/loc_eo.t +++ b/cpan/Unicode-Collate/t/loc_eo.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 38 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..38\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_es.t b/cpan/Unicode-Collate/t/loc_es.t index 50fb554c28..78bd39d905 100644 --- a/cpan/Unicode-Collate/t/loc_es.t +++ b/cpan/Unicode-Collate/t/loc_es.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 29 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..29\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); @@ -26,7 +34,7 @@ my $objEs = Unicode::Collate::Locale-> new(locale => 'ES', normalization => undef); ok($objEs->getlocale, 'es'); -ok($objEs->locale_version, 0.87); +ok($objEs->locale_version, 0.88); $objEs->change(level => 1); diff --git a/cpan/Unicode-Collate/t/loc_estr.t b/cpan/Unicode-Collate/t/loc_estr.t index 539131e25b..3e814179e1 100644 --- a/cpan/Unicode-Collate/t/loc_estr.t +++ b/cpan/Unicode-Collate/t/loc_estr.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 27 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..27\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); @@ -26,7 +34,7 @@ my $objEsTrad = Unicode::Collate::Locale-> new(locale => 'ES-trad', normalization => undef); ok($objEsTrad->getlocale, 'es__traditional'); -ok($objEsTrad->locale_version, 0.87); +ok($objEsTrad->locale_version, 0.88); $objEsTrad->change(level => 1); diff --git a/cpan/Unicode-Collate/t/loc_et.t b/cpan/Unicode-Collate/t/loc_et.t index c6e3053373..5a6a774cb6 100644 --- a/cpan/Unicode-Collate/t/loc_et.t +++ b/cpan/Unicode-Collate/t/loc_et.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 61 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..61\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_fa.t b/cpan/Unicode-Collate/t/loc_fa.t index 6f18df05db..1ac1b044c3 100644 --- a/cpan/Unicode-Collate/t/loc_fa.t +++ b/cpan/Unicode-Collate/t/loc_fa.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 81 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..81\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_fi.t b/cpan/Unicode-Collate/t/loc_fi.t index f555c19bef..d4605329d2 100644 --- a/cpan/Unicode-Collate/t/loc_fi.t +++ b/cpan/Unicode-Collate/t/loc_fi.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 83 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..83\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_fil.t b/cpan/Unicode-Collate/t/loc_fil.t index bfa83af460..379d28519f 100644 --- a/cpan/Unicode-Collate/t/loc_fil.t +++ b/cpan/Unicode-Collate/t/loc_fil.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 14 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..14\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_fiph.t b/cpan/Unicode-Collate/t/loc_fiph.t index 621d5ac320..ba08bcb9e6 100644 --- a/cpan/Unicode-Collate/t/loc_fiph.t +++ b/cpan/Unicode-Collate/t/loc_fiph.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 83 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..83\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_fo.t b/cpan/Unicode-Collate/t/loc_fo.t index 0a75f71d5d..c0aa761f17 100644 --- a/cpan/Unicode-Collate/t/loc_fo.t +++ b/cpan/Unicode-Collate/t/loc_fo.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 105 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..105\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_fr.t b/cpan/Unicode-Collate/t/loc_fr.t index 20579253bc..66eff34b4c 100644 --- a/cpan/Unicode-Collate/t/loc_fr.t +++ b/cpan/Unicode-Collate/t/loc_fr.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 27 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..27\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_gu.t b/cpan/Unicode-Collate/t/loc_gu.t index e9b7e30310..7b986620a9 100644 --- a/cpan/Unicode-Collate/t/loc_gu.t +++ b/cpan/Unicode-Collate/t/loc_gu.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 7 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..7\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ha.t b/cpan/Unicode-Collate/t/loc_ha.t index 0305a96bff..17af493106 100644 --- a/cpan/Unicode-Collate/t/loc_ha.t +++ b/cpan/Unicode-Collate/t/loc_ha.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 51 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..51\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_haw.t b/cpan/Unicode-Collate/t/loc_haw.t index 3194da4605..660cb0937c 100644 --- a/cpan/Unicode-Collate/t/loc_haw.t +++ b/cpan/Unicode-Collate/t/loc_haw.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 49 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..49\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_hi.t b/cpan/Unicode-Collate/t/loc_hi.t index d77831ebba..eadca6fb35 100644 --- a/cpan/Unicode-Collate/t/loc_hi.t +++ b/cpan/Unicode-Collate/t/loc_hi.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 7 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..7\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_hr.t b/cpan/Unicode-Collate/t/loc_hr.t index 223aef43c0..7d49e6b33c 100644 --- a/cpan/Unicode-Collate/t/loc_hr.t +++ b/cpan/Unicode-Collate/t/loc_hr.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 118 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..118\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_hu.t b/cpan/Unicode-Collate/t/loc_hu.t index b70907c074..c8ef8d3e78 100644 --- a/cpan/Unicode-Collate/t/loc_hu.t +++ b/cpan/Unicode-Collate/t/loc_hu.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 235 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..235\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_hy.t b/cpan/Unicode-Collate/t/loc_hy.t index e823aa5531..8719fa5d94 100644 --- a/cpan/Unicode-Collate/t/loc_hy.t +++ b/cpan/Unicode-Collate/t/loc_hy.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 13 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..13\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ig.t b/cpan/Unicode-Collate/t/loc_ig.t index 09e39d5fc1..1c0f74b5e0 100644 --- a/cpan/Unicode-Collate/t/loc_ig.t +++ b/cpan/Unicode-Collate/t/loc_ig.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 108 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..108\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_is.t b/cpan/Unicode-Collate/t/loc_is.t index 181dcbcf07..c4cd2b4c27 100644 --- a/cpan/Unicode-Collate/t/loc_is.t +++ b/cpan/Unicode-Collate/t/loc_is.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 110 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..110\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ja.t b/cpan/Unicode-Collate/t/loc_ja.t index c25f544791..c4353d61f3 100644 --- a/cpan/Unicode-Collate/t/loc_ja.t +++ b/cpan/Unicode-Collate/t/loc_ja.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 497 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..497\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_jait.t b/cpan/Unicode-Collate/t/loc_jait.t index 4b0f031dad..70d7b57fe2 100644 --- a/cpan/Unicode-Collate/t/loc_jait.t +++ b/cpan/Unicode-Collate/t/loc_jait.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 759 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..759\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_japr.t b/cpan/Unicode-Collate/t/loc_japr.t index 86dff87ab6..4b7b67b062 100644 --- a/cpan/Unicode-Collate/t/loc_japr.t +++ b/cpan/Unicode-Collate/t/loc_japr.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 602 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..602\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_kk.t b/cpan/Unicode-Collate/t/loc_kk.t index 33bc6bd069..ef8b7d4686 100644 --- a/cpan/Unicode-Collate/t/loc_kk.t +++ b/cpan/Unicode-Collate/t/loc_kk.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 211 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..211\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_kl.t b/cpan/Unicode-Collate/t/loc_kl.t index a8a07d3e02..3e1197ef61 100644 --- a/cpan/Unicode-Collate/t/loc_kl.t +++ b/cpan/Unicode-Collate/t/loc_kl.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 101 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..101\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_kn.t b/cpan/Unicode-Collate/t/loc_kn.t index bb31bfb82d..6ac2f52a46 100644 --- a/cpan/Unicode-Collate/t/loc_kn.t +++ b/cpan/Unicode-Collate/t/loc_kn.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 7 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..7\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ko.t b/cpan/Unicode-Collate/t/loc_ko.t index d680f67639..2fb0da7dad 100644 --- a/cpan/Unicode-Collate/t/loc_ko.t +++ b/cpan/Unicode-Collate/t/loc_ko.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 52 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..52\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_kok.t b/cpan/Unicode-Collate/t/loc_kok.t index d6cce3a32b..b2f23a18d3 100644 --- a/cpan/Unicode-Collate/t/loc_kok.t +++ b/cpan/Unicode-Collate/t/loc_kok.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 13 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..13\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ln.t b/cpan/Unicode-Collate/t/loc_ln.t index 02f6c31649..b3e46fa7fe 100644 --- a/cpan/Unicode-Collate/t/loc_ln.t +++ b/cpan/Unicode-Collate/t/loc_ln.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 23 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..23\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_lt.t b/cpan/Unicode-Collate/t/loc_lt.t index d8babbad3c..b2340f6783 100644 --- a/cpan/Unicode-Collate/t/loc_lt.t +++ b/cpan/Unicode-Collate/t/loc_lt.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 69 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..69\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_lv.t b/cpan/Unicode-Collate/t/loc_lv.t index f67d82db08..f8593341bf 100644 --- a/cpan/Unicode-Collate/t/loc_lv.t +++ b/cpan/Unicode-Collate/t/loc_lv.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 50 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..50\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_mk.t b/cpan/Unicode-Collate/t/loc_mk.t index 61bdaed3e3..c0f75b54a9 100644 --- a/cpan/Unicode-Collate/t/loc_mk.t +++ b/cpan/Unicode-Collate/t/loc_mk.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 202 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..202\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ml.t b/cpan/Unicode-Collate/t/loc_ml.t index 9ffdde722f..fca789fafe 100644 --- a/cpan/Unicode-Collate/t/loc_ml.t +++ b/cpan/Unicode-Collate/t/loc_ml.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 36 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..36\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_mr.t b/cpan/Unicode-Collate/t/loc_mr.t index d1e07a550c..dd66b4ee85 100644 --- a/cpan/Unicode-Collate/t/loc_mr.t +++ b/cpan/Unicode-Collate/t/loc_mr.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 14 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..14\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_mt.t b/cpan/Unicode-Collate/t/loc_mt.t index 3f027bb858..f582accd3a 100644 --- a/cpan/Unicode-Collate/t/loc_mt.t +++ b/cpan/Unicode-Collate/t/loc_mt.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 50 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..50\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_nb.t b/cpan/Unicode-Collate/t/loc_nb.t index 9cccbd5f43..c3bc54a34a 100644 --- a/cpan/Unicode-Collate/t/loc_nb.t +++ b/cpan/Unicode-Collate/t/loc_nb.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 101 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..101\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_nn.t b/cpan/Unicode-Collate/t/loc_nn.t index bed31a075f..671eff7ab4 100644 --- a/cpan/Unicode-Collate/t/loc_nn.t +++ b/cpan/Unicode-Collate/t/loc_nn.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 101 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..101\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_nso.t b/cpan/Unicode-Collate/t/loc_nso.t index 402e25ada1..f455c67382 100644 --- a/cpan/Unicode-Collate/t/loc_nso.t +++ b/cpan/Unicode-Collate/t/loc_nso.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 40 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..40\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_om.t b/cpan/Unicode-Collate/t/loc_om.t index eba364fb8a..74e6ce501d 100644 --- a/cpan/Unicode-Collate/t/loc_om.t +++ b/cpan/Unicode-Collate/t/loc_om.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 41 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..41\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_or.t b/cpan/Unicode-Collate/t/loc_or.t index 1f94fd9554..ef5bf6a6a8 100644 --- a/cpan/Unicode-Collate/t/loc_or.t +++ b/cpan/Unicode-Collate/t/loc_or.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 10 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..10\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_pa.t b/cpan/Unicode-Collate/t/loc_pa.t index 811ee78d61..6c13e40777 100644 --- a/cpan/Unicode-Collate/t/loc_pa.t +++ b/cpan/Unicode-Collate/t/loc_pa.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 41 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..41\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_pl.t b/cpan/Unicode-Collate/t/loc_pl.t index a4f07ad11f..ba4fb7eab1 100644 --- a/cpan/Unicode-Collate/t/loc_pl.t +++ b/cpan/Unicode-Collate/t/loc_pl.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 65 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..65\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ro.t b/cpan/Unicode-Collate/t/loc_ro.t index ec1b16beef..ff213981ce 100644 --- a/cpan/Unicode-Collate/t/loc_ro.t +++ b/cpan/Unicode-Collate/t/loc_ro.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 71 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..71\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ru.t b/cpan/Unicode-Collate/t/loc_ru.t index a814897eb8..0ee7fe373f 100644 --- a/cpan/Unicode-Collate/t/loc_ru.t +++ b/cpan/Unicode-Collate/t/loc_ru.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 202 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..202\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_sa.t b/cpan/Unicode-Collate/t/loc_sa.t index 1ee3b2a5cf..64e714bcbe 100644 --- a/cpan/Unicode-Collate/t/loc_sa.t +++ b/cpan/Unicode-Collate/t/loc_sa.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 14 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..14\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_se.t b/cpan/Unicode-Collate/t/loc_se.t index 718b5df022..5e46a21d4d 100644 --- a/cpan/Unicode-Collate/t/loc_se.t +++ b/cpan/Unicode-Collate/t/loc_se.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 217 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..217\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_si.t b/cpan/Unicode-Collate/t/loc_si.t index 1c994f5acf..0a9d3bb507 100644 --- a/cpan/Unicode-Collate/t/loc_si.t +++ b/cpan/Unicode-Collate/t/loc_si.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 8 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..8\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_sidt.t b/cpan/Unicode-Collate/t/loc_sidt.t index 42fb5609ee..980edd894a 100644 --- a/cpan/Unicode-Collate/t/loc_sidt.t +++ b/cpan/Unicode-Collate/t/loc_sidt.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 9 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..9\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_sk.t b/cpan/Unicode-Collate/t/loc_sk.t index c6ad615b58..1367076832 100644 --- a/cpan/Unicode-Collate/t/loc_sk.t +++ b/cpan/Unicode-Collate/t/loc_sk.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 58 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..58\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_sl.t b/cpan/Unicode-Collate/t/loc_sl.t index 8fb595d369..56dee6000b 100644 --- a/cpan/Unicode-Collate/t/loc_sl.t +++ b/cpan/Unicode-Collate/t/loc_sl.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 20 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..20\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_sq.t b/cpan/Unicode-Collate/t/loc_sq.t index 16c8f1cb96..6f29c4f035 100644 --- a/cpan/Unicode-Collate/t/loc_sq.t +++ b/cpan/Unicode-Collate/t/loc_sq.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 126 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..126\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_sr.t b/cpan/Unicode-Collate/t/loc_sr.t index ab2547f4df..1b031048c7 100644 --- a/cpan/Unicode-Collate/t/loc_sr.t +++ b/cpan/Unicode-Collate/t/loc_sr.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 210 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..210\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_srla.t b/cpan/Unicode-Collate/t/loc_srla.t index 9b6ba0a927..c30ae69a0c 100644 --- a/cpan/Unicode-Collate/t/loc_srla.t +++ b/cpan/Unicode-Collate/t/loc_srla.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 118 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..118\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_sv.t b/cpan/Unicode-Collate/t/loc_sv.t index 4d7c85034b..0d250f55f8 100644 --- a/cpan/Unicode-Collate/t/loc_sv.t +++ b/cpan/Unicode-Collate/t/loc_sv.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 115 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..115\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_svrf.t b/cpan/Unicode-Collate/t/loc_svrf.t index 8fc90a8bd3..38a47c2503 100644 --- a/cpan/Unicode-Collate/t/loc_svrf.t +++ b/cpan/Unicode-Collate/t/loc_svrf.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 115 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..115\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_sw.t b/cpan/Unicode-Collate/t/loc_sw.t index 9b1e78685c..74d6710b2a 100644 --- a/cpan/Unicode-Collate/t/loc_sw.t +++ b/cpan/Unicode-Collate/t/loc_sw.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 17 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..17\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ta.t b/cpan/Unicode-Collate/t/loc_ta.t index 710860ec9a..6341829038 100644 --- a/cpan/Unicode-Collate/t/loc_ta.t +++ b/cpan/Unicode-Collate/t/loc_ta.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 52 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..52\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_te.t b/cpan/Unicode-Collate/t/loc_te.t index 38f68d062c..133cabfd31 100644 --- a/cpan/Unicode-Collate/t/loc_te.t +++ b/cpan/Unicode-Collate/t/loc_te.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 6 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..6\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_test.t b/cpan/Unicode-Collate/t/loc_test.t index 84eb85fd58..ba643083c3 100644 --- a/cpan/Unicode-Collate/t/loc_test.t +++ b/cpan/Unicode-Collate/t/loc_test.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 130 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..130\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_th.t b/cpan/Unicode-Collate/t/loc_th.t index c7833b70da..0c992f6aea 100644 --- a/cpan/Unicode-Collate/t/loc_th.t +++ b/cpan/Unicode-Collate/t/loc_th.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 25 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..25\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_tn.t b/cpan/Unicode-Collate/t/loc_tn.t index c068a5d791..b0944c1c5d 100644 --- a/cpan/Unicode-Collate/t/loc_tn.t +++ b/cpan/Unicode-Collate/t/loc_tn.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 40 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..40\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_to.t b/cpan/Unicode-Collate/t/loc_to.t index aa71033875..55aadde6e1 100644 --- a/cpan/Unicode-Collate/t/loc_to.t +++ b/cpan/Unicode-Collate/t/loc_to.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 132 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..132\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_tr.t b/cpan/Unicode-Collate/t/loc_tr.t index 26b3808f25..c6102ed299 100644 --- a/cpan/Unicode-Collate/t/loc_tr.t +++ b/cpan/Unicode-Collate/t/loc_tr.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 57 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..57\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_uk.t b/cpan/Unicode-Collate/t/loc_uk.t index cda53dfaad..df3a6e7be7 100644 --- a/cpan/Unicode-Collate/t/loc_uk.t +++ b/cpan/Unicode-Collate/t/loc_uk.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 208 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..208\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_ur.t b/cpan/Unicode-Collate/t/loc_ur.t index 4e173fec01..d614cd1e3c 100644 --- a/cpan/Unicode-Collate/t/loc_ur.t +++ b/cpan/Unicode-Collate/t/loc_ur.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 91 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..91\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_vi.t b/cpan/Unicode-Collate/t/loc_vi.t index 543d5797ba..a0e8969b26 100644 --- a/cpan/Unicode-Collate/t/loc_vi.t +++ b/cpan/Unicode-Collate/t/loc_vi.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 424 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..424\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_wae.t b/cpan/Unicode-Collate/t/loc_wae.t index aaaa6eee37..882b112ae9 100644 --- a/cpan/Unicode-Collate/t/loc_wae.t +++ b/cpan/Unicode-Collate/t/loc_wae.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 78 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..78\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_wo.t b/cpan/Unicode-Collate/t/loc_wo.t index 3abbf102b4..ece0f34946 100644 --- a/cpan/Unicode-Collate/t/loc_wo.t +++ b/cpan/Unicode-Collate/t/loc_wo.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 40 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..40\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_yo.t b/cpan/Unicode-Collate/t/loc_yo.t index 952f62366f..6c37bb8c53 100644 --- a/cpan/Unicode-Collate/t/loc_yo.t +++ b/cpan/Unicode-Collate/t/loc_yo.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 33 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..33\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_zh.t b/cpan/Unicode-Collate/t/loc_zh.t index f350e9220e..f6f767daf3 100644 --- a/cpan/Unicode-Collate/t/loc_zh.t +++ b/cpan/Unicode-Collate/t/loc_zh.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 280 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..280\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_zhb5.t b/cpan/Unicode-Collate/t/loc_zhb5.t index 6484e0130e..789cfb6649 100644 --- a/cpan/Unicode-Collate/t/loc_zhb5.t +++ b/cpan/Unicode-Collate/t/loc_zhb5.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 302 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..302\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_zhgb.t b/cpan/Unicode-Collate/t/loc_zhgb.t index c13bcff196..90464684e6 100644 --- a/cpan/Unicode-Collate/t/loc_zhgb.t +++ b/cpan/Unicode-Collate/t/loc_zhgb.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 298 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..298\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_zhpy.t b/cpan/Unicode-Collate/t/loc_zhpy.t index f4e6e6747b..1481deeb2a 100644 --- a/cpan/Unicode-Collate/t/loc_zhpy.t +++ b/cpan/Unicode-Collate/t/loc_zhpy.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 292 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..292\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/loc_zhst.t b/cpan/Unicode-Collate/t/loc_zhst.t index ee71d5c6cb..5c35f2afd1 100644 --- a/cpan/Unicode-Collate/t/loc_zhst.t +++ b/cpan/Unicode-Collate/t/loc_zhst.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 300 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..300\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate::Locale; ok(1); diff --git a/cpan/Unicode-Collate/t/nonchar.t b/cpan/Unicode-Collate/t/nonchar.t index d789307b48..26a50e2b9a 100644 --- a/cpan/Unicode-Collate/t/nonchar.t +++ b/cpan/Unicode-Collate/t/nonchar.t @@ -11,9 +11,6 @@ BEGIN { } } -use Test; -use strict; -use warnings; BEGIN { use Unicode::Collate; @@ -26,7 +23,18 @@ BEGIN { } } -BEGIN { plan tests => 61 }; # 1 + 30 * 2 +use strict; +use warnings; +BEGIN { $| = 1; print "1..61\n"; } # 1 + 30 * 2 +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} ok(1); diff --git a/cpan/Unicode-Collate/t/normal.t b/cpan/Unicode-Collate/t/normal.t index 57ea03368b..8de502e0db 100644 --- a/cpan/Unicode-Collate/t/normal.t +++ b/cpan/Unicode-Collate/t/normal.t @@ -18,11 +18,19 @@ BEGIN { exit; } } -use Test; -BEGIN { plan tests => 100 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..100\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; our $Aring = pack('U', 0xC5); diff --git a/cpan/Unicode-Collate/t/overcjk0.t b/cpan/Unicode-Collate/t/overcjk0.t index 1dba193f61..588e8a8c02 100644 --- a/cpan/Unicode-Collate/t/overcjk0.t +++ b/cpan/Unicode-Collate/t/overcjk0.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 246 }; # 6 + 30 x @Versions - use strict; use warnings; +BEGIN { $| = 1; print "1..285\n"; } # 6 + 31 x @Versions +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); @@ -47,13 +55,14 @@ ok($ignoreCJK->lt("Pe\x{5B57}rl", "Perl")); # 'r' is unassigned. # 9FA6..9FBB are CJK UI since UCA_Version 14 (Unicode 4.1). # 9FBC..9FC3 are CJK UI since UCA_Version 18 (Unicode 5.1). # 9FC4..9FCB are CJK UI since UCA_Version 20 (Unicode 5.2). +# 9FCC is CJK UI since UCA_Version 24 (Unicode 6.1). # 3400..4DB5 are CJK UI Ext.A since UCA_Version 8 (Unicode 3.0). # 20000..2A6D6 are CJK UI Ext.B since UCA_Version 8 (Unicode 3.1). # 2A700..2B734 are CJK UI Ext.C since UCA_Version 20 (Unicode 5.2). # 2B740..2B81D are CJK UI Ext.D since UCA_Version 22 (Unicode 6.0). -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24); for my $v (@Versions) { $ignoreCJK->change(UCA_Version => $v); @@ -71,7 +80,8 @@ for my $v (@Versions) { ok($ignoreCJK->cmp("\x{9FC3}", "") == ($v >= 18 ? 0 : 1)); ok($ignoreCJK->cmp("\x{9FC4}", "") == ($v >= 20 ? 0 : 1)); ok($ignoreCJK->cmp("\x{9FCB}", "") == ($v >= 20 ? 0 : 1)); - ok($ignoreCJK->cmp("\x{9FCC}", "") == 1); + ok($ignoreCJK->cmp("\x{9FCC}", "") == ($v >= 24 ? 0 : 1)); + ok($ignoreCJK->cmp("\x{9FCD}", "") == 1); ok($ignoreCJK->cmp("\x{9FCF}", "") == 1); # Ext.A diff --git a/cpan/Unicode-Collate/t/overcjk1.t b/cpan/Unicode-Collate/t/overcjk1.t index 600f0ad586..dc3ae8f23b 100644 --- a/cpan/Unicode-Collate/t/overcjk1.t +++ b/cpan/Unicode-Collate/t/overcjk1.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 131 }; # 11 + 15 x @Versions - use strict; use warnings; +BEGIN { $| = 1; print "1..155\n"; } # 11 + 16 x @Versions +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); @@ -52,8 +60,9 @@ ok($overCJK->lt("a\x{4E03}", "A\x{4E01}")); # 9FA6..9FBB are CJK UI since UCA_Version 14 (Unicode 4.1). # 9FBC..9FC3 are CJK UI since UCA_Version 18 (Unicode 5.1). # 9FC4..9FCB are CJK UI since UCA_Version 20 (Unicode 5.2). +# 9FCC is CJK UI since UCA_Version 24 (Unicode 6.1). -my @Versions = (8, 9, 11, 14, 16, 18, 20, 22); +my @Versions = (8, 9, 11, 14, 16, 18, 20, 22, 24); for my $v (@Versions) { $overCJK->change(UCA_Version => $v); @@ -70,7 +79,8 @@ for my $v (@Versions) { ok($overCJK->cmp("a\x{9FC3}", "A\x{9FC4}") == ($v >= 20 ? 1 : -1)); ok($overCJK->cmp("a\x{9FC4}", "A\x{9FCA}") == ($v >= 20 ? 1 : -1)); ok($overCJK->cmp("a\x{9FCA}", "A\x{9FCB}") == ($v >= 20 ? 1 : -1)); - ok($overCJK->cmp("a\x{9FCB}", "A\x{9FCC}") == -1); - ok($overCJK->cmp("a\x{9FCC}", "A\x{9FCF}") == -1); + ok($overCJK->cmp("a\x{9FCB}", "A\x{9FCC}") == ($v >= 24 ? 1 : -1)); + ok($overCJK->cmp("a\x{9FCC}", "A\x{9FCD}") == -1); + ok($overCJK->cmp("a\x{9FCD}", "A\x{9FCF}") == -1); } diff --git a/cpan/Unicode-Collate/t/override.t b/cpan/Unicode-Collate/t/override.t index bb15ffdfe7..bc6a70c361 100644 --- a/cpan/Unicode-Collate/t/override.t +++ b/cpan/Unicode-Collate/t/override.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 35 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..35\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/rearrang.t b/cpan/Unicode-Collate/t/rearrang.t index 78f77e60cd..dd48af83cc 100644 --- a/cpan/Unicode-Collate/t/rearrang.t +++ b/cpan/Unicode-Collate/t/rearrang.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 23 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..23\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/rewrite.t b/cpan/Unicode-Collate/t/rewrite.t index 004a0c9647..7c58e16321 100644 --- a/cpan/Unicode-Collate/t/rewrite.t +++ b/cpan/Unicode-Collate/t/rewrite.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 17 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..17\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/test.t b/cpan/Unicode-Collate/t/test.t index dc1e903388..440c3a9da1 100644 --- a/cpan/Unicode-Collate/t/test.t +++ b/cpan/Unicode-Collate/t/test.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 107 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..107\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/trailwt.t b/cpan/Unicode-Collate/t/trailwt.t index de2d92cd1f..1a6966e5a6 100644 --- a/cpan/Unicode-Collate/t/trailwt.t +++ b/cpan/Unicode-Collate/t/trailwt.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 58 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..58\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/variable.t b/cpan/Unicode-Collate/t/variable.t index 1a6bd6495b..02cc728e98 100644 --- a/cpan/Unicode-Collate/t/variable.t +++ b/cpan/Unicode-Collate/t/variable.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 37 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..37\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); diff --git a/cpan/Unicode-Collate/t/version.t b/cpan/Unicode-Collate/t/version.t index d145e45f60..26f62b7af4 100644 --- a/cpan/Unicode-Collate/t/version.t +++ b/cpan/Unicode-Collate/t/version.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 17 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..17\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); @@ -23,8 +31,8 @@ ok(1); ######################### # Fix me when UCA and/or keys.txt is upgraded. -my $UCA_Version = "22"; -my $Base_Unicode_Version = "6.0.0"; +my $UCA_Version = "24"; +my $Base_Unicode_Version = "6.1.0"; my $Key_Version = "3.1.1"; ok(Unicode::Collate::UCA_Version, $UCA_Version); diff --git a/cpan/Unicode-Collate/t/view.t b/cpan/Unicode-Collate/t/view.t index ca8e627eae..6f7c0fb7ae 100644 --- a/cpan/Unicode-Collate/t/view.t +++ b/cpan/Unicode-Collate/t/view.t @@ -11,11 +11,19 @@ BEGIN { } } -use Test; -BEGIN { plan tests => 53 }; - use strict; use warnings; +BEGIN { $| = 1; print "1..53\n"; } +my $count = 0; +sub ok ($;$) { + my $p = my $r = shift; + if (@_) { + my $x = shift; + $p = !defined $x ? !defined $r : !defined $r ? 0 : $r eq $x; + } + print $p ? "ok" : "not ok", ' ', ++$count, "\n"; +} + use Unicode::Collate; ok(1); |