[System.Data] Integration tests (#4538)

[mono.git] / mcs / class / System.Data / Test / ProviderTests / ProviderIndependant / DbDataReaderTest.cs

diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs
index 65b0952b1fbad7eb076e99b373ec41dfac805070..75565aee01d713eb07383529a0b578925f49ed0c 100644 (file)
--- a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs
@@ -34,12 +34,9 @@ using System.Data.Odbc;
 using System.Data.SqlClient;
 using System.Data.SqlTypes;
 using System.Globalization;
-
-using Mono.Data;
-
 using NUnit.Framework;
 
-namespace MonoTests.System.Data
+namespace MonoTests.System.Data.Connected
 {
        [TestFixture]
        [Category ("odbc")]
@@ -53,19 +50,16 @@ namespace MonoTests.System.Data
                [SetUp]
                public void SetUp ()
                {
-                       conn = ConnectionManager.Singleton.Connection;
-                       ConnectionManager.Singleton.OpenConnection ();
+                       conn = ConnectionManager.Instance.Sql.Connection;
                        cmd = conn.CreateCommand ();
                }
 
                [TearDown]
                public void TearDown ()
                {
-                       if (cmd != null)
-                               cmd.Dispose ();
-                       if (rdr != null)
-                               rdr.Dispose ();
-                       ConnectionManager.Singleton.CloseConnection ();
+                       cmd?.Dispose ();
+                       rdr?.Dispose ();
+                       ConnectionManager.Instance.Close ();
                }
 
                [Test]