Improving baseliner (#2290)

* Improving baseliner * Adding test to verify new behavior
microsoft · Feb 24, 2021 · ba447a1 · ba447a1
1 parent 9c24de0
commit ba447a1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Sarif/Baseline/ResultMatching/DataStructures/MatchedResults.cs b/src/Sarif/Baseline/ResultMatching/DataStructures/MatchedResults.cs
@@ -45,6 +45,14 @@ public Result CalculateBasedlinedResult(DictionaryMergeBehavior propertyBagMerge
             {
                 // Baseline result and current result have been matched => existing.
                 result = ConstructExistingResult(resultMatchingProperties, out originalResultMatchingProperties);
+
+                var previousResult = new Result { Locations = PreviousResult.Result.Locations };
+                var currenResult = new Result { Locations = CurrentResult.Result.Locations };
+
+                if (previousResult.ValueGetHashCode() != currenResult.ValueGetHashCode())
+                {
+                    result.BaselineState = BaselineState.Updated;
+                }
             }
             else if (PreviousResult == null && CurrentResult != null)
             {

diff --git a/src/Test.UnitTests.Sarif/Baseline2/MatchedResultsTests.cs b/src/Test.UnitTests.Sarif/Baseline2/MatchedResultsTests.cs
@@ -272,7 +272,29 @@ private struct FirstDetectionTimeTestCase
                     },
                     ExpectedBaselineState = BaselineState.Unchanged,
                     ExpectedFirstDetectionTime = previousRunEndTime
-                }
+                },
+                new FirstDetectionTimeTestCase
+                {
+                    Name = "Updated, new location",
+                    PreviousResult = new Result
+                    {
+                        Locations = new []
+                        {
+                            new Location { PhysicalLocation = new PhysicalLocation { ArtifactLocation = new ArtifactLocation{ Uri = new Uri("a.sarif", UriKind.Relative)}}}
+                        }
+                    },
+                    PreviousRun = new Run(),
+                    CurrentResult = new Result
+                    {
+                        Locations = new []
+                        {
+                            new Location { PhysicalLocation = new PhysicalLocation { ArtifactLocation = new ArtifactLocation{ Uri = new Uri("a.sarif", UriKind.Relative)}}},
+                            new Location { PhysicalLocation = new PhysicalLocation { ArtifactLocation = new ArtifactLocation{ Uri = new Uri("b.sarif", UriKind.Relative)}}},
+                        }
+                    }, // Matches because the result matcher looks at only certain properties, and Provenance isn't one of them.
+                    CurrentRun = new Run(),
+                    ExpectedBaselineState = BaselineState.Updated,
+                },
             };
 
         [Fact]