2008-06-16 Atsushi Enomoto <atsushi@ximian.com>

	* DataViewTest2.cs DataColumnTest.cs DataSetTest2.cs
	  UniqueConstraintTest.cs DataRowCollectionTest.cs DataRowTest2.cs
	  DataColumnCollectionTest.cs DataRelationTest.cs
	  DataTableReaderTest.cs DataRowTest.cs :
	  Eliminate English imperialism. They fail on non-English .NET.

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

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index 1ebb03d2817eb1d14c47ffd70ae7e9a925d2173d..cf014f3ffa297b7d96060c79b923769dfeddff74 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-16  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataViewTest2.cs DataColumnTest.cs DataSetTest2.cs
+         UniqueConstraintTest.cs DataRowCollectionTest.cs DataRowTest2.cs
+         DataColumnCollectionTest.cs DataRelationTest.cs
+         DataTableReaderTest.cs DataRowTest.cs :
+         Eliminate English imperialism. They fail on non-English .NET.
+
 2008-06-16  Atsushi Enomoto  <atsushi@ximian.com>
 
        * DataTableTest3.cs : bang bang bang, close Stream before Assertion

diff --git a/mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs
index a5395c46d7de160e8465ab7e26cd703295c779f7..c12d39a60d5b492c1f062b227c9dc9bc86130432 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataColumnCollectionTest.cs
@@ -385,7 +385,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#02");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#03");
-                               Assert.AreEqual ("Cannot remove this column, because it is part of the parent key for relationship Rel.", e.Message, "test#04");
+                               // Never premise English.
+                               //Assert.AreEqual ("Cannot remove this column, because it is part of the parent key for relationship Rel.", e.Message, "test#04");
                        }
                }
 
@@ -510,7 +511,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#04");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#05");
-                               Assert.AreEqual ("Column '_test_' does not belong to table test_table.", e.Message, "test#06");
+                               // Never premise English.
+                               //Assert.AreEqual ("Column '_test_' does not belong to table test_table.", e.Message, "test#06");
                        }
 
                        Cols.Add ();
@@ -529,7 +531,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#10");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#11");
-                               Assert.AreEqual ("Cannot remove a column that doesn't belong to this table.", e.Message, "test#12");
+                               // Never premise English.
+                               //Assert.AreEqual ("Cannot remove a column that doesn't belong to this table.", e.Message, "test#12");
                        }
 
                        Cols.Add ();
@@ -551,7 +554,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#17");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType (), "test#18");
-                               Assert.AreEqual ("Cannot find column 10.", e.Message, "test#19");
+                               // Never premise English.
+                               //Assert.AreEqual ("Cannot find column 10.", e.Message, "test#19");
                        }
                }
 

diff --git a/mcs/class/System.Data/Test/System.Data/DataColumnTest.cs b/mcs/class/System.Data/Test/System.Data/DataColumnTest.cs
index 1bafe09adddf9be0883749ba2746b732e4708d95..dc2f07052327dd091b0d62abe63049db750d8c8b 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataColumnTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataColumnTest.cs
@@ -77,7 +77,8 @@ namespace MonoTests.System.Data
                        } catch (ArgumentNullException ex) {
                                Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
                                Assert.IsNull (ex.InnerException, "#3");
-                               Assert.IsNotNull (ex.Message, "#4");
+                               // Never premise English.
+//                             Assert.IsNotNull (ex.Message, "#4");
                                Assert.IsNotNull (ex.ParamName, "#5");
                                Assert.AreEqual ("dataType", ex.ParamName, "#6");
                        }
@@ -439,7 +440,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("#E1");
                        } catch (EvaluateException e) {
                                Assert.AreEqual (typeof (EvaluateException), e.GetType (), "#E2");
-                               Assert.AreEqual ("Cannot find column [nimi].", e.Message, "#E3");
+                               // Never premise English.
+                               //Assert.AreEqual ("Cannot find column [nimi].", e.Message, "#E3");
                        }
 
                        try {
@@ -455,7 +457,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("#G1");
                        } catch (EvaluateException e) {
                                Assert.AreEqual (typeof (EvaluateException), e.GetType (), "#G2");
-                               Assert.AreEqual ("Invalid type name 'Boolean'.", e.Message, "#G3");
+                               // Never premise English.
+                               //Assert.AreEqual ("Invalid type name 'Boolean'.", e.Message, "#G3");
                        }
                }
 

