The conversion must be done once and for all and thus can be more precise.

Author: obones

project/UnitTests/Core/SourceControl/MultiSourceControlTest.cs

@@ -234,7 +234,7 @@ public void PassesIndividualSourceDataAndCombinesSingleSourceControl()
         }
 
         [Test]
-        public void MigratesSingleSourceControlDataToNewFormat()
+        public void MigratesSourceControlDataToNewFormat()
         {
             IntegrationResult from = IntegrationResultMother.CreateSuccessful(DateTime.Now);
             IntegrationResult to = IntegrationResultMother.CreateSuccessful(DateTime.Now.AddDays(10));
@@ -249,7 +249,9 @@ public void MigratesSingleSourceControlDataToNewFormat()
                 scList.Add(mock.MockInstance);
             }
             scList.Add(new MockSourceControl());
+            scList.Add(new MockSourceControl());
 
+            from.SourceControlData.Add(new NameValuePair("test", "first"));
             from.SourceControlData.Add(new NameValuePair("commit", "first"));
 
             MultiSourceControl multiSourceControl = new MultiSourceControl();
@@ -259,7 +261,7 @@ public void MigratesSingleSourceControlDataToNewFormat()
             ArrayList returnedMods = new ArrayList(multiSourceControl.GetModifications(from, to));
 
             //// VERIFY
-            Assert.AreEqual(3, to.SourceControlData.Count, "SourceControlData.Count");
+            Assert.AreEqual(4, to.SourceControlData.Count, "SourceControlData.Count");
 
             List<NameValuePair> list = new List<NameValuePair>();
 
@@ -269,13 +271,53 @@ public void MigratesSingleSourceControlDataToNewFormat()
             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"));
+            list.Add(new NameValuePair("test", "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");
+
+            list.Add(new NameValuePair("commit", "first"));
+            Assert.AreEqual(XmlConversionUtil.ConvertObjectToXml(list), to.SourceControlData[3].Value, "SourceControlData[3].Value");
+            list.Clear();
+            Assert.AreEqual("sc3", to.SourceControlData[3].Name, "SourceControlData[3].Name");
         }
-		
-		[Test]
+
+        [Test]
+        public void MigratesSourceControlDataToNewFormatSameSourceControlCount()
+        {
+            IntegrationResult from = IntegrationResultMother.CreateSuccessful(DateTime.Now);
+            IntegrationResult to = IntegrationResultMother.CreateSuccessful(DateTime.Now.AddDays(10));
+
+            ArrayList scList = new ArrayList();
+            scList.Add(new MockSourceControl());
+            scList.Add(new MockSourceControl());
+
+            from.SourceControlData.Add(new NameValuePair("test", "first"));
+            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(2, to.SourceControlData.Count, "SourceControlData.Count");
+
+            List<NameValuePair> list = new List<NameValuePair>();
+
+            list.Add(new NameValuePair("test", "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");
+
+            list.Add(new NameValuePair("commit", "first"));
+            Assert.AreEqual(XmlConversionUtil.ConvertObjectToXml(list), to.SourceControlData[1].Value, "SourceControlData[1].Value");
+            list.Clear();
+            Assert.AreEqual("sc1", to.SourceControlData[1].Name, "SourceControlData[1].Name");
+        }
+
+        [Test]
 		public void IfRequireChangesFromAllTrueAndAllSourceControlHasModificationsThenReturnMods()
 		{
 			//// SETUP

project/core/sourcecontrol/MultiSourceControl.cs

@@ -118,26 +118,51 @@ 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();
 
+            // check that the source control data given to us is in the list of list format
+            // if not, then convert it now
+            var fromSourceControlDataCount = from.SourceControlData.Count;
+            if (fromSourceControlDataCount > 0 &&
+                (fromSourceControlDataCount != SourceControls.Length ||
+                 !XmlConversionUtil.CanConvertXmlToObject(sourceControlDataType, from.SourceControlData[0].Value)
+                )
+               )
+            {
+                var conversionList = new List<NameValuePair>();
+
+                for (int i = 0; i < SourceControls.Length; i++)
+                    originalSourceControlData.Add(new NameValuePair(string.Format("sc{0:d}", i), ""));
+
+                int scdIndex = fromSourceControlDataCount - 1;
+                for (int i = originalSourceControlData.Count - 1; i >= 0; i--)
+                {
+                    conversionList.Clear();
+
+                    if (scdIndex >= 0)
+                        if (!XmlConversionUtil.CanConvertXmlToObject(sourceControlDataType, from.SourceControlData[scdIndex].Value))
+                            conversionList.Add(from.SourceControlData[scdIndex]);
+
+                    originalSourceControlData[i].Value = XmlConversionUtil.ConvertObjectToXml(conversionList);
+
+                    scdIndex--;
+                }
+
+            }
+            else
+            {
+                originalSourceControlData.AddRange(from.SourceControlData);
+            }
+
+            var originalSourceControlDataCount = originalSourceControlData.Count;
             var modificationSet = new Dictionary<Modification, bool>();
             int sourceControlIndex = 0;
             foreach (ISourceControl sourceControl in SourceControls)
             {
                 from.SourceControlData.Clear();
-
-                if (originalSourceControlDataCount > 1 || 
-                    (originalSourceControlDataCount == 1 && 
-                     sourceControlIndex == 0 && 
-                     XmlConversionUtil.CanConvertXmlToObject(sourceControlDataType, originalSourceControlData[0].Value)
-                    )
-                   )
+                if (sourceControlIndex < originalSourceControlDataCount)
                     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();