diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogDebuggerProxyTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogDebuggerProxyTests.cs index 0a69ae32ae2114..72ae912ef1fd8e 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogDebuggerProxyTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogDebuggerProxyTests.cs @@ -28,7 +28,7 @@ public void Constructor_ValueAsCatalogArgument_ShouldSetPartsProperty() foreach (var e in expectations) { - string directoryPath = GetTemporaryDirectory(e.Location); + string directoryPath = TemporaryFileCopier.GetNewTemporaryDirectory(); var catalog = CreateDirectoryCatalog(directoryPath); var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(catalog); @@ -41,7 +41,7 @@ public void Constructor_ValueAsCatalogArgument_ShouldSetPartsProperty() [ActiveIssue("https://github.com/dotnet/runtime/issues/24240")] public void Constructor_ValueAsCatalogArgument_ShouldSetAssemblyProperty() { - string directoryPath = GetTemporaryDirectory(); + string directoryPath = TemporaryFileCopier.GetNewTemporaryDirectory(); var expectations = Expectations.GetAssemblies(); foreach (string fileName in expectations.Select(assembly => assembly.Location).ToArray()) @@ -58,7 +58,7 @@ public void Constructor_ValueAsCatalogArgument_ShouldSetAssemblyProperty() [Fact] public void Constructor_ValueAsCatalogArgument_ShouldSetPathProperty() { - string path = GetTemporaryDirectory(); + string path = TemporaryFileCopier.GetNewTemporaryDirectory(); var catalog = CreateDirectoryCatalog(path); var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(catalog); @@ -70,7 +70,7 @@ public void Constructor_ValueAsCatalogArgument_ShouldSetPathProperty() [ActiveIssue("https://github.com/dotnet/runtime/issues/24240", TestPlatforms.AnyUnix)] // System.Reflection.ReflectionTypeLoadException : Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information. public void Constructor_ValueAsCatalogArgument_ShouldSetSearchPatternProperty() { - string directoryPath = GetTemporaryDirectory(); + string directoryPath = TemporaryFileCopier.GetNewTemporaryDirectory(); var expectations = new ExpectationCollection(); expectations.Add("*.*", "*.*"); @@ -92,7 +92,7 @@ public void Constructor_ValueAsCatalogArgument_ShouldSetSearchPatternProperty() [ActiveIssue("https://github.com/dotnet/runtime/issues/24240")] public void FullPath_ValidPath_ShouldBeFine() { - string directoryPath = GetTemporaryDirectory(); + string directoryPath = TemporaryFileCopier.GetNewTemporaryDirectory(); var expectations = new ExpectationCollection(); // Ensure the path is always normalized properly. @@ -118,7 +118,7 @@ public void FullPath_ValidPath_ShouldBeFine() [ActiveIssue("https://github.com/dotnet/runtime/issues/24240", TestPlatforms.AnyUnix)] // System.Reflection.ReflectionTypeLoadException : Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information. public void LoadedFiles_EmptyDirectory_ShouldBeFine() { - string directoryPath = GetTemporaryDirectory(); + string directoryPath = TemporaryFileCopier.GetNewTemporaryDirectory(); var cat = CreateDirectoryCatalog(directoryPath); var proxy = new DirectoryCatalog.DirectoryCatalogDebuggerProxy(cat); @@ -129,7 +129,7 @@ public void LoadedFiles_EmptyDirectory_ShouldBeFine() [SkipOnPlatform(TestPlatforms.Browser, "Not supported on Browser.")] public void LoadedFiles_ContainsMultipleDllsAndSomeNonDll_ShouldOnlyContainDlls() { - string directoryPath = GetTemporaryDirectory(); + string directoryPath = TemporaryFileCopier.GetNewTemporaryDirectory(); // Add one text file using (File.CreateText(Path.Combine(directoryPath, "Test.txt"))) { } @@ -161,11 +161,6 @@ private DirectoryCatalog CreateDirectoryCatalog(string path, string filter) { return new DirectoryCatalog(path, filter); } - - private string GetTemporaryDirectory(string location = null) - { - return Directory.CreateTempSubdirectory().FullName; - } } public class TemporaryFileCopier @@ -193,10 +188,5 @@ public static string GetNewTemporaryDirectory() { return Directory.CreateTempSubdirectory().FullName; } - - public static string GetTemporaryDirectory() - { - return Directory.CreateTempSubdirectory().FullName; - } } } diff --git a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs index 25dba9b0f7b4a4..0dd96aa2d3a445 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs +++ b/src/libraries/System.ComponentModel.Composition/tests/System/ComponentModel/Composition/Hosting/DirectoryCatalogTests.cs @@ -251,7 +251,7 @@ public void AddAssembly1_TooLongPathNameArgument_ShouldThrowPathTooLongException [ActiveIssue("https://github.com/dotnet/runtime/issues/24240")] public void Parts() { - var catalog = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var catalog = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); Assert.NotNull(catalog.Parts); Assert.True(catalog.Parts.Count() > 0); } @@ -260,7 +260,7 @@ public void Parts() [ActiveIssue("https://github.com/dotnet/runtime/issues/24240")] public void Parts_ShouldSetDefinitionOriginToCatalogItself() { - var catalog = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var catalog = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); Assert.True(catalog.Parts.Count() > 0); foreach (ICompositionElement definition in catalog.Parts) @@ -278,7 +278,7 @@ public void Path_ValidPath_ShouldBeFine() expectations.Add(".", "."); expectations.Add(TemporaryFileCopier.RootTemporaryDirectoryName, TemporaryFileCopier.RootTemporaryDirectoryName); expectations.Add(TemporaryFileCopier.GetRootTemporaryDirectory(), TemporaryFileCopier.GetRootTemporaryDirectory()); - expectations.Add(TemporaryFileCopier.GetTemporaryDirectory(), TemporaryFileCopier.GetTemporaryDirectory()); + expectations.Add(TemporaryFileCopier.GetNewTemporaryDirectory(), TemporaryFileCopier.GetNewTemporaryDirectory()); foreach (var e in expectations) { @@ -302,7 +302,7 @@ public void FullPath_ValidPath_ShouldBeFine() expectations.Add(".", Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ".")).ToUpperInvariant()); expectations.Add(TemporaryFileCopier.RootTemporaryDirectoryName, rootTempPath); expectations.Add(TemporaryFileCopier.GetRootTemporaryDirectory(), rootTempPath); - expectations.Add(TemporaryFileCopier.GetTemporaryDirectory(), Path.GetFullPath(TemporaryFileCopier.GetTemporaryDirectory()).ToUpperInvariant()); + expectations.Add(TemporaryFileCopier.GetNewTemporaryDirectory(), Path.GetFullPath(TemporaryFileCopier.GetNewTemporaryDirectory()).ToUpperInvariant()); foreach (var e in expectations) { @@ -315,7 +315,7 @@ public void FullPath_ValidPath_ShouldBeFine() [Fact] public void LoadedFiles_EmptyDirectory_ShouldBeFine() { - var cat = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var cat = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); Assert.Equal(0, cat.LoadedFiles.Count); } @@ -325,15 +325,15 @@ public void LoadedFiles_EmptyDirectory_ShouldBeFine() public void LoadedFiles_ContainsMultipleDllsAndSomeNonDll_ShouldOnlyContainDlls() { // Add one text file - using (File.CreateText(Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "Test.txt"))) { } + using (File.CreateText(Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "Test.txt"))) { } // Add two dll's - string dll1 = Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "Test1.dll"); - string dll2 = Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "Test2.dll"); + string dll1 = Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "Test1.dll"); + string dll2 = Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "Test2.dll"); File.Copy(Assembly.GetExecutingAssembly().Location, dll1); File.Copy(Assembly.GetExecutingAssembly().Location, dll2); - var cat = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var cat = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); EqualityExtensions.CheckEquals(new string[] { dll1.ToUpperInvariant(), dll2.ToUpperInvariant() }, cat.LoadedFiles); @@ -355,18 +355,18 @@ public void LoadedFiles_NonStaticallyReferencedAssembly() [Fact] public void Constructor_InvalidAssembly_ShouldBeFine() { - using (File.CreateText(Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "Test.dll"))) { } - var cat = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + using (File.CreateText(Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "Test.dll"))) { } + var cat = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); } [Fact] public void Constructor_NonExistentDirectory_ShouldThrow() { Assert.Throws(() => - new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory() + @"\NonexistentDirectoryWithoutEndingSlash")); + new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory() + @"\NonexistentDirectoryWithoutEndingSlash")); Assert.Throws(() => - new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory() + @"\NonexistentDirectoryWithEndingSlash\")); + new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory() + @"\NonexistentDirectoryWithEndingSlash\")); } @@ -374,16 +374,16 @@ public void Constructor_NonExistentDirectory_ShouldThrow() [ActiveIssue("https://github.com/dotnet/runtime/issues/24240")] public void Constructor_PassExistingFileName_ShouldThrow() { - using (File.CreateText(Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "Test.txt"))) { } + using (File.CreateText(Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "Test.txt"))) { } Assert.Throws(() => - new DirectoryCatalog(Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "Test.txt"))); + new DirectoryCatalog(Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "Test.txt"))); } [Fact] public void Constructor_PassNonExistingFileName_ShouldThrow() { Assert.Throws(() => - new DirectoryCatalog(Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "NonExistingFile.txt"))); + new DirectoryCatalog(Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "NonExistingFile.txt"))); } [Fact] @@ -392,7 +392,7 @@ public void Refresh_AssemblyAdded_ShouldFireOnChanged() { bool changedFired = false; bool changingFired = false; - var cat = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var cat = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); Assert.Equal(0, cat.Parts.Count()); @@ -408,7 +408,7 @@ public void Refresh_AssemblyAdded_ShouldFireOnChanged() changedFired = true; }); - File.Copy(Assembly.GetExecutingAssembly().Location, Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "Test.dll")); + File.Copy(Assembly.GetExecutingAssembly().Location, Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "Test.dll")); cat.Refresh(); @@ -420,10 +420,10 @@ public void Refresh_AssemblyAdded_ShouldFireOnChanged() [ActiveIssue("https://github.com/dotnet/runtime/issues/24240")] public void Refresh_AssemblyRemoved_ShouldFireOnChanged() { - string file = Path.Combine(TemporaryFileCopier.GetTemporaryDirectory(), "Test.dll"); + string file = Path.Combine(TemporaryFileCopier.GetNewTemporaryDirectory(), "Test.dll"); File.Copy(Assembly.GetExecutingAssembly().Location, file); bool changedFired = false; - var cat = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var cat = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); cat.Changed += new EventHandler((o, e) => changedFired = true); @@ -440,7 +440,7 @@ public void Refresh_AssemblyRemoved_ShouldFireOnChanged() [Fact] public void Refresh_NoChanges_ShouldNotFireOnChanged() { - var cat = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var cat = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); cat.Changed += new EventHandler((o, e) => Assert.False(true)); @@ -453,7 +453,7 @@ public void Refresh_NoChanges_ShouldNotFireOnChanged() public void Refresh_DirectoryRemoved_ShouldThrowDirectoryNotFound() { DirectoryCatalog cat; - cat = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + cat = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); ExceptionAssert.Throws(RetryMode.DoNotRetry, () => cat.Refresh()); @@ -470,7 +470,7 @@ public void GetExports() Assert.NotNull(matchingExports); Assert.True(matchingExports.Count() == 0); - var testsDirectoryCatalog = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var testsDirectoryCatalog = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); catalog.Catalogs.Add(testsDirectoryCatalog); matchingExports = catalog.GetExports(constraint); @@ -498,7 +498,7 @@ public void AddAndRemoveDirectory() Assert.False(container.IsPresent()); - var dir1 = new DirectoryCatalog(TemporaryFileCopier.GetTemporaryDirectory()); + var dir1 = new DirectoryCatalog(TemporaryFileCopier.GetNewTemporaryDirectory()); cat.Catalogs.Add(dir1); Assert.True(container.IsPresent());