The multi source control must cope with previous (buggy) information transparently

Author: obones

project/UnitTests/Core/SourceControl/MultiSourceControlTest.cs

@@ -200,6 +200,80 @@ public void PassesIndividualSourceDataAndCombines()
             list.Clear();
             Assert.AreEqual("sc1", to.SourceControlData[1].Name, "SourceControlData[1].Name");
         }
+
+        [Test]
+        public void PassesIndividualSourceDataAndCombinesSingleSourceControl()
+        {
+            IntegrationResult from = IntegrationResultMother.CreateSuccessful(DateTime.Now);
+            IntegrationResult to = IntegrationResultMother.CreateSuccessful(DateTime.Now.AddDays(10));
+
+            string scValue = null;
+            List<NameValuePair> list = new List<NameValuePair>();
+
+            list.Add(new NameValuePair("name0", "first"));
+            scValue = XmlConversionUtil.ConvertObjectToXml(list);
+            from.SourceControlData.Add(new NameValuePair("sc0", scValue));
+            list.Clear();
+
+            List<ISourceControl> sourceControls = new List<ISourceControl>();
+            sourceControls.Add(new MockSourceControl());
+
+            MultiSourceControl multiSourceControl = new MultiSourceControl();
+            multiSourceControl.SourceControls = sourceControls.ToArray();
+
+            //// EXECUTE
+            ArrayList returnedMods = new ArrayList(multiSourceControl.GetModifications(from, to));
+
+            //// VERIFY
+            Assert.AreEqual(from.SourceControlData.Count, to.SourceControlData.Count, "SourceControlData.Count");
+
+            list.Add(new NameValuePair("name0", "first"));
+            Assert.AreEqual(XmlConversionUtil.ConvertObjectToXml(list), to.SourceControlData[0].Value, "SourceControlData[0].Value");
+            list.Clear();
+            Assert.AreEqual("sc0", to.SourceControlData[0].Name, "SourceControlData[0].Name");
+        }
+
+        [Test]
+        public void MigratesSingleSourceControlDataToNewFormat()
+        {
+            IntegrationResult from = IntegrationResultMother.CreateSuccessful(DateTime.Now);
+            IntegrationResult to = IntegrationResultMother.CreateSuccessful(DateTime.Now.AddDays(10));
+
+            ArrayList mocks = new ArrayList();
+            mocks.Add(CreateModificationsSourceControlMock(new Modification[] { }, from, to));
+            mocks.Add(CreateModificationsSourceControlMock(null, from, to));
+
+            ArrayList scList = new ArrayList();
+            foreach (DynamicMock mock in mocks)
+            {
+                scList.Add(mock.MockInstance);
+            }
+            scList.Add(new MockSourceControl());
+
+            from.SourceControlData.Add(new NameValuePair("commit", "first"));
+
+            MultiSourceControl multiSourceControl = new MultiSourceControl();
+            multiSourceControl.SourceControls = (ISourceControl[])scList.ToArray(typeof(ISourceControl));
+
+            //// EXECUTE
+            ArrayList returnedMods = new ArrayList(multiSourceControl.GetModifications(from, to));
+
+            //// VERIFY
+            Assert.AreEqual(3, to.SourceControlData.Count, "SourceControlData.Count");
+
+            List<NameValuePair> list = new List<NameValuePair>();
+
+            Assert.AreEqual(XmlConversionUtil.ConvertObjectToXml(list), to.SourceControlData[0].Value, "SourceControlData[0].Value");
+            Assert.AreEqual("sc0", to.SourceControlData[0].Name, "SourceControlData[0].Name");
+
+            Assert.AreEqual(XmlConversionUtil.ConvertObjectToXml(list), to.SourceControlData[1].Value, "SourceControlData[1].Value");
+            Assert.AreEqual("sc1", to.SourceControlData[1].Name, "SourceControlData[1].Name");
+
+            list.Add(new NameValuePair("commit", "first"));
+            Assert.AreEqual(XmlConversionUtil.ConvertObjectToXml(list), to.SourceControlData[2].Value, "SourceControlData[2].Value");
+            list.Clear();
+            Assert.AreEqual("sc2", to.SourceControlData[2].Name, "SourceControlData[2].Name");
+        }
 
 		[Test]
 		public void IfRequireChangesFromAllTrueAndAllSourceControlHasModificationsThenReturnMods()

project/core/sourcecontrol/MultiSourceControl.cs

@@ -119,19 +119,31 @@ public override Modification[] GetModifications(IIntegrationResult from, IIntegr
             List<NameValuePair> originalSourceControlData = new List<NameValuePair>();
             List<NameValuePair> finalSourceControlData = new List<NameValuePair>();
             originalSourceControlData.AddRange(from.SourceControlData);
+            var originalSourceControlDataCount = originalSourceControlData.Count;
+
+            var sourceControlDataType = from.SourceControlData.GetType();
 
             var modificationSet = new Dictionary<Modification, bool>();
-            int sourceControlDataIndex = 0;
+            int sourceControlIndex = 0;
             foreach (ISourceControl sourceControl in SourceControls)
             {
                 from.SourceControlData.Clear();
-                if (sourceControlDataIndex < originalSourceControlData.Count)
-                    from.SourceControlData.AddRange((List<NameValuePair>)(XmlConversionUtil.ConvertXmlToObject(from.SourceControlData.GetType(), originalSourceControlData[sourceControlDataIndex].Value)));
+
+                if (originalSourceControlDataCount > 1 || 
+                    (originalSourceControlDataCount == 1 && 
+                     sourceControlIndex == 0 && 
+                     XmlConversionUtil.CanConvertXmlToObject(sourceControlDataType, originalSourceControlData[0].Value)
+                    )
+                   )
+                    from.SourceControlData.AddRange((List<NameValuePair>)(XmlConversionUtil.ConvertXmlToObject(sourceControlDataType, originalSourceControlData[sourceControlIndex].Value)));
+                else if ((originalSourceControlDataCount == 1) && (sourceControlIndex == SourceControls.Length - 1))
+                    from.SourceControlData.Add(originalSourceControlData[0]);
+
                 to.SourceControlData.Clear();
 
                 Modification[] mods = sourceControl.GetModifications(from, to);
 
-                finalSourceControlData.Add(new NameValuePair(string.Format("sc{0:d}", sourceControlDataIndex), XmlConversionUtil.ConvertObjectToXml(to.SourceControlData)));
+                finalSourceControlData.Add(new NameValuePair(string.Format("sc{0:d}", sourceControlIndex), XmlConversionUtil.ConvertObjectToXml(to.SourceControlData)));
 
                 if (mods != null && mods.Length > 0)
                 {
@@ -146,7 +158,7 @@ public override Modification[] GetModifications(IIntegrationResult from, IIntegr
                     break;
                 }
 
-                sourceControlDataIndex++;
+                sourceControlIndex++;
             }
 
             to.SourceControlData.Clear();