[System.Data] Integration tests (#4538)

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

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 02f13921c895601a0983ba28ca1323e5054b0e5d..0c109b29b9a892502ab77584379e193893016f7c 100644 (file)
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs
@@ -33,12 +33,11 @@ using System;
 using System.Data;
 using System.Data.Common;
 using System.Data.SqlClient;
-using Mono.Data;
 using System.Configuration;
 
 using NUnit.Framework;
 
-namespace MonoTests.System.Data.SqlClient
+namespace MonoTests.System.Data.Connected.SqlClient
 {
        [TestFixture]
        [Category ("sqlserver")]
@@ -47,14 +46,14 @@ namespace MonoTests.System.Data.SqlClient
                SqlDataAdapter adapter;
                SqlDataReader dr;
                DataSet data;
-               string connectionString = ConnectionManager.Singleton.ConnectionString;
+               string connectionString = ConnectionManager.Instance.Sql.ConnectionString;
                SqlConnection conn;
                EngineConfig engine;
 
                [SetUp]
                public void SetUp ()
                {
-                       engine = ConnectionManager.Singleton.Engine;
+                       engine = ConnectionManager.Instance.Sql.EngineConfig;
                }
 
                [TearDown]
@@ -77,9 +76,10 @@ namespace MonoTests.System.Data.SqlClient
                }
 
                [Test]
+               [Category("NotWorking")]
                public void Update_DeleteRow ()
                {
-                       conn = new SqlConnection (ConnectionManager.Singleton.ConnectionString);
+                       conn = new SqlConnection (ConnectionManager.Instance.Sql.ConnectionString);
                        conn.Open ();
 
                        DataTable dt = new DataTable ();
@@ -123,9 +123,10 @@ namespace MonoTests.System.Data.SqlClient
                }
 
                [Test]
+               [Category("NotWorking")]
                public void Update_InsertRow ()
                {
-                       conn = new SqlConnection (ConnectionManager.Singleton.ConnectionString);
+                       conn = new SqlConnection (ConnectionManager.Instance.Sql.ConnectionString);
                        conn.Open ();
 
                        DataTable dt = new DataTable ();
@@ -172,9 +173,10 @@ namespace MonoTests.System.Data.SqlClient
                }
 
                [Test]
+               [Category("NotWorking")]
                public void Update_UpdateRow ()
                {
-                       conn = new SqlConnection (ConnectionManager.Singleton.ConnectionString);
+                       conn = new SqlConnection (ConnectionManager.Instance.Sql.ConnectionString);
                        conn.Open ();
 
                        DataTable dt = new DataTable ();
@@ -249,7 +251,7 @@ namespace MonoTests.System.Data.SqlClient
                                da.Update(dt);
                        } finally {
                                DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table");
-                               ConnectionManager.Singleton.CloseConnection ();
+                               ConnectionManager.Singleton.Sql.CloseConnection ();
                        }
                }
 
@@ -292,7 +294,7 @@ namespace MonoTests.System.Data.SqlClient
                                Assert.AreEqual (true, rowUpdating, "RowUpdating");
                        } finally {
                                DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table");
-                               ConnectionManager.Singleton.CloseConnection ();
+                               ConnectionManager.Singleton.Sql.CloseConnection ();
                        }
                }
                */
@@ -307,9 +309,8 @@ namespace MonoTests.System.Data.SqlClient
                [Test]
                public void NullGuidTest()
                {
-                       conn = (SqlConnection) ConnectionManager.Singleton.Connection;
+                       conn = ConnectionManager.Instance.Sql.Connection;
                        try {
-                               ConnectionManager.Singleton.OpenConnection ();
                                DBHelper.ExecuteNonQuery (conn, "create table #tmp_guid_table ( " +
                                                          " id uniqueidentifier default newid (), " +
                                                          " name char (10))");
@@ -321,7 +322,7 @@ namespace MonoTests.System.Data.SqlClient
                                Assert.AreEqual (1, ds.Tables.Count, "#1");
                                Assert.AreEqual (DBNull.Value, ds.Tables [0].Rows [1] ["id"], "#2");
                        } finally {
-                               ConnectionManager.Singleton.CloseConnection ();
+                               ConnectionManager.Instance.Sql.CloseConnection ();
                        }
                        // the bug 68804 - is that the fill hangs!
                        Assert.AreEqual("Done","Done");
@@ -422,6 +423,7 @@ namespace MonoTests.System.Data.SqlClient
                }
 
                [Test]
+               [Category("NotWorking")]
                public void Fill_Test_Data ()
                {
                        //Check if a table is created for each resultset 
@@ -786,6 +788,7 @@ namespace MonoTests.System.Data.SqlClient
                }
 
                [Test]
+               [Category("NotWorking")]
                public void MissingSchemaActionTest ()
                {
                        adapter = new SqlDataAdapter (
@@ -844,6 +847,7 @@ namespace MonoTests.System.Data.SqlClient
                }
                
                [Test]
+               [Category("NotWorking")]
                public void MissingMappingActionTest ()
                {
                        adapter = new SqlDataAdapter ("select id,type_bit from numeric_family where id=1",
@@ -1011,10 +1015,10 @@ namespace MonoTests.System.Data.SqlClient
                }
 
                [Test]
+               [Ignore("TODO: Set SSPI Connection String")]
                public void CreateViewSSPITest ()
                {
-                       SqlConnection conn = new SqlConnection (ConfigurationSettings.AppSettings ["SSPIConnString"]);
-                       conn.Open ();
+                       var conn = ConnectionManager.Instance.Sql.Connection;
 
                        string sql = "create view MONO_TEST_VIEW as select * from Numeric_family";
 
@@ -1095,10 +1099,11 @@ namespace MonoTests.System.Data.SqlClient
                SqlConnection conn = null;
 
                [Test]
-               public void FillDataAdapterTest () {
-                       conn = (SqlConnection) ConnectionManager.Singleton.Connection;
-                       try {
-                               ConnectionManager.Singleton.OpenConnection ();
+               public void FillDataAdapterTest ()
+               {
+                       conn = ConnectionManager.Instance.Sql.Connection;
+                       try
+                       {
                                DataTable dt = new DataTable();
                                SqlCommand command = new SqlCommand ();
                                command.CommandText = "Select * from employee;";
@@ -1109,7 +1114,7 @@ namespace MonoTests.System.Data.SqlClient
                                Assert.AreEqual (6, dt.Columns.Count, "#2");
                        } finally {
                                DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table");
-                               ConnectionManager.Singleton.CloseConnection ();
+                               ConnectionManager.Instance.Sql.CloseConnection ();
                        }
                }
        }