9 files changed, 30 insertions, 21 deletions
diff --git a/cpan/Unicode-Collate/t/cjkrange.t b/cpan/Unicode-Collate/t/cjkrange.t
index 144d123d22..a7490046a5 100644
--- a/cpan/Unicode-Collate/t/cjkrange.t
+++ b/cpan/Unicode-Collate/t/cjkrange.t
@@ -12,7 +12,7 @@ BEGIN {
 }
 
 use Test;
-BEGIN { plan tests => 321 }; # 1 + 40 x @Versions
+BEGIN { plan tests => 379 }; # 1 + 42 x @Versions
 
 use strict;
 use warnings;
@@ -34,13 +34,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 +55,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 +67,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..65bcdd9a1a 100644
--- a/cpan/Unicode-Collate/t/compatui.t
+++ b/cpan/Unicode-Collate/t/compatui.t
@@ -12,7 +12,7 @@ BEGIN {
 }
 
 use Test;
-BEGIN { plan tests => 561 }; # 1 + 70 x @Versions
+BEGIN { plan tests => 631 }; # 1 + 70 x @Versions
 
 use strict;
 use warnings;
@@ -22,7 +22,7 @@ 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/hangtype.t b/cpan/Unicode-Collate/t/hangtype.t
index 6932854b20..27bddff0df 100644
--- a/cpan/Unicode-Collate/t/hangtype.t
+++ b/cpan/Unicode-Collate/t/hangtype.t
@@ -12,7 +12,7 @@ BEGIN {
 }
 
 use Test;
-BEGIN { plan tests => 401 }; # 1 + 50 x @Versions
+BEGIN { plan tests => 451 }; # 1 + 50 x @Versions
 
 use strict;
 use warnings;
@@ -22,7 +22,7 @@ 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/loc_cjkc.t b/cpan/Unicode-Collate/t/loc_cjkc.t
index c4fec7c006..c382db5a6f 100644
--- a/cpan/Unicode-Collate/t/loc_cjkc.t
+++ b/cpan/Unicode-Collate/t/loc_cjkc.t
@@ -12,7 +12,7 @@ BEGIN {
 }
 
 use Test;
-BEGIN { plan tests => 7008 };
+BEGIN { plan tests => 7022 };
 
 use strict;
 use warnings;
@@ -785,6 +785,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 +817,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_es.t b/cpan/Unicode-Collate/t/loc_es.t
index 50fb554c28..c8836b1c2d 100644
--- a/cpan/Unicode-Collate/t/loc_es.t
+++ b/cpan/Unicode-Collate/t/loc_es.t
@@ -26,7 +26,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..318cb67232 100644
--- a/cpan/Unicode-Collate/t/loc_estr.t
+++ b/cpan/Unicode-Collate/t/loc_estr.t
@@ -26,7 +26,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/overcjk0.t b/cpan/Unicode-Collate/t/overcjk0.t
index 1dba193f61..0ef245e6dd 100644
--- a/cpan/Unicode-Collate/t/overcjk0.t
+++ b/cpan/Unicode-Collate/t/overcjk0.t
@@ -12,7 +12,7 @@ BEGIN {
 }
 
 use Test;
-BEGIN { plan tests => 246 }; # 6 + 30 x @Versions
+BEGIN { plan tests => 285 }; # 6 + 31 x @Versions
 
 use strict;
 use warnings;
@@ -47,13 +47,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 +72,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..e59b8af8a0 100644
--- a/cpan/Unicode-Collate/t/overcjk1.t
+++ b/cpan/Unicode-Collate/t/overcjk1.t
@@ -12,7 +12,7 @@ BEGIN {
 }
 
 use Test;
-BEGIN { plan tests => 131 }; # 11 + 15 x @Versions
+BEGIN { plan tests => 155 }; # 11 + 16 x @Versions
 
 use strict;
 use warnings;
@@ -52,8 +52,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 +71,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/version.t b/cpan/Unicode-Collate/t/version.t
index d145e45f60..ac5788d9bc 100644
--- a/cpan/Unicode-Collate/t/version.t
+++ b/cpan/Unicode-Collate/t/version.t
@@ -23,8 +23,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);