Tweaked tests to work in NCrunch by forcing load of assembly under test.

ThatRendle · ThatRendle · commit 0874641b4bae · 2012-06-19T13:28:51.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ Simple.Data.sln.DotSettings.user
 Simple.Data/Simple.Data.idc
 .DS_Store
 mono-release-*
+*ncrunch*
diff --git a/Simple.Data.SqlCe40Test/ConnectionProviderTest.cs b/Simple.Data.SqlCe40Test/ConnectionProviderTest.cs
@@ -5,6 +5,7 @@
 
 namespace Simple.Data.SqlCe40Test
 {
+    using System.Diagnostics;
     using Ado;
     using NUnit.Framework;
     using SqlCe40;
@@ -27,4 +28,15 @@ public void SqlCeDoesNotSupportCompoundStatements()
             Assert.IsFalse(target.SupportsCompoundStatements);
         }
     }
+
+    [SetUpFixture]
+    public class Setup
+    {
+        [SetUp]
+        public void ForceLoadOfSimpleDataSqlCe40()
+        {
+            var provider = new SqlCe40.SqlCe40ConnectionProvider();
+            Trace.Write("Loaded provider.");
+        }
+    }
 }
diff --git a/Simple.Data.SqlTest/BulkInsertTest.cs b/Simple.Data.SqlTest/BulkInsertTest.cs
@@ -1,6 +1,7 @@
 ﻿namespace Simple.Data.SqlTest
 {
     using System.Collections.Generic;
+    using System.Diagnostics;
     using NUnit.Framework;
 
     [TestFixture]
diff --git a/Simple.Data.SqlTest/DatabaseHelper.cs b/Simple.Data.SqlTest/DatabaseHelper.cs
@@ -24,6 +24,7 @@ public static dynamic Open()
 
         public static void Reset()
         {
+            var provider = new SqlServer.SqlConnectionProvider();
             using (var cn = new SqlConnection(ConnectionString))
             {
                 cn.Open();
diff --git a/Simple.Data.SqlTest/SetupFixture.cs b/Simple.Data.SqlTest/SetupFixture.cs
@@ -8,12 +8,17 @@
 
 namespace Simple.Data.SqlTest
 {
+    using System.Diagnostics;
+
     [SetUpFixture]
     public class SetupFixture
     {
         [SetUp]
         public void CreateStoredProcedures()
         {
+            var provider = new SqlServer.SqlConnectionProvider();
+            Trace.Write("Loaded provider " + provider.GetType().Name);
+
             using (var cn = new SqlConnection(Properties.Settings.Default.ConnectionString))
             {
                 cn.Open();
diff --git a/Simple.Data.SqlTest/UpsertTests.cs b/Simple.Data.SqlTest/UpsertTests.cs
@@ -176,6 +176,7 @@ public void TestMultiUpsertWithStaticTypeObjectsAndNoReturn()
                                 new User { Name = "Wowbagger", Password = "teatime", Age = int.MaxValue }
                             };
 
+            //IList<User> actuals = db.Users.Upsert(users).ToList<User>();
             db.Users.Upsert(users);
 
             var slartibartfast = db.Users.FindByName("Slartibartfast");
diff --git a/Simple.Data/MefHelper.cs b/Simple.Data/MefHelper.cs
@@ -12,9 +12,19 @@ namespace Simple.Data
 
     class MefHelper : Composer
     {
+        private static readonly Assembly ThisAssembly = typeof (MefHelper).Assembly;
+
         public override T Compose<T>()
         {
-            using (var container = CreateContainer())
+            using (var container = CreateAppDomainContainer())
+            {
+                var exports = container.GetExports<T>().ToList();
+                if (exports.Count == 1)
+                {
+                    return exports.Single().Value;
+                }
+            }
+            using (var container = CreateFolderContainer())
             {
                 var exports = container.GetExports<T>().ToList();
                 if (exports.Count == 0) throw new SimpleDataException("No ADO Provider found.");
@@ -27,7 +37,15 @@ public override T Compose<T>(string contractName)
         {
             try
             {
-                using (var container = CreateContainer())
+                using (var container = CreateAppDomainContainer())
+                {
+                    var exports = container.GetExports<T>(contractName).ToList();
+                    if (exports.Count == 1)
+                    {
+                        return exports.Single().Value;
+                    }
+                }
+                using (var container = CreateFolderContainer())
                 {
                     var exports = container.GetExports<T>(contractName).ToList();
                     if (exports.Count == 0) throw new SimpleDataException("No ADO Provider found.");
@@ -55,7 +73,7 @@ public static T GetAdjacentComponent<T>(Type knownSiblingType)
 
         static string GetThisAssemblyPath()
         {
-            var path = Assembly.GetExecutingAssembly().CodeBase.Replace("file:///", "").Replace("file://", "//");
+            var path = ThisAssembly.CodeBase.Replace("file:///", "").Replace("file://", "//");
             path = Path.GetDirectoryName(path);
             if (path == null) throw new ArgumentException("Unrecognised file.");
             if (!Path.IsPathRooted(path))
@@ -65,11 +83,11 @@ static string GetThisAssemblyPath()
             return path;
         }
 
-        private static CompositionContainer CreateContainer()
+        private static CompositionContainer CreateFolderContainer()
         {
 			var path = GetThisAssemblyPath ();
 
-            var assemblyCatalog = new AssemblyCatalog(Assembly.GetExecutingAssembly());
+            var assemblyCatalog = new AssemblyCatalog(ThisAssembly);
 			var aggregateCatalog = new AggregateCatalog(assemblyCatalog);
 			foreach (string file in System.IO.Directory.GetFiles(path, "Simple.Data.*.dll"))
 			{
@@ -78,5 +96,15 @@ private static CompositionContainer CreateContainer()
 			}
             return new CompositionContainer(aggregateCatalog);
         }
+
+        private static CompositionContainer CreateAppDomainContainer()
+        {
+            var aggregateCatalog = new AggregateCatalog();
+            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.GlobalAssemblyCache))
+            {
+                aggregateCatalog.Catalogs.Add(new AssemblyCatalog(assembly));
+            }
+            return new CompositionContainer(aggregateCatalog);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Simple.Data.SqlCe40Test`
`7`	`7`	`{`
	`8`	`+ using System.Diagnostics;`
`8`	`9`	`using Ado;`
`9`	`10`	`using NUnit.Framework;`
`10`	`11`	`using SqlCe40;`
`@@ -27,4 +28,15 @@ public void SqlCeDoesNotSupportCompoundStatements()`
`27`	`28`	`Assert.IsFalse(target.SupportsCompoundStatements);`
`28`	`29`	`}`
`29`	`30`	`}`
	`31`	`+`
	`32`	`+ [SetUpFixture]`
	`33`	`+ public class Setup`
	`34`	`+ {`
	`35`	`+ [SetUp]`
	`36`	`+ public void ForceLoadOfSimpleDataSqlCe40()`
	`37`	`+ {`
	`38`	`+ var provider = new SqlCe40.SqlCe40ConnectionProvider();`
	`39`	`+ Trace.Write("Loaded provider.");`
	`40`	`+ }`
	`41`	`+ }`
`30`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace Simple.Data.SqlTest`
`2`	`2`	`{`
`3`	`3`	`using System.Collections.Generic;`
	`4`	`+ using System.Diagnostics;`
`4`	`5`	`using NUnit.Framework;`
`5`	`6`
`6`	`7`	`[TestFixture]`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public static dynamic Open()`
`24`	`24`
`25`	`25`	`public static void Reset()`
`26`	`26`	`{`
	`27`	`+ var provider = new SqlServer.SqlConnectionProvider();`
`27`	`28`	`using (var cn = new SqlConnection(ConnectionString))`
`28`	`29`	`{`
`29`	`30`	`cn.Open();`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,17 @@`
`8`	`8`
`9`	`9`	`namespace Simple.Data.SqlTest`
`10`	`10`	`{`
	`11`	`+ using System.Diagnostics;`
	`12`	`+`
`11`	`13`	`[SetUpFixture]`
`12`	`14`	`public class SetupFixture`
`13`	`15`	`{`
`14`	`16`	`[SetUp]`
`15`	`17`	`public void CreateStoredProcedures()`
`16`	`18`	`{`
	`19`	`+ var provider = new SqlServer.SqlConnectionProvider();`
	`20`	`+ Trace.Write("Loaded provider " + provider.GetType().Name);`
	`21`	`+`
`17`	`22`	`using (var cn = new SqlConnection(Properties.Settings.Default.ConnectionString))`
`18`	`23`	`{`
`19`	`24`	`cn.Open();`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,19 @@ namespace Simple.Data`
`12`	`12`
`13`	`13`	`class MefHelper : Composer`
`14`	`14`	`{`
	`15`	`+ private static readonly Assembly ThisAssembly = typeof (MefHelper).Assembly;`
	`16`	`+`
`15`	`17`	`public override T Compose<T>()`
`16`	`18`	`{`
`17`		`- using (var container = CreateContainer())`
	`19`	`+ using (var container = CreateAppDomainContainer())`
	`20`	`+ {`
	`21`	`+ var exports = container.GetExports<T>().ToList();`
	`22`	`+ if (exports.Count == 1)`
	`23`	`+ {`
	`24`	`+ return exports.Single().Value;`
	`25`	`+ }`
	`26`	`+ }`
	`27`	`+ using (var container = CreateFolderContainer())`
`18`	`28`	`{`
`19`	`29`	`var exports = container.GetExports<T>().ToList();`
`20`	`30`	`if (exports.Count == 0) throw new SimpleDataException("No ADO Provider found.");`
`@@ -27,7 +37,15 @@ public override T Compose<T>(string contractName)`
`27`	`37`	`{`
`28`	`38`	`try`
`29`	`39`	`{`
`30`		`- using (var container = CreateContainer())`
	`40`	`+ using (var container = CreateAppDomainContainer())`
	`41`	`+ {`
	`42`	`+ var exports = container.GetExports<T>(contractName).ToList();`
	`43`	`+ if (exports.Count == 1)`
	`44`	`+ {`
	`45`	`+ return exports.Single().Value;`
	`46`	`+ }`
	`47`	`+ }`
	`48`	`+ using (var container = CreateFolderContainer())`
`31`	`49`	`{`
`32`	`50`	`var exports = container.GetExports<T>(contractName).ToList();`
`33`	`51`	`if (exports.Count == 0) throw new SimpleDataException("No ADO Provider found.");`
`@@ -55,7 +73,7 @@ public static T GetAdjacentComponent<T>(Type knownSiblingType)`
`55`	`73`
`56`	`74`	`static string GetThisAssemblyPath()`
`57`	`75`	`{`
`58`		`- var path = Assembly.GetExecutingAssembly().CodeBase.Replace("file:///", "").Replace("file://", "//");`
	`76`	`+ var path = ThisAssembly.CodeBase.Replace("file:///", "").Replace("file://", "//");`
`59`	`77`	`path = Path.GetDirectoryName(path);`
`60`	`78`	`if (path == null) throw new ArgumentException("Unrecognised file.");`
`61`	`79`	`if (!Path.IsPathRooted(path))`
`@@ -65,11 +83,11 @@ static string GetThisAssemblyPath()`
`65`	`83`	`return path;`
`66`	`84`	`}`
`67`	`85`
`68`		`- private static CompositionContainer CreateContainer()`
	`86`	`+ private static CompositionContainer CreateFolderContainer()`
`69`	`87`	`{`
`70`	`88`	`var path = GetThisAssemblyPath ();`
`71`	`89`
`72`		`- var assemblyCatalog = new AssemblyCatalog(Assembly.GetExecutingAssembly());`
	`90`	`+ var assemblyCatalog = new AssemblyCatalog(ThisAssembly);`
`73`	`91`	`var aggregateCatalog = new AggregateCatalog(assemblyCatalog);`
`74`	`92`	`foreach (string file in System.IO.Directory.GetFiles(path, "Simple.Data.*.dll"))`
`75`	`93`	`{`
`@@ -78,5 +96,15 @@ private static CompositionContainer CreateContainer()`
`78`	`96`	`}`
`79`	`97`	`return new CompositionContainer(aggregateCatalog);`
`80`	`98`	`}`
	`99`	`+`
	`100`	`+ private static CompositionContainer CreateAppDomainContainer()`
	`101`	`+ {`
	`102`	`+ var aggregateCatalog = new AggregateCatalog();`
	`103`	`+ foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.GlobalAssemblyCache))`
	`104`	`+ {`
	`105`	`+ aggregateCatalog.Catalogs.Add(new AssemblyCatalog(assembly));`
	`106`	`+ }`
	`107`	`+ return new CompositionContainer(aggregateCatalog);`
	`108`	`+ }`
`81`	`109`	`}`
`82`	`110`	`}`