diff --git a/mcs/class/System.Data/Test/System.Data/DataRelationTest.cs b/mcs/class/System.Data/Test/System.Data/DataRelationTest.cs
index 801cc04937f4525a352a2b5e41b64dd3cc3b4d5e..0d6eb116bcf44c37f007a4cbe82107d8eda1b5ce 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataRelationTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRelationTest.cs
@@ -112,7 +112,8 @@ namespace MonoTests.System.Data
                                Fail ("test#03");\r
                        } catch (Exception e) {\r
                                AssertEquals ("test#04", typeof (ConstraintException), e.GetType ());\r
-                               AssertEquals ("test#05", "Column 'ChildName' is constrained to be unique.  Value 'Dick' is already present.", e.Message);\r
+                               // Never premise English.\r
+                               //AssertEquals ("test#05", "Column 'ChildName' is constrained to be unique.  Value 'Dick' is already present.", e.Message);\r
                        }                       \r
 \r
                        Row = Mom.NewRow ();                                 \r
@@ -130,7 +131,8 @@ namespace MonoTests.System.Data
                                 Fail ("test#07");                                   \r
                         } catch (Exception e) {                              \r
                                 AssertEquals ("test#08", typeof (InvalidConstraintException), e.GetType ());\r
-                                AssertEquals ("test#09", "ForeignKeyConstraint Rel requires the child key values (Jack) to exist in the parent table.", e.Message);                                                                      \r
+                               // Never premise English.\r
+                                //AssertEquals ("test#09", "ForeignKeyConstraint Rel requires the child key values (Jack) to exist in the parent table.", e.Message);                                                                      \r
                         }                                                    \r
 \r
                 }\r

diff --git a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
index 87d20eca36567e01c25a7d7f30bcf414e0f15b07..868bfdae81cf0996f15363e27bdb7d3521fd1d80 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
@@ -141,7 +141,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#13");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#14");
-                               Assert.AreEqual ("This row already belongs to this table.", e.Message, "test#15");
+                               // Never premise English.
+                               //Assert.AreEqual ("This row already belongs to this table.", e.Message, "test#15");
                        }
                        
                        try {
@@ -183,7 +184,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#22");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (ConstraintException), e.GetType (), "test#23");
-                               Assert.AreEqual ("Column 'Column1' is constrained to be unique.  Value 'first' is already present.", e.Message, "test#24");
+                               // Never premise English.
+                               //Assert.AreEqual ("Column 'Column1' is constrained to be unique.  Value 'first' is already present.", e.Message, "test#24");
                        }
                       
                        Column = new DataColumn ("integer");
@@ -368,7 +370,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#07");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (MissingPrimaryKeyException), e.GetType (), "test#08");
-                               Assert.AreEqual ("Table doesn't have a primary key.", e.Message, "test#09");                    
+                               // Never premise English.
+                               //Assert.AreEqual ("Table doesn't have a primary key.", e.Message, "test#09");                  
                        }
                        
                        _tbl.PrimaryKey = new DataColumn [] {_tbl.Columns [0]};
@@ -381,7 +384,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#13");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#14");
-                               Assert.AreEqual ("Expecting 1 value(s) for the key being indexed, but received 2 value(s).", e.Message, "test#15");
+                               // Never premise English.
+                               //Assert.AreEqual ("Expecting 1 value(s) for the key being indexed, but received 2 value(s).", e.Message, "test#15");
                        }
                        
                        _tbl.PrimaryKey = new DataColumn [] {_tbl.Columns [0], _tbl.Columns [1]};
@@ -395,7 +399,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#20");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#21");
-                               Assert.AreEqual ("Expecting 2 value(s) for the key being indexed, but received 1 value(s).", e.Message, "test#22");
+                               // Never premise English.
+                               //Assert.AreEqual ("Expecting 2 value(s) for the key being indexed, but received 1 value(s).", e.Message, "test#22");
                        }
                }
                
