Logical locations notes

src/Sarif.Converters.UnitTests/AndroidStudioConverterTests.cs

@@ -213,7 +213,7 @@ public void AndroidStudioConverter_ConvertSarifResult_DoesNotRecordTopLevelEntry
             loc.PhysicalLocation.Should().BeNull();
         }
 
-        private static void ValidateLogicalLocations(IList<LogicalLocation> expectedLogicalLocations, IList<LogicalLocation> actualLogicalLocations)
+        internal static void ValidateLogicalLocations(IList<LogicalLocation> expectedLogicalLocations, IList<LogicalLocation> actualLogicalLocations)
         {
             for (int i = 0; i < expectedLogicalLocations.Count; i++)
             {

src/Sarif.Converters.UnitTests/FxCopConverterTests.cs

@@ -330,12 +330,8 @@ public class FxCopConverterTests
     {
         private static void ValidateLogicalLocations(IList<LogicalLocation> expectedLogicalLocations, IList<LogicalLocation> actualLogicalLocations)
         {
-            actualLogicalLocations.Count.Should().Be(expectedLogicalLocations.Count);
-
-            for (int i = 0; i < expectedLogicalLocations.Count; i++)
-            {
-                expectedLogicalLocations[i].ValueEquals(actualLogicalLocations[i]).Should().BeTrue();
-            }
+            // If we end up with more shared helper code, we could extend these tests types from a common base.
+            AndroidStudioConverterTests.ValidateLogicalLocations(expectedLogicalLocations, actualLogicalLocations);
         }
 
         [Fact]

src/Sarif/Writers/PrereleaseCompatibilityTransformer.cs

@@ -229,7 +229,7 @@ private static JArray ConstructLogicalLocationsArray(
                 // location that happened to be enumerated after one of its children
                 if (fullyQualifiedLogicalNameToIndexMap.ContainsKey(logicalLocationEntry.Name)) { continue; }
 
-                fullyQualifiedLogicalNameToIndexMap = CreateLogicalLocationArrayEntry(
+                AddEntryToFullyQualifiedNameToIndexMap(
                     logicalLocations,
                     logicalLocationEntry.Name, 
                     (JObject)logicalLocationEntry.Value,
@@ -250,15 +250,23 @@ private static JArray ConstructLogicalLocationsArray(
             return new JArray(updatedArrayElements);
         }
 
-        private static Dictionary<string, int> CreateLogicalLocationArrayEntry(
+        private static void AddEntryToFullyQualifiedNameToIndexMap(
             JObject logicalLocationsDictionary,
             string keyName,
             JObject logicalLocation,
             Dictionary<LogicalLocation, int> logicalLocationToIndexMap,
             Dictionary<JObject, int> jObjectToIndexMap,
             Dictionary<string, int> keyToIndexMap)
         {
-            keyToIndexMap = keyToIndexMap ?? new Dictionary<string, int>();
+            if (keyToIndexMap == null)
+            {
+                throw new ArgumentNullException(nameof(keyToIndexMap));
+            }
+
+            if (logicalLocation == null)
+            {
+                throw new ArgumentNullException(nameof(logicalLocation));
+            }
 
             string fullyQualifiedName = keyName;
 
@@ -280,7 +288,7 @@ private static Dictionary<string, int> CreateLogicalLocationArrayEntry(
                     // determine its index in our array. This code path results in 
                     // an array order that does not precisely match the enumeration
                     // order of the logical locations dictionary.
-                    keyToIndexMap = CreateLogicalLocationArrayEntry(
+                    AddEntryToFullyQualifiedNameToIndexMap(
                         logicalLocationsDictionary,
                         parentKey,
                         (JObject)logicalLocationsDictionary[parentKey],
@@ -319,8 +327,6 @@ private static Dictionary<string, int> CreateLogicalLocationArrayEntry(
                 jObjectToIndexMap[logicalLocation] = index;
                 keyToIndexMap[fullyQualifiedName] = index;
             }
-
-            return keyToIndexMap;
         }
 
         private static bool RemapRuleDefaultLevelFromOpenToNote(JObject resources)