Merge pull request #1041 from solidify/bugfix/ensure-fields-on-state-change-return-if-no-state

Bugfix/ensure fields on state change return if no state

Author: Alexander-Hjelm

src/WorkItemMigrator/WorkItemImport/WitClient/WitClientUtils.cs

@@ -1,4 +1,5 @@
-using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
+using Microsoft.TeamFoundation.Common;
+using Microsoft.TeamFoundation.WorkItemTracking.WebApi.Models;
 using Microsoft.VisualStudio.Services.WebApi;
 using Microsoft.VisualStudio.Services.WebApi.Patch;
 using Microsoft.VisualStudio.Services.WebApi.Patch.Json;
@@ -804,6 +805,11 @@ private void CorrectClosedByAndClosedDate(WiRevision rev, WorkItem wi)
             }
             var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
 
+            if (wiState.IsNullOrEmpty())
+            {
+                return;
+            }
+
             if (
                     (
                         wiState.Equals(Done, StringComparison.InvariantCultureIgnoreCase)
@@ -838,6 +844,11 @@ private void CorrectActivatedByAndActivatedDate(WiRevision rev, WorkItem wi)
             }
             var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
 
+            if (wiState.IsNullOrEmpty())
+            {
+                return;
+            }
+
             if (!wiState.Equals(New, StringComparison.InvariantCultureIgnoreCase) && revState.Equals(New, StringComparison.InvariantCultureIgnoreCase))
             {
                 rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ActivatedDate, Value = "" });
@@ -863,6 +874,11 @@ private void CorrectResolvedByAndResolvedDate(WiRevision rev, WorkItem wi)
             }
             var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
 
+            if (wiState.IsNullOrEmpty())
+            {
+                return;
+            }
+
             if ((wiState.Equals(Resolved, StringComparison.InvariantCultureIgnoreCase)
                 || wiState.Equals(Done, StringComparison.InvariantCultureIgnoreCase)
                 || wiState.Equals(Closed, StringComparison.InvariantCultureIgnoreCase))

src/WorkItemMigrator/tests/Migration.Wi-Import.Tests/WitClient/WitClientUtilsTests.cs

@@ -396,6 +396,43 @@ public void When_calling_ensure_fields_on_a_closed_user_Story_with_Then_closed_d
             });
         }
 
+        [Test]
+        public void When_calling_ensure_fields_on_a_wi_with_no_state_field_Then_no_execption_is_thrown_and_no_revision_fields_are_set()
+        {
+            MockedWitClientWrapper witClientWrapper = new MockedWitClientWrapper();
+            WitClientUtils wiUtils = new WitClientUtils(witClientWrapper);
+
+            WiRevision rev = new WiRevision
+            {
+                Fields = new List<WiField>(),
+                Index = 1
+            };
+
+            WiField revState = new WiField
+            {
+                ReferenceName = WiFieldReference.State,
+                Value = "New"
+            };
+            rev.Fields.Add(revState);
+
+            WorkItem createdWI = wiUtils.CreateWorkItem("User Story", false);
+
+            wiUtils.EnsureFieldsOnStateChange(rev, createdWI);
+
+            Assert.DoesNotThrow(() => wiUtils.EnsureFieldsOnStateChange(rev, createdWI));
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State), Is.EqualTo("New"));
+                Assert.That(rev.Fields.Where(f => f.ReferenceName.Equals(WiFieldReference.ClosedDate)).Count, Is.EqualTo(0));
+                Assert.That(rev.Fields.Where(f => f.ReferenceName.Equals(WiFieldReference.ClosedBy)).Count, Is.EqualTo(0));
+                Assert.That(rev.Fields.Where(f => f.ReferenceName.Equals(WiFieldReference.ActivatedDate)).Count, Is.EqualTo(0));
+                Assert.That(rev.Fields.Where(f => f.ReferenceName.Equals(WiFieldReference.ActivatedBy)).Count, Is.EqualTo(0));
+                Assert.That(rev.Fields.Where(f => f.ReferenceName.Equals(WiFieldReference.ResolvedDate)).Count, Is.EqualTo(0));
+                Assert.That(rev.Fields.Where(f => f.ReferenceName.Equals(WiFieldReference.ResolvedBy)).Count, Is.EqualTo(0));
+            });
+        }
+
         [Test]
         public void When_calling_ensure_classification_fields_with_empty_args_Then_an_exception_is_thrown()
         {