diff options
| author | Senganal T <senga@mono-cvs.ximian.com> | 2006-02-11 13:52:01 +0300 |
|---|---|---|
| committer | Senganal T <senga@mono-cvs.ximian.com> | 2006-02-11 13:52:01 +0300 |
| commit | 5f6b7974bfe61ba88067072f8046799fab8ef1c2 (patch) | |
| tree | d5c20c339cd5c58f3427fdfacd376998d543699b /mcs/class/System.Data/Test | |
| parent | f66d6296f4a2730929ff0b17da858f2435a791cd (diff) | |
Fixes for SqlClient failing testcases.backporting r56167.
svn path=/branches/mono-1-1-13/mcs/; revision=56789
Diffstat (limited to 'mcs/class/System.Data/Test')
5 files changed, 10 insertions, 5 deletions
diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/ChangeLog index 31f00dcb7e0..d0d41be42a2 100644 --- a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/ChangeLog +++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/ChangeLog @@ -1,3 +1,7 @@ +2006-01-27 Senganal T <tsenganal@novell.com> + + * DataReaderTest : Corrected a failing testcase. + 2005-09-01 Sureshkumar T <tsureshkumar@novell.com> * IDbCommandTest.cs: Added. Provider independent Command tests. diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs index 2326d214dfd..7d29dcb77f0 100644 --- a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs +++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DataReaderTest.cs @@ -49,7 +49,7 @@ namespace MonoTests.System.Data ConnectionManager.Singleton.OpenConnection (); IDbCommand cmd = conn.CreateCommand (); cmd.CommandText = "select id, fname, id + 20 as plustwenty from employee"; - IDataReader reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly); + IDataReader reader = cmd.ExecuteReader (CommandBehavior.SchemaOnly | CommandBehavior.KeyInfo); DataTable schema = reader.GetSchemaTable (); reader.Close (); Assert.AreEqual (3, schema.Rows.Count, "#1"); diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog index e31946d2197..24558753b4e 100644 --- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog @@ -4,6 +4,10 @@ 2006-01-17 Senganal T <tsenganal@novell.com> + * SqlCommandBuilderTest.cs : corrected a failing testcase + +2006-01-17 Senganal T <tsenganal@novell.com> + * SqlCommandBuilderTest.cs : Added testcase for bug #77225 2005-12-03 Senganal T <tsenganal@novell.com> diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs index 24bc4ecbb86..d228b5d1ccc 100644 --- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs @@ -97,7 +97,7 @@ namespace MonoTests.System.Data SqlCommandBuilder cb = new SqlCommandBuilder (da); SqlCommand cmd = cb.GetUpdateCommand (); - Assert.AreEqual ("UPDATE employee SET id = @p1, fname = @p2 WHERE ((id = @p3) AND ((@p4 = 1 AND age IS NULL) OR (fname = @p5)))", + Assert.AreEqual ("UPDATE employee SET id = @p1, fname = @p2 WHERE ((id = @p3) AND ((@p4 = 1 AND fname IS NULL) OR (fname = @p5)))", cmd.CommandText, "#2"); Assert.AreEqual (5, cmd.Parameters.Count, "#3"); } diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs index 50999c64ef9..2724b6fc11f 100644 --- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs @@ -361,9 +361,6 @@ namespace MonoTests.System.Data.SqlClient ex=null; */ - // NOTE msdotnet contradicts documented behavior - // SystemException is expected when Dataset is invalid - // but msdotnet throws ArgumentNullException try { adapter.Fill ( null , 0 , 0 , "numeric_family"); Assert.Fail ( "#7 Exception shud be thrown : Invalid Dataset"); |