Author: atsushi
Date: 2006-11-26 22:41:18 -0500 (Sun, 26 Nov 2006)
New Revision: 68492
Modified:
trunk/mcs/class/corlib/System.Globalization/ChangeLog
trunk/mcs/class/corlib/System.Globalization/CompareInfo.cs
trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog
trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
Log:
2006-11-27 Atsushi Enomoto <[EMAIL PROTECTED]>
* CompareInfo.cs : fixed wrong || with && for OrdinalIgnoreCase.
Fixed bug #80056.
* CompareInfoTest.cs : why there was "return" before OrdinalIgnoreCase
tests ...
Modified: trunk/mcs/class/corlib/System.Globalization/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/ChangeLog 2006-11-27
03:25:31 UTC (rev 68491)
+++ trunk/mcs/class/corlib/System.Globalization/ChangeLog 2006-11-27
03:41:18 UTC (rev 68492)
@@ -1,3 +1,8 @@
+2006-11-27 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * CompareInfo.cs : fixed wrong || with && for OrdinalIgnoreCase.
+ Fixed bug #80056.
+
2006-11-10 Marek Safar <[EMAIL PROTECTED]>
* CultureInfo.cs (TextInfo): Construct a culture when is
Modified: trunk/mcs/class/corlib/System.Globalization/CompareInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/CompareInfo.cs 2006-11-27
03:25:31 UTC (rev 68491)
+++ trunk/mcs/class/corlib/System.Globalization/CompareInfo.cs 2006-11-27
03:41:18 UTC (rev 68492)
@@ -467,7 +467,7 @@
{
return UseManagedCollation &&
#if NET_2_0
- ((CompareOptions.Ordinal & opt) == 0 ||
+ ((CompareOptions.Ordinal & opt) == 0 &&
(CompareOptions.OrdinalIgnoreCase & opt) == 0) ?
#else
(CompareOptions.Ordinal & opt) == 0 ?
Modified: trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog 2006-11-27
03:25:31 UTC (rev 68491)
+++ trunk/mcs/class/corlib/Test/System.Globalization/ChangeLog 2006-11-27
03:41:18 UTC (rev 68492)
@@ -1,3 +1,8 @@
+2006-11-27 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * CompareInfoTest.cs : why there was "return" before OrdinalIgnoreCase
+ tests ...
+
2006-06-08 Atsushi Enomoto <[EMAIL PROTECTED]>
* DateTimeFormatInfoTest.cs : added test for bug #78569.
Modified: trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
2006-11-27 03:25:31 UTC (rev 68491)
+++ trunk/mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs
2006-11-27 03:41:18 UTC (rev 68492)
@@ -1110,7 +1110,6 @@
// BUG in .NET 2.0 : It raises inappropriate ArgumentException.
// should not match since it is Ordinal
AssertCompare ("#2", -133, "AE", "\u00C6",
CompareOptions.OrdinalIgnoreCase);
-return;
AssertCompare ("#3", 1, "AE", "\u00E6", CompareOptions.None);
// matches
@@ -1126,6 +1125,7 @@
AssertCompare ("#11", 0, "aE", "AE",
CompareOptions.OrdinalIgnoreCase);
AssertCompare ("#12", 0, "aE", "AE",
CompareOptions.OrdinalIgnoreCase);
AssertCompare ("#13", 0, "ae", "AE",
CompareOptions.OrdinalIgnoreCase);
+ AssertCompare ("#14", 0, "ola", "OLA",
CompareOptions.OrdinalIgnoreCase);
}
#endif
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