@@ -510,7 +515,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#01");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (MissingPrimaryKeyException), e.GetType (), "test#02");
-                               Assert.AreEqual ("Table doesn't have a primary key.", e.Message, "test#03");              
+                               // Never premise English.
+                               //Assert.AreEqual ("Table doesn't have a primary key.", e.Message, "test#03");              
                        }
                        
                        _tbl.PrimaryKey = new DataColumn [] {_tbl.Columns [0]};
@@ -539,7 +545,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#11");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (MissingPrimaryKeyException), e.GetType (), "test#12");
-                               Assert.AreEqual ("Table doesn't have a primary key.", e.Message, "tets#13");
+                               // Never premise English.
+                               //Assert.AreEqual ("Table doesn't have a primary key.", e.Message, "tets#13");
                        }
                        
                        _tbl.PrimaryKey = new DataColumn [] {_tbl.Columns [0], _tbl.Columns [1]};
@@ -549,7 +556,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#14");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#15");
-                               Assert.AreEqual ("Expecting 2 value(s) for the key being indexed, but received 1 value(s).", e.Message, "test#16");
+                               // Never premise English.
+                               //Assert.AreEqual ("Expecting 2 value(s) for the key being indexed, but received 1 value(s).", e.Message, "test#16");
                        }
                        
                        row = Rows.Find (new object [] {1, "fir"});
@@ -612,7 +620,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#01");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType (), "test#02");
-                               Assert.AreEqual ("The row insert position -1 is invalid.", e.Message, "test#03");
+                               // Never premise English.
+                               //Assert.AreEqual ("The row insert position -1 is invalid.", e.Message, "test#03");
                        }
                        
                        Rows.InsertAt (Row, 0);
@@ -641,7 +650,8 @@ namespace MonoTests.System.Data
                         }
                         catch (Exception e) {
                                 Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#09");
-                                Assert.AreEqual ("This row already belongs to this table.", e.Message, "test#10");
+                               // Never premise English.
+                                //Assert.AreEqual ("This row already belongs to this table.", e.Message, "test#10");
                         }
 
                        DataTable table = new DataTable ();
@@ -656,7 +666,8 @@ namespace MonoTests.System.Data
                        }
                        catch (Exception e) {
                                Assert.AreEqual (typeof (ArgumentException), e.GetType (), "test#12");
-                               Assert.AreEqual ("This row already belongs to another table.", e.Message, "test#13");
+                               // Never premise English.
+                               //Assert.AreEqual ("This row already belongs to another table.", e.Message, "test#13");
                        }
 
                        table = new DataTable ();
@@ -713,7 +724,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#06");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType (), "test#07");
-                               Assert.AreEqual ("The given datarow is not in the current DataRowCollection.", e.Message, "test#08");
+                               // Never premise English.
+                               //Assert.AreEqual ("The given datarow is not in the current DataRowCollection.", e.Message, "test#08");
                        }
                        
                        DataRow Row = new DataTable ().NewRow ();
@@ -723,7 +735,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#09");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType (), "test#10");
-                               Assert.AreEqual ("The given datarow is not in the current DataRowCollection.", e.Message, "test#11");
+                               // Never premise English.
+                               //Assert.AreEqual ("The given datarow is not in the current DataRowCollection.", e.Message, "test#11");
                        }
                        
                        try {
@@ -731,7 +744,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#12");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType (), "test#13");
-                               Assert.AreEqual ("There is no row at position -1.", e.Message, "test#14");
+                               // Never premise English.
+                               //Assert.AreEqual ("There is no row at position -1.", e.Message, "test#14");
                        }
                        
                        try { 
@@ -739,7 +753,8 @@ namespace MonoTests.System.Data
                                Assert.Fail ("test#15");
                        } catch (Exception e) {
                                Assert.AreEqual (typeof (IndexOutOfRangeException), e.GetType (), "test#16");
-                               Assert.AreEqual ("There is no row at position 64.", e.Message, "test#17");
+                               // Never premise English.
+                               //Assert.AreEqual ("There is no row at position 64.", e.Message, "test#17");
                        }
                        
                        Rows.RemoveAt (0);

