diff options
| author | Veerapuram Varadhan <v.varadhan@gmail.com> | 2009-07-30 16:35:52 +0400 |
|---|---|---|
| committer | Veerapuram Varadhan <v.varadhan@gmail.com> | 2009-07-30 16:35:52 +0400 |
| commit | 8d5211d815d69a5b930994b30c7a7aa67cd3243b (patch) | |
| tree | b8a93a40be696c430b0d8f3a830ed98eac523bb0 /mcs/class/System.Data/Test | |
| parent | bb222be3f821593957d44db77e5ce9c5d98c4015 (diff) | |
conflict fix between trunk and local tree
svn path=/trunk/mcs/; revision=139063
Diffstat (limited to 'mcs/class/System.Data/Test')
3 files changed, 14 insertions, 1 deletions
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 e1150421ae2..f4b3b9aadce 100644 --- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog +++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog @@ -1,8 +1,15 @@ +<<<<<<< HEAD:class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog 2009-07-28 Gert Driesen <drieseng@users.sourceforge.net> * SqlCommandTest.cs: Improved test for invalid statement to cover CloseConnection behavior. +======= +2009-07-25 Veerapuram Varadhan <vvaradhan@novell.com> + + * SqlDataAdapterTest.cs: Test fix. + +>>>>>>> Test fix.:class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog 2009-05-16 Veerapuram Varadhan <vvaradhan@novell.com> * SqlParameterTest.cs: Added test for bug #382589. 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 4b06e4be809..511839e0351 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 @@ -922,7 +922,7 @@ namespace MonoTests.System.Data.SqlClient command.Connection = conn; SelectCommand = command; Fill (dt, command.ExecuteReader ()); - Assert.AreEqual (6, dt.Rows.Count, "#1"); + Assert.AreEqual (4, dt.Rows.Count, "#1"); Assert.AreEqual (6, dt.Columns.Count, "#1"); } finally { DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table"); diff --git a/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog index e11d770860d..f8d0b541980 100644 --- a/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog +++ b/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog @@ -1,3 +1,9 @@ +2009-07-29 Veerapuram Varadhan <vvaradhan@novell.com> + + * SqlParameterTest.cs: Marked SqlChars/SqlBytes tests for SqlValue + as NotWorking as these types are considered as SqlString/SqlBinary + respectively. + 2009-07-26 Gert Driesen <drieseng@users.sourceforge.net> * SqlParameterTest.cs: Added/improved tests for SqlValue, and |