From 83094daaf5329cd52b5142d81c00f56ef20e0a6f Mon Sep 17 00:00:00 2001 From: Ashish Aggarwal Date: Fri, 2 Feb 2024 15:30:51 -0500 Subject: [PATCH] test updates --- test/DynamoCoreWpfTests/PackagePathTests.cs | 10 ++++----- .../PackageDirectoryBuilderTests.cs | 22 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test/DynamoCoreWpfTests/PackagePathTests.cs b/test/DynamoCoreWpfTests/PackagePathTests.cs index 3c2f4fcb444..59e6e30ddc2 100644 --- a/test/DynamoCoreWpfTests/PackagePathTests.cs +++ b/test/DynamoCoreWpfTests/PackagePathTests.cs @@ -233,17 +233,17 @@ public void InstalledPackagesContainsCorrectNumberOfPackages() vm.packageLoader.PackagesLoaded += pkgsLoadedDelegate; vm.packageLoader.LoadAll(vm.loadPackageParams); - Assert.AreEqual(20, vm.packageLoader.LocalPackages.Count()); + Assert.AreEqual(21, vm.packageLoader.LocalPackages.Count()); Assert.AreEqual(true, packagesLoaded); var installedPackagesViewModel = new InstalledPackagesViewModel(ViewModel, vm.packageLoader); - Assert.AreEqual(20, installedPackagesViewModel.LocalPackages.Count); + Assert.AreEqual(21, installedPackagesViewModel.LocalPackages.Count); var installedPackagesView = new Dynamo.Wpf.Controls.InstalledPackagesControl(); installedPackagesView.DataContext = installedPackagesViewModel; DispatcherUtil.DoEvents(); - Assert.AreEqual(20, installedPackagesView.SearchResultsListBox.Items.Count); + Assert.AreEqual(21, installedPackagesView.SearchResultsListBox.Items.Count); Assert.AreEqual(2, installedPackagesView.Filters.Items.Count); vm.packageLoader.PackagesLoaded -= libraryLoader.LoadPackages; @@ -267,7 +267,7 @@ public void RemoveAddPackagePathChangesInstalledPackageState() // Load packages in package path. vm.packageLoader.LoadAll(vm.loadPackageParams); - Assert.AreEqual(20, vm.packageLoader.LocalPackages.Count()); + Assert.AreEqual(21, vm.packageLoader.LocalPackages.Count()); // Remove package path. vm.DeletePathCommand.Execute(0); @@ -323,7 +323,7 @@ public void EnableCustomPackagePathsLoadsPackagesOnClosingPreferences() vm.SaveSettingCommand.Execute(null); // packages are expected to load from 'PackagesDirectory' above when toggle is turned off - Assert.AreEqual(20, vm.packageLoader.LocalPackages.Count()); + Assert.AreEqual(21, vm.packageLoader.LocalPackages.Count()); vm.packageLoader.PackagesLoaded -= libraryLoader.LoadPackages; vm.packageLoader.RequestLoadNodeLibrary -= libraryLoader.LoadLibraryAndSuppressZTSearchImport; diff --git a/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs b/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs index 71b230337f8..56d6170aa5d 100644 --- a/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs +++ b/test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs @@ -41,7 +41,7 @@ public void BuildPackageDirectory_DoesExpectedNumberOfOperations() [Test] public void BuildRetainPackageDirectory_DoesExpectedNumberOfOperations() { - var files = new List>() { new[] { @"C:\folder1\file1.dyf" }, new[] { @"C:\folder2\file2.dyf" } }; + var files = new List>() { new[] { @"C:\pkg\folder1\file1.dyf" }, new[] { @"C:\pkg\folder2\file2.dyf" } }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn))); var db = new PackageDirectoryBuilder(fs, MockMaker.Empty()); @@ -86,7 +86,7 @@ public void BuildPackageDirectory_BuildsExpectedDirectories() [Test] public void BuildRetainPackageDirectory_BuildsExpectedDirectories() { - var files = new List>() { new[] { @"C:\folder1\file1.dyf" }, new[] { @"C:\folder2\file2.dyf" } }; + var files = new List>() { new[] { @"C:\pkg\folder1\file1.dyf" }, new[] { @"C:\pkg\folder2\file2.dyf" } }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn))); var db = new PackageDirectoryBuilder(fs, MockMaker.Empty()); @@ -103,7 +103,7 @@ public void BuildRetainPackageDirectory_BuildsExpectedDirectories() [Test] public void BuildPackageDirectory_FormsPackageHeader() { - var files = new[] { @"C:\file1.dyf", @"C:\file2.dyf" }; + var files = new[] { @"C:\pkg\file1.dyf", @"C:\pkg\file2.dyf" }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.Contains(fn)); @@ -125,7 +125,7 @@ public void BuildPackageDirectory_FormsPackageHeader() [Test] public void BuildRetainPackageDirectory_FormsPackageHeader() { - var files = new List>() { new[] { @"C:\folder1\file1.dyf" }, new[] { @"C:\folder2\file2.dyf" } }; + var files = new List>() { new[] { @"C:\pkg\folder1\file1.dyf" }, new[] { @"C:\pkg\folder2\file2.dyf" } }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn))); @@ -176,7 +176,7 @@ public void BuildPackageDirectory_RemapsCustomNodePaths() [Test] public void BuildRetainPackageDirectory_RemapsCustomNodePaths() { - var files = new List>() { new[] { @"C:\folder1\file1.dyf" }, new[] { @"C:\folder2\file2.dyf" } }; + var files = new List>() { new[] { @"C:\pkg\folder1\file1.dyf" }, new[] { @"C:\pkg\folder2\file2.dyf" } }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn))); @@ -235,7 +235,7 @@ public void BuildPackageDirectory_UpdatesTheArgumentPackageWithNewDirectories() [Test] public void BuildRetainPackageDirectory_UpdatesTheArgumentPackageWithNewDirectories() { - var files = new List>() { new[] { @"C:\folder1\file1.dyf" }, new[] { @"C:\folder2\file2.dyf" } }; + var files = new List>() { new[] { @"C:\pkg\folder1\file1.dyf" }, new[] { @"C:\pkg\folder2\file2.dyf" } }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn))); @@ -257,7 +257,7 @@ public void BuildRetainPackageDirectory_UpdatesTheArgumentPackageWithNewDirector [Test] public void BuildPackageDirectory_CopiesTheOriginalFiles() { - var files = new[] { @"C:\file1.dyf", @"C:\file2.dyf" }; + var files = new[] { @"C:\pkg\file1.dyf", @"C:\pkg\file2.dyf" }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.Contains(fn)); @@ -282,7 +282,7 @@ public void BuildPackageDirectory_CopiesTheOriginalFiles() [Test] public void BuildPackageRetainDirectory_CopiesTheOriginalFiles() { - var files = new List>() { new[] { @"C:\folder1\file1.dyf" }, new[] { @"C:\folder2\file2.dyf" } }; + var files = new List>() { new[] { @"C:\pkg\folder1\file1.dyf" }, new[] { @"C:\pkg\folder2\file2.dyf" } }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn))); @@ -307,7 +307,7 @@ public void BuildPackageRetainDirectory_CopiesTheOriginalFiles() [Test] public void BuildPackageDirectory_CopiesMarkDownFiles() { - var files = new[] { @"C:\file1.dyn", @"C:\file2.dyn" }; + var files = new[] { @"C:\pkg\file1.dyn", @"C:\pkg\file2.dyn" }; var markdownFiles = new[] { @"C:\file1.md", @"C:\file2.md", @"C:\image\file3.jpg" }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); @@ -360,7 +360,7 @@ public void BuildRetainPackageDirectory_CopiesMarkDownFiles() [Test] public void BuildPackageDirectory_DeletesTheOriginalFiles() { - var files = new[] { @"C:\file1.dyf", @"C:\file2.dyf" }; + var files = new[] { @"C:\pkg\file1.dyf", @"C:\pkg\file2.dyf" }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.Contains(fn)); @@ -385,7 +385,7 @@ public void BuildPackageDirectory_DeletesTheOriginalFiles() [Test] public void BuildRetainPackageDirectory_DeletesTheOriginalFiles() { - var files = new List>() { new[] { @"C:\folder1\file1.dyf" }, new[] { @"C:\folder2\file2.dyf" } }; + var files = new List>() { new[] { @"C:\pkg\folder1\file1.dyf" }, new[] { @"C:\pkg\folder2\file2.dyf" } }; var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT"); var fs = new RecordedFileSystem((fn) => files.SelectMany(files => files).ToList().Any((x) => ComparePaths(x, fn)));