add missing test case for previous load functionality.

Azure · May 31, 2023 · e8ffd7a · e8ffd7a
1 parent e5e0572
commit e8ffd7a
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/...dk.Tools.Assets.MaintenanceTool.Tests/Azure.Sdk.Tools.Assets.MaintenanceTool.Tests.csproj b/...dk.Tools.Assets.MaintenanceTool.Tests/Azure.Sdk.Tools.Assets.MaintenanceTool.Tests.csproj
@@ -28,6 +28,9 @@
     <None Update="TestResources\basic_output\output.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="TestResources\configurations\sample-repo-configuration.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/...omation/assets-maintenance-tool/Azure.Sdk.Tools.Assets.MaintenanceTool.Tests/ScanTests.cs b/...omation/assets-maintenance-tool/Azure.Sdk.Tools.Assets.MaintenanceTool.Tests/ScanTests.cs
@@ -268,6 +268,19 @@ public void TestParsePreviouslyOutputResults()
             Assert.That(resultSet.Results[2].ScanDate, Is.EqualTo(DateTime.Parse("2023-05-08T00:00:00")));
         }
 
+        [Test]
+        [GitTokenSkip]
+        public void TestLoadConfiguration()
+        {
+            var scanner = new AssetsScanner(TestDirectory);
+            var runConfigurationPath = Path.Combine(TestDirectory, "TestResources", "configurations", "sample-repo-configuration.json");
+            var config = new RunConfiguration(runConfigurationPath);
+
+            var results = scanner.Scan(config);
+
+            Assert.That(results.Results.Count, Is.EqualTo(8));
+        }
+
         [Test]
         [GitTokenSkip]
         public void TestScanOutputsResults()

diff --git a/...n/assets-maintenance-tool/Azure.Sdk.Tools.Assets.MaintenanceTool/Model/AssetsResultSet.cs b/...n/assets-maintenance-tool/Azure.Sdk.Tools.Assets.MaintenanceTool/Model/AssetsResultSet.cs
@@ -18,14 +18,9 @@ public AssetsResultSet(List<AssetsResult> input)
             CalculateObjects();
         }
 
-        public AssetsResultSet(List<AssetsResult> input, AssetsResultSet? existingSet)
-        {
-            Results = input;
-
-            // todo: coalesce input + existing set
-
-            CalculateObjects();
-        }
+        // Currently we already honor previous results in AssetsScanner::ScanRepo()L#119
+        // leaving this final resolution point in place between the two sets just in case.
+        // This eliminates the need for a constructor that coalesces a previous result set.
 
         public List<AssetsResult> Results { get; set; } = new List<AssetsResult>();
 

diff --git a/.../assets-maintenance-tool/Azure.Sdk.Tools.Assets.MaintenanceTool/Model/RunConfiguration.cs b/.../assets-maintenance-tool/Azure.Sdk.Tools.Assets.MaintenanceTool/Model/RunConfiguration.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace Azure.Sdk.Tools.Assets.MaintenanceTool.Model
@@ -18,7 +19,24 @@ public RunConfiguration() {
 
         public RunConfiguration(string configPath)
         {
+            if (File.Exists(configPath))
+            {
+                Repos = new List<RepoConfiguration>();
 
+                using var stream = System.IO.File.OpenRead(configPath);
+                using var doc = JsonDocument.Parse(stream);
+
+                var results = JsonSerializer.Deserialize<RunConfiguration>(doc);
+
+                if (results != null)
+                {
+                    Repos = results.Repos;
+                }
+            }
+            else
+            {
+                throw new ArgumentException($"The configuration file path \"{configPath}\" does not exist.");
+            }
         }
 
         public List<RepoConfiguration> Repos { get; set; }

diff --git a/...tion/assets-maintenance-tool/Azure.Sdk.Tools.Assets.MaintenanceTool/Scan/AssetsScanner.cs b/...tion/assets-maintenance-tool/Azure.Sdk.Tools.Assets.MaintenanceTool/Scan/AssetsScanner.cs
@@ -53,7 +53,7 @@ public AssetsResultSet Scan(RunConfiguration config)
                 resultSet.AddRange(ScanRepo(repoConfig, existingResults));
             });
 
-            var newResults = new AssetsResultSet(resultSet, existingResults);
+            var newResults = new AssetsResultSet(resultSet);
 
             Save(newResults);