Merge pull request #1451 from github/fixes/1448-SharedDictionaryManager-test

Avoid need to execute SharedDictionaryManager test in app domain

Author: grokys

src/GitHub.UI/Helpers/SharedDictionaryManager.cs

@@ -11,7 +11,7 @@ public class SharedDictionaryManager : ResourceDictionary
         CachingFactory factory;
         Uri source;
 
-        public SharedDictionaryManager() : this(GetCurrentDomainCachingFactory())
+        public SharedDictionaryManager() : this(CachingFactory.GetInstanceForDomain())
         {
         }
 
@@ -41,37 +41,38 @@ public SharedDictionaryManager(CachingFactory factory)
             }
         }
 
-        public static CachingFactory GetCurrentDomainCachingFactory()
-        {
-            var dataName = typeof(CachingFactory).FullName;
-            var data = AppDomain.CurrentDomain.GetData(dataName);
-
-            var cachingFactory = data as CachingFactory;
-            if (cachingFactory != null)
-            {
-                return cachingFactory;
-            }
-
-            var disposable = data as IDisposable;
-            if (disposable != null)
-            {
-                disposable.Dispose();
-            }
-
-            cachingFactory = new CachingFactory();
-            AppDomain.CurrentDomain.SetData(dataName, cachingFactory);
-            return cachingFactory;
-        }
-
         public class CachingFactory : IDisposable
         {
+            internal static string DataName = typeof(CachingFactory).FullName;
+
             IDictionary<Uri, ResourceDictionary> sharedDictionaries;
             ISet<IDisposable> disposables;
 
             public CachingFactory()
             {
                 sharedDictionaries = new Dictionary<Uri, ResourceDictionary>();
                 disposables = new HashSet<IDisposable>();
+
+                AppDomain.CurrentDomain.SetData(DataName, this);
+            }
+
+            public static CachingFactory GetInstanceForDomain()
+            {
+                var data = AppDomain.CurrentDomain.GetData(DataName);
+
+                var cachingFactory = data as CachingFactory;
+                if (cachingFactory != null)
+                {
+                    return cachingFactory;
+                }
+
+                var disposable = data as IDisposable;
+                if (disposable != null)
+                {
+                    disposable.Dispose();
+                }
+
+                return new CachingFactory();
             }
 
             public ResourceDictionary GetOrCreateResourceDictionary(ResourceDictionary owner, Uri uri)
@@ -118,6 +119,8 @@ void Dispose(bool disposing)
                     disposables.Clear();
                     sharedDictionaries.Clear();
                 }
+
+                AppDomain.CurrentDomain.SetData(DataName, null);
             }
 
             public void Dispose()

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

@@ -81,12 +81,12 @@ public class TheGetCurrentDomainCachingFactoryMethod
             [Test]
             public void CalledTwice_DisposeNotCalled()
             {
-                using (var factory = SharedDictionaryManager.GetCurrentDomainCachingFactory())
+                using (var factory = SharedDictionaryManager.CachingFactory.GetInstanceForDomain())
                 {
                     var disposable = Substitute.For<IDisposable>();
                     factory.TryAddDisposable(disposable);
 
-                    using (SharedDictionaryManager.GetCurrentDomainCachingFactory())
+                    using (SharedDictionaryManager.CachingFactory.GetInstanceForDomain())
                     {
                         disposable.Received(0).Dispose();
                     }
@@ -96,20 +96,16 @@ public void CalledTwice_DisposeNotCalled()
             [Test]
             public void InvokeMethodOnNewAssembly_DisposeCalled()
             {
-                // HACK: Why does this need to be in app domain?
-                AppDomainContext.Invoke(new AppDomainSetup { ApplicationBase = AppDomain.CurrentDomain.BaseDirectory }, () =>
+                using (var factory = SharedDictionaryManager.CachingFactory.GetInstanceForDomain())
                 {
-                    using (var factory = SharedDictionaryManager.GetCurrentDomainCachingFactory())
-                    {
-                        var disposable = Substitute.For<IDisposable>();
-                        factory.TryAddDisposable(disposable);
+                    var disposable = Substitute.For<IDisposable>();
+                    factory.TryAddDisposable(disposable);
 
-                        using (InvokeMethodOnNewAssembly(SharedDictionaryManager.GetCurrentDomainCachingFactory))
-                        {
-                            disposable.Received(1).Dispose();
-                        }
+                    using (InvokeMethodOnNewAssembly(SharedDictionaryManager.CachingFactory.GetInstanceForDomain))
+                    {
+                        disposable.Received(1).Dispose();
                     }
-                });
+                }
             }
 
             static IDisposable InvokeMethodOnNewAssembly<T>(Func<T> func)
@@ -144,7 +140,7 @@ public class TheSourceProperty
             [TestCase(Urls.Test_SharedDictionary_PackUrl)]
             public void IsEqualToSet(string url)
             {
-                using (SharedDictionaryManager.GetCurrentDomainCachingFactory())
+                using (SharedDictionaryManager.CachingFactory.GetInstanceForDomain())
                 {
                     var uri = ResourceDictionaryUtilities.ToPackUri(url);
                     var target = new SharedDictionaryManager();