diff --git a/mcs/class/System.Data/Test/System.Data/DataRowTest.cs b/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
index 5fbc8af6a1b786c71e1d081ab6b0c1a6a7381bd8..7561b8c565d4142d1c07ee79262b67fbb60903cb 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowTest.cs
@@ -158,7 +158,8 @@ namespace MonoTests.System.Data
                                 Fail ("#A07");
                         }
                         catch (Exception e) {
-                                AssertEquals ("#A08", "There is no row at position 2.", e.Message);
+                               // Never premise English.
+                                //AssertEquals ("#A08", "There is no row at position 2.", e.Message);
                         }
                 }
 

diff --git a/mcs/class/System.Data/Test/System.Data/DataRowTest2.cs b/mcs/class/System.Data/Test/System.Data/DataRowTest2.cs
index 6d2f25e22dc8239180cfa1a5ade1aead84d7147e..d3b8a9510fae31a879014dcf8a05eeff6ba74174 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataRowTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowTest2.cs
@@ -1676,7 +1676,8 @@ namespace MonoTests.System.Data
                                row.SetAdded();
                                Assert.Fail ("#1");
                        } catch (InvalidOperationException e) {
-                               Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
+                               // Never premise English.
+                               //Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
                        }
 
                        table.Columns.Add("col1", typeof(int));
@@ -1689,7 +1690,8 @@ namespace MonoTests.System.Data
                                row.SetAdded();
                                Assert.Fail ("#2");
                        } catch (InvalidOperationException e) {
-                               Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
+                               // Never premise English.
+                               //Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
                        }
                        Assert.AreEqual(DataRowState.Added, row.RowState, "#2");
 
@@ -1700,7 +1702,8 @@ namespace MonoTests.System.Data
                                row.SetAdded();
                                Assert.Fail ("#3");
                        } catch (InvalidOperationException e) {
-                               Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
+                               // Never premise English.
+                               //Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
                        }
 
                        row.AcceptChanges();
@@ -1744,7 +1747,8 @@ namespace MonoTests.System.Data
                                row.SetModified();
                                Assert.Fail ("#1");
                        } catch (InvalidOperationException e) {
-                               Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
+                               // Never premise English.
+                               //Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
                        }
 
                        row.AcceptChanges();
@@ -1754,7 +1758,8 @@ namespace MonoTests.System.Data
                                row.SetModified ();
                                Assert.Fail ("#2");
                        } catch (InvalidOperationException e) {
-                               Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
+                               // Never premise English.
+                               //Assert.AreEqual (SetAddedModified_ErrMsg, e.Message, "#2");
                        }
 
                        row.AcceptChanges();

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
index cae9ec6d623057e14b326ab90875db2b498abc7d..ae848d97029ceff3e8c3473544cdaa3667aa857f 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs
@@ -275,8 +275,9 @@ namespace MonoTests_System.Data
                                ds.EnforceConstraints = true;
                                Assert.Fail ("#1");
                        } catch (ConstraintException e) {
-                               Assert.AreEqual ("Failed to enable constraints. One or more rows contain values " + 
-                                               "violating non-null, unique, or foreign-key constraints.", e.Message, "#2");
+                               // Never premise English.
+                               //Assert.AreEqual ("Failed to enable constraints. One or more rows contain values " + 
+                               //              "violating non-null, unique, or foreign-key constraints.", e.Message, "#2");
                        }
                }
 
@@ -294,8 +295,9 @@ namespace MonoTests_System.Data
                                ds.EnforceConstraints = true;
                                Assert.Fail ("#1");
                        } catch (ConstraintException e) {
-                               Assert.AreEqual ("Failed to enable constraints. One or more rows contain values " + 
-                                               "violating non-null, unique, or foreign-key constraints.", e.Message, "#2");
+                               // Never premise English.
+                               //Assert.AreEqual ("Failed to enable constraints. One or more rows contain values " + 
+                               //              "violating non-null, unique, or foreign-key constraints.", e.Message, "#2");
                        }
                }
 

