Enhance AppDomainContext and readability of tests

Author: jcansdale

test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj

@@ -55,9 +55,9 @@
   <ItemGroup>
     <Compile Include="Helpers\AppDomainContext.cs" />
     <Compile Include="Helpers\ResourceDictionaryUtilities.cs" />
-    <Compile Include="Helpers\SharedDictionaryManagerBaseTests.cs" />
     <Compile Include="Helpers\SharedDictionaryManagerTests.cs" />
-    <Compile Include="Helpers\LoadingResourceDictionaryTests.cs" />
+    <Compile Include="Helpers\SharedDictionaryManagerIntegrationTests.cs" />
+    <Compile Include="Helpers\LoadingResourceDictionaryIntegrationTests.cs" />
     <Compile Include="Helpers\Urls.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

test/GitHub.UI.UnitTests/Helpers/AppDomainContext.cs

@@ -1,25 +1,76 @@
 using System;
+using System.Reflection;
+using System.Collections.Generic;
 
 namespace GitHub.UI.Helpers.UnitTests
 {
     public class AppDomainContext : IDisposable
     {
         AppDomain domain;
 
-        public AppDomainContext(AppDomainSetup setup)
+        public static void Invoke(AppDomainSetup setup, Action remoteAction)
         {
+            using (var context = new AppDomainContext(setup))
+            {
+                context.Invoke(remoteAction);
+            }
+        }
+
+        public AppDomainContext(AppDomainSetup setup = null)
+        {
+            if(setup == null)
+            {
+                setup = new AppDomainSetup();
+                setup.ApplicationBase = AppDomain.CurrentDomain.BaseDirectory; // don't use the process base dir
+            }
+
             var friendlyName = GetType().FullName;
             domain = AppDomain.CreateDomain(friendlyName, null, setup);
         }
 
+        public void Dispose()
+        {
+            AppDomain.Unload(domain);
+        }
+
+        public void Invoke(Action remoteAction)
+        {
+            var targetType = remoteAction.Target.GetType();
+            var fieldValues = new Dictionary<string, object>();
+            foreach (var field in targetType.GetFields())
+            {
+                var value = field.GetValue(remoteAction.Target);
+                fieldValues[field.Name] = value;
+            }
+
+            var remove = CreateInstance<Remote>();
+            var assemblyFile = targetType.Assembly.Location;
+            var typeName = targetType.FullName;
+            var methodName = remoteAction.Method.Name;
+            remove.Invoke(assemblyFile, typeName, methodName, fieldValues);
+        }
+
         public T CreateInstance<T>()
         {
             return (T)domain.CreateInstanceFromAndUnwrap(typeof(T).Assembly.CodeBase, typeof(T).FullName);
         }
 
-        public void Dispose()
+        class Remote : MarshalByRefObject
         {
-            AppDomain.Unload(domain);
+            internal void Invoke(string assemblyFile, string typeName, string methodName, Dictionary<string, object> fieldValues)
+            {
+                var assembly = Assembly.LoadFrom(assemblyFile);
+                var type = assembly.GetType(typeName);
+                var obj = Activator.CreateInstance(type);
+                foreach (var field in type.GetFields())
+                {
+                    var value = fieldValues[field.Name];
+                    field.SetValue(obj, value);
+                }
+
+                var dele = (Action)Delegate.CreateDelegate(typeof(Action), obj, methodName);
+                dele();
+            }
         }
     }
 }

…elpers/LoadingResourceDictionaryTests.cs …ingResourceDictionaryIntegrationTests.cstest/GitHub.UI.UnitTests/Helpers/LoadingResourceDictionaryTests.cs renamed to test/GitHub.UI.UnitTests/Helpers/LoadingResourceDictionaryIntegrationTests.cs test/GitHub.UI.UnitTests/Helpers/LoadingResourceDictionaryTests.cs renamed to test/GitHub.UI.UnitTests/Helpers/LoadingResourceDictionaryIntegrationTests.cs

@@ -5,7 +5,7 @@
 
 namespace GitHub.UI.Helpers.UnitTests
 {
-    public class LoadingResourceDictionaryTests
+    public class LoadingResourceDictionaryIntegrationTests
     {
         public class TheSourceProperty
         {
@@ -16,14 +16,15 @@ public class TheSourceProperty
             public void SetInLoadFromContext(string url)
             {
                 var setup = new AppDomainSetup { ApplicationBase = "NOTHING_HERE" };
-                using (var context = new AppDomainContext(setup))
+                AppDomainContext.Invoke(setup, () =>
                 {
-                    var remote = context.CreateInstance<LoadingResourceDictionaryContext>();
+                    var target = new LoadingResourceDictionary();
+                    var packUri = ResourceDictionaryUtilities.ToPackUri(url);
 
-                    int count = remote.CountMergedDictionaries(url);
+                    target.Source = packUri;
 
-                    Assert.That(count, Is.GreaterThan(0));
-                }
+                    Assert.That(target.MergedDictionaries.Count, Is.GreaterThan(0));
+                });
             }
 
             [Description("Load assembly using LoadFrom on application base")]
@@ -32,24 +33,12 @@ public void SetInLoadFromContext(string url)
             [RequiresThread(System.Threading.ApartmentState.STA)]
             public void SetInLoadContext(string url)
             {
-                var local = new LoadingResourceDictionaryContext();
+                var target = new LoadingResourceDictionary();
+                var packUri = ResourceDictionaryUtilities.ToPackUri(url);
 
-                int count = local.CountMergedDictionaries(url);
+                target.Source = packUri;
 
-                Assert.That(count, Is.GreaterThan(0));
-            }
-
-            class LoadingResourceDictionaryContext : MarshalByRefObject
-            {
-                internal int CountMergedDictionaries(string url)
-                {
-                    var target = new LoadingResourceDictionary();
-                    var packUri = ResourceDictionaryUtilities.ToPackUri(url);
-
-                    target.Source = packUri;
-
-                    return target.MergedDictionaries.Count;
-                }
+                Assert.That(target.MergedDictionaries.Count, Is.GreaterThan(0));
             }
         }
 
@@ -65,20 +54,17 @@ public void SetInLoadFromContext(string url)
                 {
                     var remote = context.CreateInstance<ResourceDictionaryContext>();
 
-                    Assert.Throws<FileNotFoundException>(() => remote.CountMergedDictionaries(url));
+                    Assert.Throws<FileNotFoundException>(() => remote.CountResourceDictionaryAndSetSource(url));
                 }
             }
 
             class ResourceDictionaryContext : MarshalByRefObject
             {
-                internal int CountMergedDictionaries(string url)
+                internal void CountResourceDictionaryAndSetSource(string url)
                 {
                     var target = new ResourceDictionary();
                     var packUri = ResourceDictionaryUtilities.ToPackUri(url);
-
                     target.Source = packUri;
-
-                    return target.MergedDictionaries.Count;
                 }
             }
         }

test/GitHub.UI.UnitTests/Helpers/ResourceDictionaryUtilities.cs

@@ -17,6 +17,18 @@ public static Uri ToPackUri(string url)
             return new Uri(url);
         }
 
+        public static string DumpMergedDictionaries(ResourceDictionary target, string url)
+        {
+            SetProperty(target, "Source", ToPackUri(url));
+            return DumpResourceDictionary(target);
+        }
+
+        static void SetProperty(object target, string name, object value)
+        {
+            var prop = target.GetType().GetProperty(name);
+            prop.SetValue(target, value);
+        }
+
         public static string DumpResourceDictionary(ResourceDictionary rd, string indent = "")
         {
             var writer = new StringWriter();