Move all URL strings into Urls.cs

jcansdale · jcansdale · commit e7df656014f9 · 2017-04-07T12:19:00.000+01:00
diff --git a/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj b/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj
@@ -58,6 +58,7 @@
     <Compile Include="Helpers\SharedDictionaryManagerBaseTests.cs" />
     <Compile Include="Helpers\SharedDictionaryManagerTests.cs" />
     <Compile Include="Helpers\LoadingResourceDictionaryTests.cs" />
+    <Compile Include="Helpers\Urls.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/test/GitHub.UI.UnitTests/Helpers/LoadingResourceDictionaryTests.cs b/test/GitHub.UI.UnitTests/Helpers/LoadingResourceDictionaryTests.cs
@@ -10,8 +10,8 @@ public class LoadingResourceDictionaryTests
         public class TheSourceProperty
         {
             [Description("Load assembly using LoadFrom away from application base")]
-            [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]
-            [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]
+            [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]
+            [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]
             [RequiresThread(System.Threading.ApartmentState.STA)]
             public void SetInLoadFromContext(string url)
             {
@@ -27,8 +27,8 @@ public void SetInLoadFromContext(string url)
             }
 
             [Description("Load assembly using LoadFrom on application base")]
-            [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]
-            [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]
+            [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]
+            [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]
             [RequiresThread(System.Threading.ApartmentState.STA)]
             public void SetInLoadContext(string url)
             {
@@ -56,8 +56,8 @@ internal int CountMergedDictionaries(string url)
         public class TheResourceDictionarySourceProperty
         {
             [Description("This shows why LoadingResourceDictionary is necessary")]
-            [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]
-            [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]
+            [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]
+            [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]
             public void SetInLoadFromContext(string url)
             {
                 var setup = new AppDomainSetup { ApplicationBase = "NOTHING_HERE" };
diff --git a/test/GitHub.UI.UnitTests/Helpers/SharedDictionary.xaml b/test/GitHub.UI.UnitTests/Helpers/SharedDictionary.xaml
@@ -1,10 +1,2 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    xmlns:cache="clr-namespace:GitHub.UI.UnitTests"
-                    xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/GitHub.UI;component/Assets/Styles.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+</ResourceDictionary>
diff --git a/test/GitHub.UI.UnitTests/Helpers/SharedDictionaryManagerBaseTests.cs b/test/GitHub.UI.UnitTests/Helpers/SharedDictionaryManagerBaseTests.cs
@@ -16,9 +16,9 @@ public class TheGetOrCreateResourceDictionaryMethod
                 [Test]
                 public void ReturnsResourceDictionary()
                 {
-                    using (var factory = new SharedDictionaryManagerBase.CachingFactory())
+                    using (var factory = new SharedDictionaryManager.CachingFactory())
                     {
-                        var uri = ResourceDictionaryUtilities.ToPackUri("pack://application:,,,/GitHub.UI.UnitTests;component/Helpers/SharedDictionary.xaml");
+                        var uri = ResourceDictionaryUtilities.ToPackUri(Urls.Test_SharedDictionary_PackUrl);
                         var owner = new ResourceDictionary();
 
                         var resourceDictionary = factory.GetOrCreateResourceDictionary(owner, uri);
@@ -30,9 +30,9 @@ public void ReturnsResourceDictionary()
                 [Test]
                 public void ReturnsCachedResourceDictionary()
                 {
-                    using (var factory = new SharedDictionaryManagerBase.CachingFactory())
+                    using (var factory = new SharedDictionaryManager.CachingFactory())
                     {
-                        var uri = ResourceDictionaryUtilities.ToPackUri("pack://application:,,,/GitHub.UI.UnitTests;component/Helpers/SharedDictionary.xaml");
+                        var uri = ResourceDictionaryUtilities.ToPackUri(Urls.Test_SharedDictionary_PackUrl);
                         var owner = new ResourceDictionary();
 
                         var resourceDictionary1 = factory.GetOrCreateResourceDictionary(owner, uri);
@@ -48,7 +48,7 @@ public class TheDisposeMethod
                 [Test]
                 public void CallsDisposeOnDisposable()
                 {
-                    using (var factory = new SharedDictionaryManagerBase.CachingFactory())
+                    using (var factory = new SharedDictionaryManager.CachingFactory())
                     {
                         var disposable = Substitute.For<IDisposable>();
                         factory.TryAddDisposable(disposable);
@@ -62,7 +62,7 @@ public void CallsDisposeOnDisposable()
                 [Test]
                 public void AddedTwice_DisposeCalledOnce()
                 {
-                    using (var factory = new SharedDictionaryManagerBase.CachingFactory())
+                    using (var factory = new SharedDictionaryManager.CachingFactory())
                     {
                         var disposable = Substitute.For<IDisposable>();
                         factory.TryAddDisposable(disposable);
@@ -81,12 +81,12 @@ public class TheGetCurrentDomainCachingFactoryMethod
             [Test]
             public void CalledTwice_DisposeNotCalled()
             {
-                using (var factory = SharedDictionaryManagerBase.GetCurrentDomainCachingFactory())
+                using (var factory = SharedDictionaryManager.GetCurrentDomainCachingFactory())
                 {
                     var disposable = Substitute.For<IDisposable>();
                     factory.TryAddDisposable(disposable);
 
-                    SharedDictionaryManagerBase.GetCurrentDomainCachingFactory();
+                    SharedDictionaryManager.GetCurrentDomainCachingFactory();
 
                     disposable.Received(0).Dispose();
                 }
@@ -95,12 +95,12 @@ public void CalledTwice_DisposeNotCalled()
             [Test]
             public void InvokeMethodOnNewAssembly_DisposeCalled()
             {
-                using (var factory = SharedDictionaryManagerBase.GetCurrentDomainCachingFactory())
+                using (var factory = SharedDictionaryManager.GetCurrentDomainCachingFactory())
                 {
                     var disposable = Substitute.For<IDisposable>();
                     factory.TryAddDisposable(disposable);
 
-                    using (InvokeMethodOnNewAssembly(SharedDictionaryManagerBase.GetCurrentDomainCachingFactory))
+                    using (InvokeMethodOnNewAssembly(SharedDictionaryManager.GetCurrentDomainCachingFactory))
                     {
                         disposable.Received(1).Dispose();
                     }
@@ -121,28 +121,30 @@ static IDisposable InvokeMethodOnNewAssembly<T>(Func<T> func)
 
         public class TheFixDesignTimeUriMethod
         {
-            [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml", "pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]
-            [TestCase("file:///x:/solution/src/GitHub.VisualStudio.UI/SharedDictionary.xaml", "pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]
-            [TestCase("file:///x:/solution/src/GitHub.VisualStudio.UI/Styles/GitHubComboBox.xaml", "pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubComboBox.xaml")]
+            [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl, Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]
+            [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_FileUrl, Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]
+
+
+            [TestCase(Urls.GitHub_VisualStudio_UI_Styles_GitHubComboBox_FileUrl, Urls.GitHub_VisualStudio_UI_Styles_GitHubComboBox_PackUrl)]
             public void FixDesignTimeUri(string inUrl, string outUrl)
             {
                 var inUri = ResourceDictionaryUtilities.ToPackUri(inUrl);
 
-                var outUri = SharedDictionaryManagerBase.FixDesignTimeUri(inUri);
+                var outUri = SharedDictionaryManager.FixDesignTimeUri(inUri);
 
                 Assert.That(outUri.ToString(), Is.EqualTo(outUrl));
             }
         }
 
         public class TheSourceProperty
         {
-            [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]
+            [TestCase(Urls.Test_SharedDictionary_PackUrl)]
             public void IsEqualToSet(string url)
             {
-                using (SharedDictionaryManagerBase.GetCurrentDomainCachingFactory())
+                using (SharedDictionaryManager.GetCurrentDomainCachingFactory())
                 {
                     var uri = ResourceDictionaryUtilities.ToPackUri(url);
-                    var target = new SharedDictionaryManagerBase();
+                    var target = new SharedDictionaryManager();
 
                     target.Source = uri;
 
diff --git a/test/GitHub.UI.UnitTests/Helpers/SharedDictionaryManagerTests.cs b/test/GitHub.UI.UnitTests/Helpers/SharedDictionaryManagerTests.cs
@@ -8,10 +8,10 @@ public partial class SharedDictionaryManagerTests
     {
         public class TheSourceProperty
         {
-            [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]
-            [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]
-            [TestCase("file:///x:/Project/src/GitHub.UI/SharedDictionary.xaml", Description = "This is a design time URL")]
-            [TestCase("file:///x:/Project/src/GitHub.VisualStudio.UI/SharedDictionary.xaml", Description = "This is a design time URL")]
+            [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]
+            [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]
+            [TestCase(Urls.GitHub_UI_SharedDictionary_FileUrl, Description = "This is a design time URL")]
+            [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_FileUrl, Description = "This is a design time URL")]
             [RequiresThread(System.Threading.ApartmentState.STA)]
             public void SetSourceOnDifferentInstances_ExpectTheSameObjects(string url)
             {
@@ -28,8 +28,8 @@ public void SetSourceOnDifferentInstances_ExpectTheSameObjects(string url)
             }
 
             // This is why we need `SharedDictionaryManager`.
-            [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]
-            [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]
+            [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]
+            [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]
             [RequiresThread(System.Threading.ApartmentState.STA)]
             public void SetResourceDictionarySourceOnDifferentInstances_ExpectDifferentObjects(string url)
             {
diff --git a/test/GitHub.UI.UnitTests/Helpers/Urls.cs b/test/GitHub.UI.UnitTests/Helpers/Urls.cs
@@ -0,0 +1,16 @@
+﻿namespace GitHub.UI.Helpers.UnitTests
+{
+    public class Urls
+    {
+        public const string Test_SharedDictionary_PackUrl = "pack://application:,,,/GitHub.UI.UnitTests;component/Helpers/SharedDictionary.xaml";
+
+        public const string GitHub_UI_SharedDictionary_PackUrl = "pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml";
+        public const string GitHub_UI_SharedDictionary_FileUrl = "file:///x:/Project/src/GitHub.UI/SharedDictionary.xaml", Description = "This is a design time URL";
+
+        public const string GitHub_VisualStudio_UI_SharedDictionary_PackUrl = "pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml";
+        public const string GitHub_VisualStudio_UI_SharedDictionary_FileUrl = "file:///x:/Project/src/GitHub.VisualStudio.UI/SharedDictionary.xaml";
+
+        public const string GitHub_VisualStudio_UI_Styles_GitHubComboBox_PackUrl = "pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubComboBox.xaml";
+        public const string GitHub_VisualStudio_UI_Styles_GitHubComboBox_FileUrl = "file:///x:/solution/src/GitHub.VisualStudio.UI/Styles/GitHubComboBox.xaml";
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public class LoadingResourceDictionaryTests`
`10`	`10`	`public class TheSourceProperty`
`11`	`11`	`{`
`12`	`12`	`[Description("Load assembly using LoadFrom away from application base")]`
`13`		`- [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]`
`14`		`- [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]`
	`13`	`+ [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]`
	`14`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]`
`15`	`15`	`[RequiresThread(System.Threading.ApartmentState.STA)]`
`16`	`16`	`public void SetInLoadFromContext(string url)`
`17`	`17`	`{`
`@@ -27,8 +27,8 @@ public void SetInLoadFromContext(string url)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`[Description("Load assembly using LoadFrom on application base")]`
`30`		`- [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]`
`31`		`- [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]`
	`30`	`+ [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]`
	`31`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]`
`32`	`32`	`[RequiresThread(System.Threading.ApartmentState.STA)]`
`33`	`33`	`public void SetInLoadContext(string url)`
`34`	`34`	`{`
`@@ -56,8 +56,8 @@ internal int CountMergedDictionaries(string url)`
`56`	`56`	`public class TheResourceDictionarySourceProperty`
`57`	`57`	`{`
`58`	`58`	`[Description("This shows why LoadingResourceDictionary is necessary")]`
`59`		`- [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]`
`60`		`- [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]`
	`59`	`+ [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]`
	`60`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]`
`61`	`61`	`public void SetInLoadFromContext(string url)`
`62`	`62`	`{`
`63`	`63`	`var setup = new AppDomainSetup { ApplicationBase = "NOTHING_HERE" };`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ public class TheGetOrCreateResourceDictionaryMethod`
`16`	`16`	`[Test]`
`17`	`17`	`public void ReturnsResourceDictionary()`
`18`	`18`	`{`
`19`		`- using (var factory = new SharedDictionaryManagerBase.CachingFactory())`
	`19`	`+ using (var factory = new SharedDictionaryManager.CachingFactory())`
`20`	`20`	`{`
`21`		`- var uri = ResourceDictionaryUtilities.ToPackUri("pack://application:,,,/GitHub.UI.UnitTests;component/Helpers/SharedDictionary.xaml");`
	`21`	`+ var uri = ResourceDictionaryUtilities.ToPackUri(Urls.Test_SharedDictionary_PackUrl);`
`22`	`22`	`var owner = new ResourceDictionary();`
`23`	`23`
`24`	`24`	`var resourceDictionary = factory.GetOrCreateResourceDictionary(owner, uri);`
`@@ -30,9 +30,9 @@ public void ReturnsResourceDictionary()`
`30`	`30`	`[Test]`
`31`	`31`	`public void ReturnsCachedResourceDictionary()`
`32`	`32`	`{`
`33`		`- using (var factory = new SharedDictionaryManagerBase.CachingFactory())`
	`33`	`+ using (var factory = new SharedDictionaryManager.CachingFactory())`
`34`	`34`	`{`
`35`		`- var uri = ResourceDictionaryUtilities.ToPackUri("pack://application:,,,/GitHub.UI.UnitTests;component/Helpers/SharedDictionary.xaml");`
	`35`	`+ var uri = ResourceDictionaryUtilities.ToPackUri(Urls.Test_SharedDictionary_PackUrl);`
`36`	`36`	`var owner = new ResourceDictionary();`
`37`	`37`
`38`	`38`	`var resourceDictionary1 = factory.GetOrCreateResourceDictionary(owner, uri);`
`@@ -48,7 +48,7 @@ public class TheDisposeMethod`
`48`	`48`	`[Test]`
`49`	`49`	`public void CallsDisposeOnDisposable()`
`50`	`50`	`{`
`51`		`- using (var factory = new SharedDictionaryManagerBase.CachingFactory())`
	`51`	`+ using (var factory = new SharedDictionaryManager.CachingFactory())`
`52`	`52`	`{`
`53`	`53`	`var disposable = Substitute.For<IDisposable>();`
`54`	`54`	`factory.TryAddDisposable(disposable);`
`@@ -62,7 +62,7 @@ public void CallsDisposeOnDisposable()`
`62`	`62`	`[Test]`
`63`	`63`	`public void AddedTwice_DisposeCalledOnce()`
`64`	`64`	`{`
`65`		`- using (var factory = new SharedDictionaryManagerBase.CachingFactory())`
	`65`	`+ using (var factory = new SharedDictionaryManager.CachingFactory())`
`66`	`66`	`{`
`67`	`67`	`var disposable = Substitute.For<IDisposable>();`
`68`	`68`	`factory.TryAddDisposable(disposable);`
`@@ -81,12 +81,12 @@ public class TheGetCurrentDomainCachingFactoryMethod`
`81`	`81`	`[Test]`
`82`	`82`	`public void CalledTwice_DisposeNotCalled()`
`83`	`83`	`{`
`84`		`- using (var factory = SharedDictionaryManagerBase.GetCurrentDomainCachingFactory())`
	`84`	`+ using (var factory = SharedDictionaryManager.GetCurrentDomainCachingFactory())`
`85`	`85`	`{`
`86`	`86`	`var disposable = Substitute.For<IDisposable>();`
`87`	`87`	`factory.TryAddDisposable(disposable);`
`88`	`88`
`89`		`- SharedDictionaryManagerBase.GetCurrentDomainCachingFactory();`
	`89`	`+ SharedDictionaryManager.GetCurrentDomainCachingFactory();`
`90`	`90`
`91`	`91`	`disposable.Received(0).Dispose();`
`92`	`92`	`}`
`@@ -95,12 +95,12 @@ public void CalledTwice_DisposeNotCalled()`
`95`	`95`	`[Test]`
`96`	`96`	`public void InvokeMethodOnNewAssembly_DisposeCalled()`
`97`	`97`	`{`
`98`		`- using (var factory = SharedDictionaryManagerBase.GetCurrentDomainCachingFactory())`
	`98`	`+ using (var factory = SharedDictionaryManager.GetCurrentDomainCachingFactory())`
`99`	`99`	`{`
`100`	`100`	`var disposable = Substitute.For<IDisposable>();`
`101`	`101`	`factory.TryAddDisposable(disposable);`
`102`	`102`
`103`		`- using (InvokeMethodOnNewAssembly(SharedDictionaryManagerBase.GetCurrentDomainCachingFactory))`
	`103`	`+ using (InvokeMethodOnNewAssembly(SharedDictionaryManager.GetCurrentDomainCachingFactory))`
`104`	`104`	`{`
`105`	`105`	`disposable.Received(1).Dispose();`
`106`	`106`	`}`
`@@ -121,28 +121,30 @@ static IDisposable InvokeMethodOnNewAssembly<T>(Func<T> func)`
`121`	`121`
`122`	`122`	`public class TheFixDesignTimeUriMethod`
`123`	`123`	`{`
`124`		`- [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml", "pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]`
`125`		`- [TestCase("file:///x:/solution/src/GitHub.VisualStudio.UI/SharedDictionary.xaml", "pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]`
`126`		`- [TestCase("file:///x:/solution/src/GitHub.VisualStudio.UI/Styles/GitHubComboBox.xaml", "pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/GitHubComboBox.xaml")]`
	`124`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl, Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]`
	`125`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_FileUrl, Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]`
	`126`	`+`
	`127`	`+`
	`128`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_Styles_GitHubComboBox_FileUrl, Urls.GitHub_VisualStudio_UI_Styles_GitHubComboBox_PackUrl)]`
`127`	`129`	`public void FixDesignTimeUri(string inUrl, string outUrl)`
`128`	`130`	`{`
`129`	`131`	`var inUri = ResourceDictionaryUtilities.ToPackUri(inUrl);`
`130`	`132`
`131`		`- var outUri = SharedDictionaryManagerBase.FixDesignTimeUri(inUri);`
	`133`	`+ var outUri = SharedDictionaryManager.FixDesignTimeUri(inUri);`
`132`	`134`
`133`	`135`	`Assert.That(outUri.ToString(), Is.EqualTo(outUrl));`
`134`	`136`	`}`
`135`	`137`	`}`
`136`	`138`
`137`	`139`	`public class TheSourceProperty`
`138`	`140`	`{`
`139`		`- [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]`
	`141`	`+ [TestCase(Urls.Test_SharedDictionary_PackUrl)]`
`140`	`142`	`public void IsEqualToSet(string url)`
`141`	`143`	`{`
`142`		`- using (SharedDictionaryManagerBase.GetCurrentDomainCachingFactory())`
	`144`	`+ using (SharedDictionaryManager.GetCurrentDomainCachingFactory())`
`143`	`145`	`{`
`144`	`146`	`var uri = ResourceDictionaryUtilities.ToPackUri(url);`
`145`		`- var target = new SharedDictionaryManagerBase();`
	`147`	`+ var target = new SharedDictionaryManager();`
`146`	`148`
`147`	`149`	`target.Source = uri;`
`148`	`150`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ public partial class SharedDictionaryManagerTests`
`8`	`8`	`{`
`9`	`9`	`public class TheSourceProperty`
`10`	`10`	`{`
`11`		`- [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]`
`12`		`- [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]`
`13`		`- [TestCase("file:///x:/Project/src/GitHub.UI/SharedDictionary.xaml", Description = "This is a design time URL")]`
`14`		`- [TestCase("file:///x:/Project/src/GitHub.VisualStudio.UI/SharedDictionary.xaml", Description = "This is a design time URL")]`
	`11`	`+ [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]`
	`12`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]`
	`13`	`+ [TestCase(Urls.GitHub_UI_SharedDictionary_FileUrl, Description = "This is a design time URL")]`
	`14`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_FileUrl, Description = "This is a design time URL")]`
`15`	`15`	`[RequiresThread(System.Threading.ApartmentState.STA)]`
`16`	`16`	`public void SetSourceOnDifferentInstances_ExpectTheSameObjects(string url)`
`17`	`17`	`{`
`@@ -28,8 +28,8 @@ public void SetSourceOnDifferentInstances_ExpectTheSameObjects(string url)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	// This is why we need `SharedDictionaryManager`.
`31`		`- [TestCase("pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml")]`
`32`		`- [TestCase("pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml")]`
	`31`	`+ [TestCase(Urls.GitHub_UI_SharedDictionary_PackUrl)]`
	`32`	`+ [TestCase(Urls.GitHub_VisualStudio_UI_SharedDictionary_PackUrl)]`
`33`	`33`	`[RequiresThread(System.Threading.ApartmentState.STA)]`
`34`	`34`	`public void SetResourceDictionarySourceOnDifferentInstances_ExpectDifferentObjects(string url)`
`35`	`35`	`{`