Fixes ArgumentNullException with MultiSourceControl and svn (Bug #304)

Author: DanielRose

project/Remote/XmlConversionUtil.cs

@@ -130,6 +130,11 @@ public static object ConvertXmlToObject(Type messageType, string message)
         /// <returns>true if the message can be deserialized to the given message type.</returns>
         public static bool CanConvertXmlToObject(Type messageType, string message)
         {
+            if (string.IsNullOrEmpty(message))
+            {
+                return false;
+            }
+
             // Make sure the serialiser has been loaded
             if (!messageSerialisers.ContainsKey(messageType))
             {

project/UnitTests/Core/SourceControl/MultiSourceControlTest.cs

@@ -142,10 +142,8 @@ 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]);
+                to.SourceControlData.AddRange(from.SourceControlData);
 
                 return new Modification[] { };
             }
@@ -155,7 +153,32 @@ public void GetSource(IIntegrationResult result) { }
             public void Initialize(IProject project) { }
             public void Purge(IProject project) { }
         }
+        
+        [Test]
+        public void HandlesNullSourceControlDataValue()
+        {
+            var from = IntegrationResultMother.CreateSuccessful(DateTime.Now);
+            var to = IntegrationResultMother.CreateSuccessful(DateTime.Now.AddDays(10));
+
+            from.SourceControlData.Add(new NameValuePair("SVN:LastRevision:svn://myserver/mypath", null));
+
+            var sourceControls = new List<ISourceControl> { new MockSourceControl(), new MockSourceControl() };
+            var multiSourceControl = new MultiSourceControl { SourceControls = sourceControls.ToArray() };
+
+            //// EXECUTE
+            var returnedMods = new ArrayList(multiSourceControl.GetModifications(from, to));
+
+            //// VERIFY
+            Assert.AreEqual(0, returnedMods.Count, "SourceControlData.Count");
+
+            Assert.AreEqual(2, to.SourceControlData.Count, "SourceControlData.Count");
+
+            Assert.AreEqual("<ArrayOfNameValuePair />", to.SourceControlData[0].Value, "SourceControlData[0].Value");
+            Assert.AreEqual("sc0", to.SourceControlData[0].Name, "SourceControlData[0].Name");
 
+            Assert.AreEqual("<ArrayOfNameValuePair><NameValuePair name=\"SVN:LastRevision:svn://myserver/mypath\" /></ArrayOfNameValuePair>", to.SourceControlData[1].Value, "SourceControlData[1].Value");
+            Assert.AreEqual("sc1", to.SourceControlData[1].Name, "SourceControlData[1].Name");
+        }
 
         [Test]
         public void PassesIndividualSourceDataAndCombines()
@@ -196,6 +219,7 @@ public void PassesIndividualSourceDataAndCombines()
             Assert.AreEqual("sc0", to.SourceControlData[0].Name, "SourceControlData[0].Name");
 
             list.Add(new NameValuePair("name1", "first"));
+            list.Add(new NameValuePair("name2", "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");