diff --git a/mcs/class/System.Data/Test/System.Data/DataTableReaderTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableReaderTest.cs
index 03cf8f85106d1be06a08f0f302d2f580d45318b0..9d04ece51b83cf7728fe4fae087242b2043838fc 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataTableReaderTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableReaderTest.cs
@@ -687,8 +687,9 @@ namespace MonoTests.System.Data
                                rdr.GetSchemaTable ();
                                Assert.Fail ("#0");
                        } catch (InvalidOperationException e) {
-                               Assert.AreEqual ("Schema of current DataTable '" + table.TableName + 
-                                               "' in DataTableReader has changed, DataTableReader is invalid.", e.Message, "#1");
+                               // Never premise English.
+                               //Assert.AreEqual ("Schema of current DataTable '" + table.TableName + 
+                               //              "' in DataTableReader has changed, DataTableReader is invalid.", e.Message, "#1");
                        }
                        
                        rdr = table.CreateDataReader ();
@@ -698,8 +699,9 @@ namespace MonoTests.System.Data
                                rdr.GetSchemaTable ();
                                Assert.Fail ("#1");
                        } catch (InvalidOperationException e) {
-                               Assert.AreEqual ("Schema of current DataTable '" + table.TableName + 
-                                               "' in DataTableReader has changed, DataTableReader is invalid.", e.Message, "#1");
+                               // Never premise English.
+                               //Assert.AreEqual ("Schema of current DataTable '" + table.TableName + 
+                               //              "' in DataTableReader has changed, DataTableReader is invalid.", e.Message, "#1");
                        }
                }
        
@@ -742,8 +744,9 @@ namespace MonoTests.System.Data
                                rdr.GetChars (1, 0, null, 0, 10);
                                Assert.Fail ("#1");
                        } catch (InvalidCastException e) {
-                               Assert.AreEqual ("Unable to cast object of type 'System.String'" +
-                                       " to type 'System.Char[]'.", e.Message, "#1");
+                               // Never premise English.
+                               //Assert.AreEqual ("Unable to cast object of type 'System.String'" +
+                               //      " to type 'System.Char[]'.", e.Message, "#1");
                        }
                        char[] char_arr = null;
                        long len = 0;

diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest2.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest2.cs
index 99c6759a187c322fb2acb91d530b40f348c5c499..b765d131120405b79639451435c53ef393fe8a51 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataViewTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewTest2.cs
@@ -1295,8 +1295,9 @@ namespace MonoTests_System.Data
                        try {
                                DataTable newTable = view.ToTable (false, null);
                        } catch (ArgumentNullException e) {
-                               Assert.AreEqual ("'columnNames' argument cannot be null." + Environment.NewLine + 
-                                               "Parameter name: columnNames", e.Message, "#1");
+                               // Never premise English.
+                               //Assert.AreEqual ("'columnNames' argument cannot be null." + Environment.NewLine + 
+                               //              "Parameter name: columnNames", e.Message, "#1");
                        }
                        DataTable newTable1 = view.ToTable(false, new string[] { });
                        Assert.AreEqual(10, newTable1.Rows.Count, "#3");

diff --git a/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs b/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs
index 63033198386aa32c85c080d115cfda77e7782d0e..49ce21be7e1a0f68e14a3b707101c82860ff2307 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs
@@ -70,7 +70,8 @@ namespace MonoTests.System.Data
                        } 
                        catch (Exception e) {
                                AssertEquals ("test#02", typeof (ArgumentException), e.GetType ());
-                               AssertEquals ("test#03", "Column must belong to a table.", e.Message);
+                               // Never premise English.
+                               // AssertEquals ("test#03", "Column must belong to a table.", e.Message);
                         }        
 
                        //Null exception
@@ -80,7 +81,8 @@ namespace MonoTests.System.Data
                        }
                         catch (Exception e) {
                                AssertEquals ("test#05", typeof (NullReferenceException), e.GetType ());
-                                AssertEquals ("test#06", "Object reference not set to an instance of an object.", e.Message);
+                               // Never premise English.
+                                //AssertEquals ("test#06", "Object reference not set to an instance of an object.", e.Message);
                         }
                        
                        try {