Refactor tests to point to new call locations

microsoft · Nov 12, 2024 · dbb205e · dbb205e
1 parent f2acc13
commit dbb205e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/oss-tests/DefoggerTests.cs b/src/oss-tests/DefoggerTests.cs
@@ -10,6 +10,8 @@
 namespace Microsoft.CST.OpenSource.Tests
 
 {
+    using OssGadget.Tools;
+
     [TestClass]
     public class DefoggerTests
     {

diff --git a/src/oss-tests/DetectCryptographyTests.cs b/src/oss-tests/DetectCryptographyTests.cs
@@ -11,6 +11,7 @@
 namespace Microsoft.CST.OpenSource.Tests
 {
     using ApplicationInspector.RulesEngine;
+    using OssGadget.Tools;
     using PackageUrl;
 
     [TestClass]

diff --git a/src/oss-tests/FindSquatsTests.cs b/src/oss-tests/FindSquatsTests.cs
@@ -15,6 +15,7 @@ namespace Microsoft.CST.OpenSource.Tests
     using Extensions;
     using Helpers;
     using Model.Metadata;
+    using OssGadget.Options;
     using PackageUrl;
     using System.Linq;
     using System.Net.Http;
@@ -54,12 +55,12 @@ public async Task DetectSquats(string packageUrl, bool generateSquats, bool expe
 
             ProjectManagerFactory projectManagerFactory = new(managerOverrides);
             FindSquatsTool fst = new(projectManagerFactory);
-            FindSquatsTool.Options options = new()
+            FindSquatsToolOptions options = new()
             {
                 Quiet = true,
                 Targets = new string[] { packageUrl }
             };
-            (string output, int numSquats) result = await fst.RunAsync(options);
+            (string output, int numSquats) result = await fst.LegacyRunAsync(options);
             Assert.IsTrue(expectedToHaveSquats ? result.numSquats > 0 : result.numSquats == 0);
         }
 

diff --git a/src/oss-tests/ReproducibleTests.cs b/src/oss-tests/ReproducibleTests.cs
@@ -11,6 +11,8 @@
 
 namespace Microsoft.CST.OpenSource.Tests
 {
+    using OssGadget.Options;
+
     [TestClass]
     public class ReproducibleTest
     {
@@ -24,7 +26,11 @@ public ReproducibleTest()
         public async Task CheckReproducibility(string packageUrl, bool? expectedToBeReproducible)
         {
             string? outputFilename = Guid.NewGuid().ToString() + ".json";
-            ReproducibleTool.Main(new[] { "-a", "-o", outputFilename, packageUrl }).Wait();
+            var options = new ReproducibleToolOptions()
+            {
+                AllStrategies = true, OutputFile = outputFilename, Targets = new[] { packageUrl }
+            };
+            await new ReproducibleTool().RunAsync(options);
 
             bool outputFileExists = File.Exists(outputFilename);