From: Jonathan Chambers <joncham@gmail.com>
Date: Tue, 6 Oct 2009 15:14:12 +0000 (-0000)
Subject: 2009-10-06  Jonathan Chambers  <joncham@gmail.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=844c6d9c8ad50664e733a4f5ed27b888f050db73;p=mono.git

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 108a7bdb79f..bd06999c781 100644
--- 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 b0cef03cd32..ecc35b32f47 100644
--- 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 7da8d0d5453..c29ad8ea2c3 100644
--- 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 20047644bee..355e7e4b770 100644
--- 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]