Cover the case when a package has been loaded already with test cases.

KaivnD · Mar 23, 2021 · b340de3 · b340de3
1 parent 630e817
commit b340de3
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 0 deletions.
diff --git a/src/DynamoCore/Properties/Resources.Designer.cs b/src/DynamoCore/Properties/Resources.Designer.cs
diff --git a/src/DynamoCore/Properties/Resources.en-US.resx b/src/DynamoCore/Properties/Resources.en-US.resx
@@ -741,4 +741,7 @@ Parameter name: {0}</value>
   <data name="InvalidPackageVersion" xml:space="preserve">
     <value>The version of the package called {0} found at {1} is invalid (version: "{2}"). Ignoring it.</value>
   </data>
+  <data name="DuplicatedPackageAlreadyLoaded" xml:space="preserve">
+    <value>A newer version of the package called {0} version {2} was found at {1} with version {3}. The old version of the package is already loaded. Please restart Dynamo for loading the new version of the package.</value>
+  </data>
 </root>
diff --git a/src/DynamoCore/Properties/Resources.resx b/src/DynamoCore/Properties/Resources.resx
@@ -741,4 +741,7 @@ Parameter name: {0}</value>
   <data name="InvalidPackageVersion" xml:space="preserve">
     <value>The version of the package called {0} found at {1} is invalid (version: "{2}"). Ignoring it.</value>
   </data>
+  <data name="DuplicatedPackageAlreadyLoaded" xml:space="preserve">
+    <value>A newer version of the package called {0} version {2} was found at {1} with version {3}. The old version of the package is already loaded. Please restart Dynamo for loading the new version of the package.</value>
+  </data>
 </root>
diff --git a/src/DynamoPackages/PackageLoader.cs b/src/DynamoPackages/PackageLoader.cs
@@ -450,6 +450,12 @@ public Package ScanPackageDirectory(string directory, bool checkCertificates)
                     return null;
                 }
 
+                // If the existing package already loaded
+                if (existingPackage.Loaded)
+                {
+                    throw new LibraryLoadFailedException(directory, String.Format(Properties.Resources.DuplicatedPackageAlreadyLoaded, existingPackage.Name, discoveredPackage.RootDirectory, existingVersion.ToString(), discoveredVersion.ToString()));
+                }
+
                 // Older version exist, replace with newer version
                 Remove(existingPackage);
                 Add(discoveredPackage);

diff --git a/test/Libraries/PackageManagerTests/PackageLoaderTests.cs b/test/Libraries/PackageManagerTests/PackageLoaderTests.cs
@@ -756,6 +756,50 @@ public void PackageLoaderLoadOldPackage()
             Assert.IsNull(loader.LocalPackages.FirstOrDefault(package => package.Description == @"Old package"));
         }
 
+        [Test]
+        public void PackageLoaderLoadNewWhenOldPackageHasBeenLoadedAlready()
+        {
+            // Arrange
+            var loader = GetPackageLoader();
+            var oldPackageLocation = Path.Combine(PackagesDirectory, @"Version\PackageWithOldVersion");
+            var newPackageLocation = Path.Combine(PackagesDirectory, @"Version\PackageWithNewVersion");
+
+            // Act
+            var oldPackage = loader.ScanPackageDirectory(oldPackageLocation);
+            oldPackage.Loaded = true;
+            var newPackage = loader.ScanPackageDirectory(newPackageLocation);
+
+            // Assert
+            Assert.IsNotNull(oldPackage);
+            Assert.IsNull(newPackage);
+            Assert.AreEqual("Package", oldPackage.Name);
+            Assert.AreEqual("1.0.0", oldPackage.VersionName);
+            Assert.IsNull(loader.LocalPackages.FirstOrDefault(package => package.Description == @"New package"));
+            Assert.IsNotNull(loader.LocalPackages.FirstOrDefault(package => package.Description == @"Old package"));
+        }
+
+        [Test]
+        public void PackageLoaderLoadOldWhenNewPackageHasBeenLoadedAlready()
+        {
+            // Arrange
+            var loader = GetPackageLoader();
+            var oldPackageLocation = Path.Combine(PackagesDirectory, @"Version\PackageWithOldVersion");
+            var newPackageLocation = Path.Combine(PackagesDirectory, @"Version\PackageWithNewVersion");
+
+            // Act
+            var newPackage = loader.ScanPackageDirectory(newPackageLocation);
+            newPackage.Loaded = true;
+            var oldPackage = loader.ScanPackageDirectory(oldPackageLocation);
+
+            // Assert
+            Assert.IsNull(oldPackage);
+            Assert.IsNotNull(newPackage);
+            Assert.AreEqual("Package", newPackage.Name);
+            Assert.AreEqual("2.0.0", newPackage.VersionName);
+            Assert.IsNotNull(loader.LocalPackages.FirstOrDefault(package => package.Description == @"New package"));
+            Assert.IsNull(loader.LocalPackages.FirstOrDefault(package => package.Description == @"Old package"));
+        }
+
         [Test]
         public void IsUnderPackageControlIsCorrectForValidFunctionDefinition()
         {