[bcl] Remove more NET_2_0 checks from class libs

[mono.git] / mcs / class / System.Data / Test / System.Data.SqlClient / SqlDataAdapterTest.cs

diff --git a/mcs/class/System.Data/Test/System.Data.SqlClient/SqlDataAdapterTest.cs b/mcs/class/System.Data/Test/System.Data.SqlClient/SqlDataAdapterTest.cs
index cb3a4b750e13a18588f511db932f00ace7bbac1e..301f62bf7f22efba750f3a3ac4cc9d7c46183bd3 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlClient/SqlDataAdapterTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlClient/SqlDataAdapterTest.cs
@@ -45,28 +45,20 @@ namespace MonoTests.System.Data.SqlClient
                {
                        SqlDataAdapter da = new SqlDataAdapter ();
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNull (da.SelectCommand, "#11");
                        Assert.IsNull (da.Site, "#12");
                        Assert.IsNotNull (da.TableMappings, "#13");
                        Assert.AreEqual (0, da.TableMappings.Count, "#14");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#15");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#16");
                }
 
@@ -76,29 +68,21 @@ namespace MonoTests.System.Data.SqlClient
                        SqlCommand cmd = new SqlCommand ();
                        SqlDataAdapter da = new SqlDataAdapter (cmd);
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNotNull (da.SelectCommand, "#11");
                        Assert.AreSame (cmd, da.SelectCommand, "#12");
                        Assert.IsNull (da.Site, "#13");
                        Assert.IsNotNull (da.TableMappings, "#14");
                        Assert.AreEqual (0, da.TableMappings.Count, "#15");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#16");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#17");
                }
 
@@ -107,28 +91,20 @@ namespace MonoTests.System.Data.SqlClient
                {
                        SqlDataAdapter da = new SqlDataAdapter ((SqlCommand) null);
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNull (da.SelectCommand, "#11");
                        Assert.IsNull (da.Site, "#12");
                        Assert.IsNotNull (da.TableMappings, "#13");
                        Assert.AreEqual (0, da.TableMappings.Count, "#14");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#15");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#16");
                }
 
@@ -141,30 +117,22 @@ namespace MonoTests.System.Data.SqlClient
                        SqlDataAdapter da = new SqlDataAdapter (selectCommandText,
                                selectConnection);
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNotNull (da.SelectCommand, "#11");
                        Assert.AreSame (selectCommandText, da.SelectCommand.CommandText, "#12");
                        Assert.AreSame (selectConnection, da.SelectCommand.Connection, "#13");
                        Assert.IsNull (da.Site, "#14");
                        Assert.IsNotNull (da.TableMappings, "#15");
                        Assert.AreEqual (0, da.TableMappings.Count, "#16");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#17");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#18");
                }
 
@@ -176,21 +144,15 @@ namespace MonoTests.System.Data.SqlClient
                        SqlDataAdapter da = new SqlDataAdapter ((string) null,
                                selectConnection);
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNotNull (da.SelectCommand, "#11");
                        Assert.IsNotNull (da.SelectCommand.CommandText, "#12");
                        Assert.AreEqual (string.Empty, da.SelectCommand.CommandText, "#13");
@@ -198,9 +160,7 @@ namespace MonoTests.System.Data.SqlClient
                        Assert.IsNull (da.Site, "#15");
                        Assert.IsNotNull (da.TableMappings, "#16");
                        Assert.AreEqual (0, da.TableMappings.Count, "#17");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#18");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#19");
                }
 
@@ -212,30 +172,22 @@ namespace MonoTests.System.Data.SqlClient
                        SqlDataAdapter da = new SqlDataAdapter (selectCommandText,
                                (SqlConnection) null);
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNotNull (da.SelectCommand, "#11");
                        Assert.AreSame (selectCommandText, da.SelectCommand.CommandText, "#12");
                        Assert.IsNull (da.SelectCommand.Connection, "#13");
                        Assert.IsNull (da.Site, "#14");
                        Assert.IsNotNull (da.TableMappings, "#15");
                        Assert.AreEqual (0, da.TableMappings.Count, "#16");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#17");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#18");
                }
 
@@ -248,21 +200,15 @@ namespace MonoTests.System.Data.SqlClient
                        SqlDataAdapter da = new SqlDataAdapter (selectCommandText,
                                selectConnectionString);
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNotNull (da.SelectCommand, "#11");
                        Assert.AreSame (selectCommandText, da.SelectCommand.CommandText, "#12");
                        Assert.IsNotNull (da.SelectCommand.Connection, "#13");
@@ -270,9 +216,7 @@ namespace MonoTests.System.Data.SqlClient
                        Assert.IsNull (da.Site, "#15");
                        Assert.IsNotNull (da.TableMappings, "#16");
                        Assert.AreEqual (0, da.TableMappings.Count, "#17");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#18");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#19");
                }
 
@@ -284,21 +228,15 @@ namespace MonoTests.System.Data.SqlClient
                        SqlDataAdapter da = new SqlDataAdapter ((string) null,
                                selectConnectionString);
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNotNull (da.SelectCommand, "#11");
                        Assert.IsNotNull (da.SelectCommand.CommandText, "#12");
                        Assert.AreEqual (string.Empty, da.SelectCommand.CommandText, "#13");
@@ -307,9 +245,7 @@ namespace MonoTests.System.Data.SqlClient
                        Assert.IsNull (da.Site, "#16");
                        Assert.IsNotNull (da.TableMappings, "#17");
                        Assert.AreEqual (0, da.TableMappings.Count, "#18");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#19");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#20");
                }
 
@@ -321,21 +257,15 @@ namespace MonoTests.System.Data.SqlClient
                        SqlDataAdapter da = new SqlDataAdapter (selectCommandText,
                                (string) null);
                        Assert.IsTrue (da.AcceptChangesDuringFill, "#1");
-#if NET_2_0
                        Assert.IsTrue (da.AcceptChangesDuringUpdate, "#2");
-#endif
                        Assert.IsNull (da.Container, "#3");
                        Assert.IsFalse (da.ContinueUpdateOnError, "#4");
                        Assert.IsNull (da.DeleteCommand, "#5");
-#if NET_2_0
                        Assert.AreEqual (LoadOption.OverwriteChanges, da.FillLoadOption, "#6");
-#endif
                        Assert.IsNull (da.InsertCommand, "#7");
                        Assert.AreEqual (MissingMappingAction.Passthrough, da.MissingMappingAction, "#8");
                        Assert.AreEqual (MissingSchemaAction.Add, da.MissingSchemaAction, "#9");
-#if NET_2_0
                        Assert.IsFalse (da.ReturnProviderSpecificTypes, "#10");
-#endif
                        Assert.IsNotNull (da.SelectCommand, "#11");
                        Assert.AreSame (selectCommandText, da.SelectCommand.CommandText, "#12");
                        Assert.IsNotNull (da.SelectCommand.Connection, "#14");
@@ -343,9 +273,7 @@ namespace MonoTests.System.Data.SqlClient
                        Assert.IsNull (da.Site, "#16");
                        Assert.IsNotNull (da.TableMappings, "#17");
                        Assert.AreEqual (0, da.TableMappings.Count, "#18");
-#if NET_2_0
                        Assert.AreEqual (1, da.UpdateBatchSize, "#19");
-#endif
                        Assert.IsNull (da.UpdateCommand, "#20");
                }