Do not duplicate config elements in the target section (Edit config s…

…tep). (#363)
SenseNet · May 17, 2018 · 94de024 · 94de024
1 parent 73e7d58
commit 94de024
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 12 deletions.
diff --git a/src/ContentRepository/Packaging/Steps/EditConfiguration.cs b/src/ContentRepository/Packaging/Steps/EditConfiguration.cs
@@ -224,20 +224,9 @@ private bool ExecuteMove(XmlDocument xml, MoveOperation move)
             var sourceElements = sourceSectionElement.SelectNodes("*");
             targetSectionElement = (XmlElement)xml.DocumentElement.SelectSingleNode(move.TargetSection)
                                     ?? CreateSection(xml, move.TargetSection);
-            foreach (XmlElement sourceElement in sourceElements)
-            {
-                var sourceKey = sourceElement.Attributes["key"].Value;
-                var oldElement = targetSectionElement.SelectSingleNode($"add[@key='{sourceKey}']");
-                if (oldElement != null)
-                {
-                    Logger.LogMessage("  Rewritten element in {0}", GetPath(targetSectionElement));
-                    Logger.LogMessage("    {0}", oldElement.OuterXml);
-                    oldElement.ParentNode.RemoveChild(oldElement);
-                }
 
-                // move
+            foreach (XmlElement sourceElement in sourceElements)
                 MoveElement(sourceElement, targetSectionElement);
-            }
 
             DeleteSection(sourceSectionElement, move.SourceSection);
 
@@ -275,6 +264,16 @@ private void DeleteElementIfEmpty(XmlElement deletable)
 
         private void MoveElement(XmlElement sourceElement, XmlElement targetSectionElement)
         {
+            // remove old element if exists
+            var sourceKey = sourceElement.Attributes["key"].Value;
+            var oldElement = targetSectionElement.SelectSingleNode($"add[@key='{sourceKey}']");
+            if (oldElement != null && oldElement != sourceElement)
+            {
+                Logger.LogMessage("  Rewritten element in {0}", GetPath(targetSectionElement));
+                Logger.LogMessage("    {0}", oldElement.OuterXml);
+                oldElement.ParentNode.RemoveChild(oldElement);
+            }
+
             targetSectionElement.AppendChild(sourceElement.ParentNode.RemoveChild(sourceElement));
         }
 

diff --git a/src/Tests/SenseNet.Packaging.Tests/StepTests/EditConfigurationTests.cs b/src/Tests/SenseNet.Packaging.Tests/StepTests/EditConfigurationTests.cs
@@ -420,6 +420,62 @@ public void Step_EditConfiguration_MoveSimpleKeyToExisting()
             });
         }
         [TestMethod]
+        public void Step_EditConfiguration_MoveSimpleKeyToExistingAndFound()
+        {
+            var config = @"<?xml version='1.0' encoding='utf-8'?>
+<configuration>
+  <configSections>
+    <section name='section1' type='System.Configuration.NameValueFileSectionHandler' />
+  </configSections>
+  <section1>
+    <add key='key2' value='value2' />
+  </section1>
+  <appSettings>
+    <add key='key1' value='value1' />
+    <add key='key2' value='value2_fromAppSettings' />
+    <add key='key3' value='value3' />
+    <add key='key4' value='value4' />
+  </appSettings>
+</configuration>";
+
+            var expected = @"<?xml version='1.0' encoding='utf-8'?>
+<configuration>
+  <configSections>
+    <section name='section1' type='System.Configuration.NameValueFileSectionHandler' />
+  </configSections>
+  <section1>
+    <add key='key1' value='value1' />
+    <add key='key2' value='value2_fromAppSettings' />
+    <add key='key3' value='value3' />
+  </section1>
+  <appSettings>
+    <add key='key4' value='value4' />
+  </appSettings>
+</configuration>";
+
+            MoveOperationTest(config, expected, new[]
+            {
+                new EditConfiguration.MoveOperation
+                {
+                    SourceSection = "appSettings",
+                    SourceKey = "key1",
+                    TargetSection = "section1",
+                },
+                new EditConfiguration.MoveOperation
+                {
+                    SourceSection = "appSettings",
+                    SourceKey = "key2",
+                    TargetSection = "section1",
+                },
+                new EditConfiguration.MoveOperation
+                {
+                    SourceSection = "appSettings",
+                    SourceKey = "key3",
+                    TargetSection = "section1",
+                },
+            });
+        }
+        [TestMethod]
         public void Step_EditConfiguration_MoveSimpleKeyToExisting_NotFound()
         {
             var config = @"<?xml version='1.0' encoding='utf-8'?>