1 files changed, 33 insertions, 28 deletions

diff --git a/cpan/Unicode-Collate/t/loc_fr.t b/cpan/Unicode-Collate/t/loc_fr.t
index 025d3a897f..3cc1c17264 100644
--- a/cpan/Unicode-Collate/t/loc_fr.t
+++ b/cpan/Unicode-Collate/t/loc_fr.t
@@ -4,7 +4,10 @@ use warnings;
 use Unicode::Collate::Locale;
 
 use Test;
-plan tests => 28;
+plan tests => 26;
+
+my $ae   = pack 'U', 0xE6;
+my $AE   = pack 'U', 0xC6;
 
 my $objFr = Unicode::Collate::Locale->
     new(locale => 'FR', normalization => undef);
@@ -14,39 +17,41 @@ ok($objFr->getlocale, 'fr');
 
 $objFr->change(level => 1);
 
-ok($objFr->eq("Æ", "AE"));
-ok($objFr->eq("æ", "ae"));
-ok($objFr->eq("\x{01FD}", "ae"));
-ok($objFr->eq("\x{01FC}", "AE"));
-ok($objFr->eq("\x{01E3}", "ae"));
-ok($objFr->eq("\x{01E2}", "AE"));
-ok($objFr->eq("\x{1D2D}", "AE"));
+ok($objFr->eq($ae, "ae"));
+ok($objFr->eq($AE, "AE"));
+ok($objFr->eq("\x{1FD}", $ae));
+ok($objFr->eq("\x{1FC}", $AE));
+ok($objFr->eq("\x{1E3}", $ae));
+ok($objFr->eq("\x{1E2}", $AE));
+
+# 8
 
 $objFr->change(level => 2);
 
-ok($objFr->gt("Æ", "AE"));
-ok($objFr->gt("æ", "ae"));
-ok($objFr->gt("\x{01FD}", "ae"));
-ok($objFr->gt("\x{01FC}", "AE"));
-ok($objFr->gt("\x{01E3}", "ae"));
-ok($objFr->gt("\x{01E2}", "AE"));
-ok($objFr->gt("\x{1D2D}", "AE"));
+ok($objFr->gt($ae, "ae"));
+ok($objFr->gt($AE, "AE"));
+ok($objFr->gt("\x{1FD}", $ae));
+ok($objFr->gt("\x{1FC}", $AE));
+ok($objFr->gt("\x{1E3}", $ae));
+ok($objFr->gt("\x{1E2}", $AE));
 
-ok($objFr->eq("Æ\x{304}", "\x{01E2}"));
-ok($objFr->eq("æ\x{304}", "\x{01E3}"));
-ok($objFr->eq("Æ\x{301}", "\x{01FC}"));
-ok($objFr->eq("æ\x{301}", "\x{01FD}"));
+ok($objFr->eq($ae, $AE));
+ok($objFr->eq($AE, "\x{1D2D}"));
+ok($objFr->eq("$ae\x{304}", "$AE\x{304}"));
+ok($objFr->eq("$ae\x{301}", "$AE\x{301}"));
 
-$objFr->change(level => 3);
+# 18
 
-ok($objFr->lt("æ\x{304}", "\x{01E2}"));
-ok($objFr->eq("Æ\x{304}", "\x{01E2}"));
-ok($objFr->eq("æ\x{304}", "\x{01E3}"));
-ok($objFr->gt("Æ\x{304}", "\x{01E3}"));
+$objFr->change(level => 3);
 
-ok($objFr->lt("æ\x{301}", "\x{01FC}"));
-ok($objFr->eq("Æ\x{301}", "\x{01FC}"));
-ok($objFr->eq("æ\x{301}", "\x{01FD}"));
-ok($objFr->gt("Æ\x{301}", "\x{01FD}"));
+ok($objFr->lt($ae, $AE));
+ok($objFr->lt($AE, "\x{1D2D}"));
+ok($objFr->lt("$ae\x{304}", "$AE\x{304}"));
+ok($objFr->lt("$ae\x{301}", "$AE\x{301}"));
 
+ok($objFr->eq("\x{1FD}", "$ae\x{301}"));
+ok($objFr->eq("\x{1FC}", "$AE\x{301}"));
+ok($objFr->eq("\x{1E3}", "$ae\x{304}"));
+ok($objFr->eq("\x{1E2}", "$AE\x{304}"));
 
+# 26