The multi source control must split and recombine SourceControlData for sub source control blocks to work properly.

Author: obones

project/UnitTests/Core/SourceControl/MultiSourceControlTest.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using Exortech.NetReflector;
 using NMock;
 using NUnit.Framework;
 using ThoughtWorks.CruiseControl.Core;
 using ThoughtWorks.CruiseControl.Core.Sourcecontrol;
+using ThoughtWorks.CruiseControl.Remote;
 
 namespace ThoughtWorks.CruiseControl.UnitTests.Core.Sourcecontrol
 {
@@ -136,6 +138,68 @@ private DynamicMock CreateModificationsSourceControlMock(Modification[] mods, In
 			return mock;
 		}
 
+        private class MockSourceControl : ISourceControl
+        {
+            public Modification[] GetModifications(IIntegrationResult from, IIntegrationResult to)
+            {
+                Assert.AreEqual("first", from.SourceControlData[0].Value, "SourceControlData[0].Value");
+
+                to.SourceControlData.Clear();
+                to.SourceControlData.Add(from.SourceControlData[0]);
+
+                return new Modification[] { };
+            }
+
+            public void LabelSourceControl(IIntegrationResult result) { }
+            public void GetSource(IIntegrationResult result) { }
+            public void Initialize(IProject project) { }
+            public void Purge(IProject project) { }
+        }
+
+
+        [Test]
+        public void PassesIndividualSourceDataAndCombines()
+        {
+            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.Add(new NameValuePair("name1", "first"));
+            list.Add(new NameValuePair("name2", "first"));
+            scValue = XmlConversionUtil.ConvertObjectToXml(list);
+            from.SourceControlData.Add(new NameValuePair("sc1", scValue));
+            list.Clear();
+
+            List<ISourceControl> sourceControls = new List<ISourceControl>();
+            sourceControls.Add(new MockSourceControl());
+            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");
+
+            list.Add(new NameValuePair("name1", "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()

project/core/sourcecontrol/MultiSourceControl.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Exortech.NetReflector;
 using ThoughtWorks.CruiseControl.Core.Tasks;
+using ThoughtWorks.CruiseControl.Remote;
 using ThoughtWorks.CruiseControl.Remote.Parameters;
 using System.Xml;
 
@@ -115,10 +116,23 @@ public ISourceControl[] SourceControls
         /// <remarks></remarks>
         public override Modification[] GetModifications(IIntegrationResult from, IIntegrationResult to)
 		{
+            List<NameValuePair> originalSourceControlData = new List<NameValuePair>();
+            List<NameValuePair> finalSourceControlData = new List<NameValuePair>();
+            originalSourceControlData.AddRange(from.SourceControlData);
+
             var modificationSet = new Dictionary<Modification, bool>();
+            int sourceControlDataIndex = 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)));
+                to.SourceControlData.Clear();
+
                 Modification[] mods = sourceControl.GetModifications(from, to);
+
+                finalSourceControlData.Add(new NameValuePair(string.Format("sc{0:d}", sourceControlDataIndex), XmlConversionUtil.ConvertObjectToXml(to.SourceControlData)));
+
                 if (mods != null && mods.Length > 0)
                 {
                     foreach (var mod in mods)
@@ -131,8 +145,13 @@ public override Modification[] GetModifications(IIntegrationResult from, IIntegr
                     modificationSet.Clear();
                     break;
                 }
+
+                sourceControlDataIndex++;
             }
 
+            to.SourceControlData.Clear();
+            to.SourceControlData.AddRange(finalSourceControlData);
+
             var modArray = new Modification[modificationSet.Count];
             modificationSet.Keys.CopyTo(modArray, 0);
             return modArray;