2009-10-06 Jonathan Chambers <joncham@gmail.com>

        * String.cs (Contains): Use CompareOptions.Ordinal. Fixes bug
        #535425.

svn path=/trunk/mcs/; revision=143519

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 108a7bdb79fd56423f7afb71455462776fbd5df8..bd06999c781bbf1deac972c37d1d13f192897b4d 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-06  Jonathan Chambers  <joncham@gmail.com>
+
+       * String.cs (Contains): Use CompareOptions.Ordinal. Fixes bug
+       #535425.
+
 2009-10-04  Mark Probst  <mark.probst@gmail.com>
 
        * AppDomain.cs: Check for static AppDomainInitializer earlier to

diff --git a/mcs/class/corlib/System/String.cs b/mcs/class/corlib/System/String.cs
index b0cef03cd32d97aaa97788f87a7f6323e5c34fcb..ecc35b32f4749dde9e57f978f76766024544f4f7 100644 (file)
--- a/mcs/class/corlib/System/String.cs
+++ b/mcs/class/corlib/System/String.cs
@@ -1194,7 +1194,7 @@ namespace System
                                return 0;
                        if (this.length == 0)
                                return -1;
-                       return CultureInfo.CurrentCulture.CompareInfo.IndexOf (this, value, 0, length);
+                       return CultureInfo.CurrentCulture.CompareInfo.IndexOf (this, value, 0, length, CompareOptions.Ordinal);
                }
 
                public int IndexOf (String value, int startIndex)

diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog
index 7da8d0d54538dca8cd3fd38d07d57c497eb808cd..c29ad8ea2c3b9fcfafddbee3f1a329025085478c 100644 (file)
--- a/mcs/class/corlib/Test/System/ChangeLog
+++ b/mcs/class/corlib/Test/System/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-06  Jonathan Chambers  <joncham@gmail.com>
+
+       * StringTest.cs (Contains): Add test for Contains using
+       an Ordinal compare. Bug #535425.
+
+
 2009-09-24  Zoltan Varga  <vargaz@gmail.com>
 
        * TypeTest.cs: Add a test for missing.

diff --git a/mcs/class/corlib/Test/System/StringTest.cs b/mcs/class/corlib/Test/System/StringTest.cs
index 20047644bee5e92720bfd899285b7346442a51fc..355e7e4b770d92478cfcf82300c8d99f5f3ba724 100644 (file)
--- a/mcs/class/corlib/Test/System/StringTest.cs
+++ b/mcs/class/corlib/Test/System/StringTest.cs
@@ -2283,6 +2283,7 @@ public class StringTest
                Assert.IsTrue ("ABC".Contains ("ABC"));
                Assert.IsTrue ("ABC".Contains ("AB"));
                Assert.IsTrue (!"ABC".Contains ("AD"));
+               Assert.IsTrue (!"encyclopædia".Contains("encyclopaedia"));
        }
 
        [Test]