2004-04-12 Atsushi Enomoto <atsushi@ximian.com>

	* SqlStringTest.cs : Removed locale-dependent test.
	* SqlDecimalTest.cs : Removed runtime-dependent test.

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

diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/ChangeLog b/mcs/class/System.Data/Test/System.Data.SqlTypes/ChangeLog
index ffee749957acce275df00351e350100587e62c81..65578b51e480bd94c94b2552dcbbb102dcadbbee 100755 (executable)
--- a/mcs/class/System.Data/Test/System.Data.SqlTypes/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-12  Atsushi Enomoto <atsushi@ximian.com>
+
+       * SqlStringTest.cs : Removed locale-dependent test.
+       * SqlDecimalTest.cs : Removed runtime-dependent test.
+
 2003-06-02  Ville Palo <vi64pa@kolumbus.fi>
 
        * All files except SqlGuidTest.cs: Now works fine on ms.net 1.1

diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs
index e77e8931aab7b853865053fd8413bd9b5658fb3c..78018fed6da7e4c5f8fba3ceaece4603601e8ebc 100755 (executable)
--- a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs
@@ -263,12 +263,14 @@ namespace MonoTests.System.Data.SqlTypes
                         Assert ("#H10", SqlDecimal.NotEquals (SqlDecimal.Null, Test3).IsNull);                 \r
                 }\r
 \r
+               /* Don't do such environment-dependent test. It will never succeed under Portable.NET and MS.NET\r
                [Test]\r
                 public void GetHashCodeTest()\r
                 {\r
                         // FIXME: Better way to test HashCode\r
                         AssertEquals ("#I01", -1281249885, Test1.GetHashCode ());\r
                 }\r
+               */\r
 \r
                [Test]\r
                 public void GetTypeTest()\r

diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlStringTest.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlStringTest.cs
index 37774d9c0e6cd3b41a94c2c1fa62abe3c4258ddb..d7cf7de9872aa87b321cc882760e1ccccb142583 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlStringTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlStringTest.cs
@@ -113,19 +113,21 @@ namespace MonoTests.System.Data.SqlTypes
                [Test]
                 public void Properties()
                 {
-                        // CompareInfo
-                        AssertEquals ("#C01", 3081, Test1.CompareInfo.LCID);
+/* Comment out: This test will succeed only when you're in en-au culture.
+                       // CompareInfo
+                       AssertEquals ("#C01", 3081, Test1.CompareInfo.LCID);
 
                         // CultureInfo
-                        AssertEquals ("#C02", 3081, Test1.CultureInfo.LCID);                
+                       AssertEquals ("#C02", 3081, Test1.CultureInfo.LCID);             
+
+                        // LCID
+                        AssertEquals ("#C05", 3081, Test1.LCID);                        
+*/   
                         
                         // IsNull
                         Assert ("#C03", !Test1.IsNull);
                         Assert ("#C04", SqlString.Null.IsNull);
                                                
-                        // LCID
-                        AssertEquals ("#C05", 3081, Test1.LCID);
-                        
                         // SqlCompareOptions
                         AssertEquals ("#C06", "IgnoreCase, IgnoreKanaType, IgnoreWidth", 
                                       Test1.SqlCompareOptions.ToString ());
@@ -182,7 +184,7 @@ namespace MonoTests.System.Data.SqlTypes
                        Assert ("#D11", T2.CompareTo (T1) != 0);
 
                        // IgnoreNonSpace
-                        T1 = new SqlString ("TESTñ", 2057, SqlCompareOptions.IgnoreNonSpace);
+                        T1 = new SqlString ("TEST\xF1", 2057, SqlCompareOptions.IgnoreNonSpace);
                        T2 = new SqlString ("TESTn", 2057, SqlCompareOptions.IgnoreNonSpace);
                        Assert ("#D12", T2.CompareTo (T1) == 0);
                 
@@ -583,7 +585,7 @@ namespace MonoTests.System.Data.SqlTypes
                 public void SqlDecimalToSqlString()
                 {
                         SqlDecimal TestDecimal = new SqlDecimal (1000.2345);
-                        AssertEquals ("#U01", "1000.2345000000000", ((SqlString)TestDecimal).Value);
+                       AssertEquals ("#U01", "1000.2345000000000", ((SqlString)TestDecimal).Value);
                 }
                 
                [Test]