X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Data%2FTest%2FProviderTests%2FProviderIndependant%2FDbDataReaderTest.cs;h=75565aee01d713eb07383529a0b578925f49ed0c;hb=2115cd7394c0212e246ac44df0a360ed8ae036d5;hp=65b0952b1fbad7eb076e99b373ec41dfac805070;hpb=559ad5b34bc086b51af2e589b32ea2eae0f78820;p=mono.git

diff --git a/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs b/mcs/class/System.Data/Test/ProviderTests/ProviderIndependant/DbDataReaderTest.cs
index 65b0952b1fb..75565aee01d 100644
--- 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]