diff options
| author | Veerapuram Varadhan <v.varadhan@gmail.com> | 2009-09-24 21:39:57 +0400 |
|---|---|---|
| committer | Veerapuram Varadhan <v.varadhan@gmail.com> | 2009-09-24 21:39:57 +0400 |
| commit | 8db39691daa4855091d695b143ce6fd322f10278 (patch) | |
| tree | 7ebe495d2eeb2d0c66caeb9ff60fa84e1d0e27d2 /mcs/class/System.Data/Test | |
| parent | fedbeedab2fe6aa61f302e80608b4143d31732bb (diff) | |
2009-09-15 Veerapuram Varadhan <vvaradhan@novell.com>
** Fixes #536194 - Patch by Andrew Kurochk <aaki.viper@gmail.com>
* MergeManager.cs (Merge*): Do nothing when source and target
datasets are same.
svn path=/trunk/mcs/; revision=142590
Diffstat (limited to 'mcs/class/System.Data/Test')
| -rw-r--r-- | mcs/class/System.Data/Test/System.Data/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.Data/Test/System.Data/DataSetTest2.cs | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog index 7c2f4f7b13b..56c256e7129 100644 --- a/mcs/class/System.Data/Test/System.Data/ChangeLog +++ b/mcs/class/System.Data/Test/System.Data/ChangeLog @@ -1,3 +1,7 @@ +2009-09-24 Veerapuram Varadhan <vvaradhan@novell.com> + + * DataSetTest2.cs (MergeTest_SameDataSet_536194): Added new. + 2009-01-16 Atsushi Enomoto <atsushi@ximian.com> * DataColumnTest.cs : try a string comparison fix. diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs index 56cfbefaf06..664e2d44f41 100644 --- a/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs +++ b/mcs/class/System.Data/Test/System.Data/DataSetTest2.cs @@ -3466,6 +3466,20 @@ namespace MonoTests_System.Data Assert.AreEqual (1, ds.Tables [0].Columns.Count, "#4"); Assert.AreEqual (typeof (string), ds.Tables [0].Columns [0].DataType, "#5"); } + + [Test] + public void MergeTest_SameDataSet_536194 () + { + DataSet dataSet = new DataSet ("Test"); + + DataTable dataTable = new DataTable("Test"); + dataTable.Columns.Add("Test"); + dataTable.Rows.Add("Test"); + dataSet.Tables.Add(dataTable); + dataSet.Merge(dataTable); + Assert.AreEqual (1, dataSet.Tables.Count, "1"); + } + #if NET_2_0 [Test] public void LoadTest1 () |