tests fix

DynamoDS · Feb 2, 2024 · 0007128 · 0007128
1 parent 12e43ed
commit 0007128
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/DynamoPackages/PackageDirectoryBuilder.cs b/src/DynamoPackages/PackageDirectoryBuilder.cs
@@ -232,7 +232,7 @@ internal void CopyFilesIntoRetainedPackageDirectory(IEnumerable<IEnumerable<stri
                     // Ensure the relative path starts with a directory separator.
                     if (!string.IsNullOrEmpty(relativePath) && relativePath[0] != Path.DirectorySeparatorChar)
                     {
-                        relativePath = relativePath.TrimStart(['/', '\\']);
+                        relativePath = relativePath.TrimStart(new char[] { '/', '\\' });
                         relativePath = Path.DirectorySeparatorChar + relativePath;
                     }
 

diff --git a/test/Libraries/PackageManagerTests/PackageLoaderTests.cs b/test/Libraries/PackageManagerTests/PackageLoaderTests.cs
@@ -141,7 +141,7 @@ public void PackageDoesNotReloadOnAbsenceOfNewPackagePath()
 
             };
             loader.LoadAll(loadPackageParams);
-            Assert.AreEqual(20, loader.LocalPackages.Count());
+            Assert.AreEqual(21, loader.LocalPackages.Count());
             Assert.AreEqual(true, packagesLoaded);
 
             var entries = CurrentDynamoModel.SearchModel.Entries.ToList();
@@ -150,7 +150,7 @@ public void PackageDoesNotReloadOnAbsenceOfNewPackagePath()
             packagesLoaded = false;
             // This function is called upon addition of new package paths in the UI.
             loader.LoadNewCustomNodesAndPackages(new List<string>(), CurrentDynamoModel.CustomNodeManager);
-            Assert.AreEqual(20, loader.LocalPackages.Count());
+            Assert.AreEqual(21, loader.LocalPackages.Count());
 
             // Assert packages are not reloaded if there are no new package paths.
             Assert.False(packagesLoaded);
@@ -187,7 +187,7 @@ public void NoPackageNodeDuplicatesOnAddingNewPackagePath()
                 Preferences =settings,
             };
             loader.LoadAll(loadPackageParams);
-            Assert.AreEqual(20, loader.LocalPackages.Count());
+            Assert.AreEqual(21, loader.LocalPackages.Count());
             Assert.AreEqual(true, packagesLoaded);
 
             var entries = CurrentDynamoModel.SearchModel.Entries.ToList();
@@ -198,7 +198,7 @@ public void NoPackageNodeDuplicatesOnAddingNewPackagePath()
             var newPaths = new List<string> { Path.Combine(TestDirectory, "builtinpackages testdir") };
             // This function is called upon addition of new package paths in the UI.
             loader.LoadNewCustomNodesAndPackages(newPaths, CurrentDynamoModel.CustomNodeManager);
-            Assert.AreEqual(21, loader.LocalPackages.Count());
+            Assert.AreEqual(22, loader.LocalPackages.Count());
 
             // Assert packages are reloaded if there are new package paths.
             Assert.True(packagesLoaded);
@@ -504,7 +504,7 @@ public void LoadPackagesReturnsAllValidPackagesInValidDirectory()
             });
 
             // There are 20 packages in "Dynamo\test\pkgs"
-            Assert.AreEqual(20, loader.LocalPackages.Count());
+            Assert.AreEqual(21, loader.LocalPackages.Count());
 
             // Verify that interdependent packages are resolved successfully
             // TODO: Review these assertions. Lambdas are not using x, so they are basically just checking that test files exist.
@@ -542,7 +542,7 @@ public void LoadingPackageDoesNotAffectLoadedSearchEntries()
             });
 
             // There are 20 packages in "Dynamo\test\pkgs"
-            Assert.AreEqual(20, loader.LocalPackages.Count());
+            Assert.AreEqual(21, loader.LocalPackages.Count());
 
             // Simulate loading new package from PM
             string packageDirectory = Path.Combine(TestDirectory, @"core\packageDependencyTests\ZTTestPackage");
@@ -555,6 +555,14 @@ public void LoadingPackageDoesNotAffectLoadedSearchEntries()
 
             // Check that node belonging to one of the preloaded packages exists and is unique
             var entries = CurrentDynamoModel.SearchModel.Entries.ToList();
+            foreach (var ent in entries)
+            {
+                var f = ent.FullName;
+                if (f.StartsWith("A"))
+                {
+                    continue;
+                }
+            }
             Assert.IsTrue(entries.Count(x => x.FullName == "AnotherPackage.AnotherPackage.AnotherPackage.HelloAnotherWorld") == 1);
 
             loader.PackagesLoaded -= libraryLoader.LoadPackages;
@@ -670,7 +678,7 @@ public void LoadingConflictingCustomNodePackageDoesNotGetLoaded()
             });
 
             // There are 20 packages in "Dynamo\test\pkgs"
-            Assert.AreEqual(20, loader.LocalPackages.Count());
+            Assert.AreEqual(21, loader.LocalPackages.Count());
 
             var entries = CurrentDynamoModel.SearchModel.Entries.OfType<CustomNodeSearchElement>();