Added StopUsingMockAdapter method per issue ThatRendle#162

ThatRendle · ThatRendle · commit dcffe8625036 · 2012-02-28T12:36:11.000Z
diff --git a/Simple.Data.BehaviourTest/App.config b/Simple.Data.BehaviourTest/App.config
@@ -8,4 +8,7 @@
   <simpleData>
     <simpleDataConfiguration traceLevel="Error"/>
   </simpleData>
+  <connectionStrings>
+    <add connectionString="foo=bar" name="Mock" providerName="System.Data.Mock"/>
+  </connectionStrings>
 </configuration>
diff --git a/Simple.Data.BehaviourTest/DatabaseIntegrationContext.cs b/Simple.Data.BehaviourTest/DatabaseIntegrationContext.cs
@@ -11,7 +11,7 @@ namespace Simple.Data.IntegrationTest
     public abstract class DatabaseIntegrationContext
     {
         protected MockDatabase _mockDatabase;
-        protected MockConnectionProvider _MockConnectionProvider;
+        protected Mocking.Ado.MockConnectionProvider _MockConnectionProvider;
         protected dynamic _db;
 
         protected abstract void SetSchema(MockSchemaProvider schemaProvider);
@@ -52,7 +52,7 @@ Database CreateDatabase(MockDatabase mockDatabase)
 
             SetSchema(mockSchemaProvider);
 
-            _MockConnectionProvider = new MockConnectionProvider(new MockDbConnection(mockDatabase), mockSchemaProvider);
+            _MockConnectionProvider = new Mocking.Ado.MockConnectionProvider(new MockDbConnection(mockDatabase), mockSchemaProvider);
             var adapter = MockHelper.CreateMockAdoAdapter(_MockConnectionProvider);
             MockHelper.UseMockAdapter(adapter);
             return Database.Open();
diff --git a/Simple.Data.BehaviourTest/Simple.Data.BehaviourTest.csproj b/Simple.Data.BehaviourTest/Simple.Data.BehaviourTest.csproj
@@ -81,6 +81,7 @@
     <Compile Include="Query\WithCountTest.cs" />
     <Compile Include="Query\WithTest.cs" />
     <Compile Include="RangeAndArrayFindTest.cs" />
+    <Compile Include="StopUsingMockTest.cs" />
     <Compile Include="TraceSettingsTest.cs" />
     <Compile Include="TransactionTest.cs" />
     <Compile Include="UpdateTest.cs" />
diff --git a/Simple.Data.BehaviourTest/StopUsingMockTest.cs b/Simple.Data.BehaviourTest/StopUsingMockTest.cs
@@ -0,0 +1,26 @@
+﻿namespace Simple.Data.IntegrationTest
+{
+    using Ado;
+    using Mocking.Ado;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class StopUsingMockTest : DatabaseIntegrationContext
+    {
+        [Test]
+        public void StopUsingMockAdapterStopsUsingMockAdapter()
+        {
+            var mock = new InMemoryAdapter();
+            Database.UseMockAdapter(mock);
+            Database db = Database.OpenNamedConnection("Mock");
+            Assert.AreSame(mock, db.GetAdapter());
+            Database.StopUsingMockAdapter();
+            db = Database.OpenNamedConnection("Mock");
+            Assert.IsInstanceOf<AdoAdapter>(db.GetAdapter());
+        }
+
+        protected override void SetSchema(MockSchemaProvider schemaProvider)
+        {
+        }
+    }
+}
diff --git a/Simple.Data.Mocking/Ado/MockConnectionProvider.cs b/Simple.Data.Mocking/Ado/MockConnectionProvider.cs
@@ -6,12 +6,22 @@
 
 namespace Simple.Data.Mocking.Ado
 {
+    using System.ComponentModel.Composition;
+
+    [Export("System.Data.Mock", typeof(IConnectionProvider))]
     public class MockConnectionProvider : IConnectionProvider
     {
         private readonly DbConnection _connection;
         private readonly MockSchemaProvider _mockSchemaProvider;
         private string _identityFunction;
 
+        public MockConnectionProvider()
+        {
+            _connection = new MockDbConnection(new MockDatabase());
+            _connection.ConnectionString = string.Empty;
+            _mockSchemaProvider = new MockSchemaProvider();
+        }
+
         public MockConnectionProvider(DbConnection connection, MockSchemaProvider mockSchemaProvider, string identityFunction = null)
         {
             _connection = connection;
@@ -21,7 +31,6 @@ public MockConnectionProvider(DbConnection connection, MockSchemaProvider mockSc
 
         public void SetConnectionString(string connectionString)
         {
-            throw new NotImplementedException();
         }
 
         public IDbConnection CreateConnection()
diff --git a/Simple.Data.Mocking/Ado/MockDbConnection.cs b/Simple.Data.Mocking/Ado/MockDbConnection.cs
@@ -52,7 +52,6 @@ public override string ConnectionString
             get { return _mockDatabase.GetHashCode().ToString(); }
             set
             {
-                throw new NotImplementedException();
             }
         }
 
diff --git a/Simple.Data.Mocking/Simple.Data.Mocking.csproj b/Simple.Data.Mocking/Simple.Data.Mocking.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -39,6 +39,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/Simple.Data/Database.cs b/Simple.Data/Database.cs
@@ -201,6 +201,11 @@ public static void UseMockAdapter(Func<Adapter> mockAdapterCreator)
             Data.DatabaseOpener.UseMockAdapter(mockAdapterCreator());
         }
 
+        public static void StopUsingMockAdapter()
+        {
+            Data.DatabaseOpener.StopUsingMock();
+        }
+
         private static TraceLevel? _traceLevel;
         public static TraceLevel TraceLevel
         {
diff --git a/Simple.Data/DatabaseOpener.cs b/Simple.Data/DatabaseOpener.cs
@@ -97,5 +97,10 @@ internal static Database OpenMethod(string adapterName, object settings)
         {
             return new Database(AdapterFactory.Create(adapterName, settings));
         }
+
+        public static void StopUsingMock()
+        {
+            OpenMethods.StopUsingMock();
+        }
     }
 }
diff --git a/Simple.Data/DatabaseOpenerMethods.cs b/Simple.Data/DatabaseOpenerMethods.cs
@@ -72,5 +72,13 @@ public void UseMockAdapter(Func<Adapter> adapterCreator)
             _open = (ignore1, ignore2) => new Database(adapterCreator());
             _openConnectionWithProvider = (ignore1, ignore2) => new Database(adapterCreator());
         }
+
+        public void StopUsingMock()
+        {
+            _openDefault = null;
+            _openFile = _openConnection = _openNamedConnection = null;
+            _open = null;
+            _openConnectionWithProvider = null;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,22 @@`
`6`	`6`
`7`	`7`	`namespace Simple.Data.Mocking.Ado`
`8`	`8`	`{`
	`9`	`+ using System.ComponentModel.Composition;`
	`10`	`+`
	`11`	`+ [Export("System.Data.Mock", typeof(IConnectionProvider))]`
`9`	`12`	`public class MockConnectionProvider : IConnectionProvider`
`10`	`13`	`{`
`11`	`14`	`private readonly DbConnection _connection;`
`12`	`15`	`private readonly MockSchemaProvider _mockSchemaProvider;`
`13`	`16`	`private string _identityFunction;`
`14`	`17`
	`18`	`+ public MockConnectionProvider()`
	`19`	`+ {`
	`20`	`+ _connection = new MockDbConnection(new MockDatabase());`
	`21`	`+ _connection.ConnectionString = string.Empty;`
	`22`	`+ _mockSchemaProvider = new MockSchemaProvider();`
	`23`	`+ }`
	`24`	`+`
`15`	`25`	`public MockConnectionProvider(DbConnection connection, MockSchemaProvider mockSchemaProvider, string identityFunction = null)`
`16`	`26`	`{`
`17`	`27`	`_connection = connection;`
`@@ -21,7 +31,6 @@ public MockConnectionProvider(DbConnection connection, MockSchemaProvider mockSc`
`21`	`31`
`22`	`32`	`public void SetConnectionString(string connectionString)`
`23`	`33`	`{`
`24`		`- throw new NotImplementedException();`
`25`	`34`	`}`
`26`	`35`
`27`	`36`	`public IDbConnection CreateConnection()`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ public override string ConnectionString`
`52`	`52`	`get { return _mockDatabase.GetHashCode().ToString(); }`
`53`	`53`	`set`
`54`	`54`	`{`
`55`		`- throw new NotImplementedException();`
`56`	`55`	`}`
`57`	`56`	`}`
`58`	`57`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,11 @@ public static void UseMockAdapter(Func<Adapter> mockAdapterCreator)`
`201`	`201`	`Data.DatabaseOpener.UseMockAdapter(mockAdapterCreator());`
`202`	`202`	`}`
`203`	`203`
	`204`	`+ public static void StopUsingMockAdapter()`
	`205`	`+ {`
	`206`	`+ Data.DatabaseOpener.StopUsingMock();`
	`207`	`+ }`
	`208`	`+`
`204`	`209`	`private static TraceLevel? _traceLevel;`
`205`	`210`	`public static TraceLevel TraceLevel`
`206`	`211`	`{`
Original file line number	Diff line number	Diff line change
`@@ -97,5 +97,10 @@ internal static Database OpenMethod(string adapterName, object settings)`
`97`	`97`	`{`
`98`	`98`	`return new Database(AdapterFactory.Create(adapterName, settings));`
`99`	`99`	`}`
	`100`	`+`
	`101`	`+ public static void StopUsingMock()`
	`102`	`+ {`
	`103`	`+ OpenMethods.StopUsingMock();`
	`104`	`+ }`
`100`	`105`	`}`
`101`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,5 +72,13 @@ public void UseMockAdapter(Func<Adapter> adapterCreator)`
`72`	`72`	`_open = (ignore1, ignore2) => new Database(adapterCreator());`
`73`	`73`	`_openConnectionWithProvider = (ignore1, ignore2) => new Database(adapterCreator());`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ public void StopUsingMock()`
	`77`	`+ {`
	`78`	`+ _openDefault = null;`
	`79`	`+ _openFile = _openConnection = _openNamedConnection = null;`
	`80`	`+ _open = null;`
	`81`	`+ _openConnectionWithProvider = null;`
	`82`	`+ }`
`75`	`83`	`}`
`76`	`84`	`}`