Mock it all

Author: carlossanlop

test/Microsoft.DotNet.ApiCompatibility.Tests/SuppressibleTestLog.cs

@@ -6,7 +6,7 @@
 
 namespace Microsoft.DotNet.ApiCompatibility.Tests
 {
-    public class SuppressibleTestLog : ISuppressibleLog
+    internal class SuppressibleTestLog : ISuppressibleLog
     {
         public List<string> info = [];
         public List<string> errors = [];

test/Microsoft.DotNet.ApiSymbolExtensions.Tests/AssemblySymbolLoaderTests.cs

@@ -6,14 +6,15 @@
 using System.Collections.Concurrent;
 using System.Reflection;
 using Microsoft.CodeAnalysis;
-using Microsoft.DotNet.ApiCompatibility.Tests;
+using Microsoft.DotNet.ApiSymbolExtensions.Logging;
 using Microsoft.DotNet.Cli.Utils;
+using Moq;
 
 namespace Microsoft.DotNet.ApiSymbolExtensions.Tests
 {
     public class AssemblySymbolLoaderTests : SdkTest
     {
-        private readonly SuppressibleTestLog _logger = new();
+        private readonly Mock<ILog> _log = new();
 
         public AssemblySymbolLoaderTests(ITestOutputHelper log) : base(log) { }
 
@@ -92,14 +93,14 @@ private TestAssetInfo GetAsset(TestAssetsManager manager)
         [Fact]
         public void LoadAssembly_Throws()
         {
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             Assert.Throws<FileNotFoundException>(() => loader.LoadAssembly(Guid.NewGuid().ToString("N").Substring(0, 8)));
         }
 
         [Fact]
         public void LoadAssemblyFromSourceFiles_Throws()
         {
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             IEnumerable<string> paths = new[] { Guid.NewGuid().ToString("N") };
             Assert.Throws<FileNotFoundException>(() => loader.LoadAssemblyFromSourceFiles(paths, "assembly1", Array.Empty<string>()));
             Assert.Throws<ArgumentNullException>("filePaths", () => loader.LoadAssemblyFromSourceFiles(Array.Empty<string>(), "assembly1", Array.Empty<string>()));
@@ -109,7 +110,7 @@ public void LoadAssemblyFromSourceFiles_Throws()
         [Fact]
         public void LoadMatchingAssemblies_Throws()
         {
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             IEnumerable<string> paths = new[] { Guid.NewGuid().ToString("N") };
             IAssemblySymbol assembly = SymbolFactory.GetAssemblyFromSyntax("namespace MyNamespace { class Foo { } }");
 
@@ -122,7 +123,7 @@ public void LoadMatchingAssembliesWarns()
             IAssemblySymbol assembly = SymbolFactory.GetAssemblyFromSyntax("namespace MyNamespace { class Foo { } }");
             IEnumerable<string> paths = new[] { AppContext.BaseDirectory };
 
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             IEnumerable<IAssemblySymbol> symbols = loader.LoadMatchingAssemblies(new[] { assembly }, paths);
             Assert.Empty(symbols);
             Assert.True(loader.HasLoadWarnings(out IReadOnlyList<AssemblyLoadWarning> warnings));
@@ -155,7 +156,7 @@ public void LoadMatchingAssembliesSameIdentitySucceeds()
                 .Should()
                 .Pass();
 
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             IEnumerable<IAssemblySymbol> matchingAssemblies = loader.LoadMatchingAssemblies(new[] { fromAssembly }, new[] { outputDirectory });
 
             Assert.Single(matchingAssemblies);
@@ -170,7 +171,7 @@ public void LoadMatchingAssemblies_DifferentIdentity(bool validateIdentities)
             var assetInfo = GetSimpleTestAsset();
             IAssemblySymbol fromAssembly = SymbolFactory.GetAssemblyFromSyntax(SimpleAssemblySourceContents, assemblyName: assetInfo.TestAsset.TestProject.Name);
 
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             IEnumerable<IAssemblySymbol> matchingAssemblies = loader.LoadMatchingAssemblies(new[] { fromAssembly }, new[] { assetInfo.OutputDirectory }, validateMatchingIdentity: validateIdentities);
 
             if (validateIdentities)
@@ -197,7 +198,7 @@ public void LoadMatchingAssemblies_DifferentIdentity(bool validateIdentities)
         public void LoadsSimpleAssemblyFromDirectory()
         {
             var assetInfo = GetSimpleTestAsset();
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             IEnumerable<IAssemblySymbol> symbols = loader.LoadAssemblies(assetInfo.OutputDirectory);
             Assert.Single(symbols);
 
@@ -215,7 +216,7 @@ public void LoadsSimpleAssemblyFromDirectory()
         public void LoadSimpleAssemblyFullPath()
         {
             var assetInfo = GetSimpleTestAsset();
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             IAssemblySymbol symbol = loader.LoadAssembly(Path.Combine(assetInfo.OutputDirectory, assetInfo.TestAsset.TestProject.Name + ".dll"));
 
             IEnumerable<ITypeSymbol> types = symbol.GlobalNamespace
@@ -249,7 +250,7 @@ public void LoadsMultipleAssembliesFromDirectory()
                 .Should()
                 .Pass();
 
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             IEnumerable<IAssemblySymbol> symbols = loader.LoadAssemblies(outputDirectory);
 
             Assert.Equal(2, symbols.Count());
@@ -266,7 +267,7 @@ public void LoadsMultipleAssembliesFromDirectory()
         public void LoadAssemblyResolveReferences_WarnsWhenEnabled(bool resolveReferences)
         {
             var assetInfo = GetSimpleTestAsset();
-            AssemblySymbolLoader loader = new(_logger, resolveAssemblyReferences: resolveReferences);
+            AssemblySymbolLoader loader = new(_log.Object, resolveAssemblyReferences: resolveReferences);
             loader.LoadAssembly(Path.Combine(assetInfo.OutputDirectory, assetInfo.TestAsset.TestProject.Name + ".dll"));
 
             if (resolveReferences)
@@ -298,7 +299,7 @@ public void LoadAssemblyResolveReferences_WarnsWhenEnabled(bool resolveReference
         public void LoadAssembliesShouldResolveReferencesNoWarnings()
         {
             var assetInfo = GetSimpleTestAsset();
-            AssemblySymbolLoader loader = new(_logger, resolveAssemblyReferences: true);
+            AssemblySymbolLoader loader = new(_log.Object, resolveAssemblyReferences: true);
             // AddReferenceSearchDirectories should be able to handle directories as well as full path to assemblies.
             loader.AddReferenceSearchPaths(Path.GetDirectoryName(typeof(string).Assembly.Location));
             loader.AddReferenceSearchPaths(Path.GetFullPath(typeof(string).Assembly.Location));
@@ -317,7 +318,7 @@ public void LoadAssemblyFromStreamNoWarns()
         {
             var assetInfo = GetSimpleTestAsset();
             TestProject testProject = assetInfo.TestAsset.TestProject;
-            AssemblySymbolLoader loader = new(_logger);
+            AssemblySymbolLoader loader = new(_log.Object);
             using FileStream stream = File.OpenRead(Path.Combine(assetInfo.OutputDirectory, testProject.Name + ".dll"));
             IAssemblySymbol symbol = loader.LoadAssembly(testProject.Name, stream);
 

test/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs

@@ -8,9 +8,10 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.DotNet.ApiSymbolExtensions;
 using Microsoft.DotNet.ApiSymbolExtensions.Filtering;
-using Microsoft.DotNet.ApiCompatibility.Tests;
+using Microsoft.DotNet.ApiSymbolExtensions.Logging;
 using Microsoft.DotNet.ApiSymbolExtensions.Tests;
 using Microsoft.DotNet.GenAPI.Filtering;
+using Moq;
 
 namespace Microsoft.DotNet.GenAPI.Tests
 {
@@ -54,10 +55,10 @@ private void RunTest(string original,
             }
             attributeDataSymbolFilter.Add(accessibilitySymbolFilter);
 
-            SuppressibleTestLog log = new();
+            Mock<ILog> log = new();
 
             IAssemblySymbolWriter csharpFileBuilder = new CSharpFileBuilder(
-                log,
+                log.Object,
                 symbolFilter,
                 attributeDataSymbolFilter,
                 stringWriter,
@@ -66,7 +67,7 @@ private void RunTest(string original,
                 MetadataReferences);
 
             using Stream assemblyStream = SymbolFactory.EmitAssemblyStreamFromSyntax(original, enableNullable: true, allowUnsafe: allowUnsafe, assemblyName: assemblyName);
-            AssemblySymbolLoader assemblySymbolLoader = new(log, resolveAssemblyReferences: true, includeInternalSymbols: includeInternalSymbols);
+            AssemblySymbolLoader assemblySymbolLoader = new(log.Object, resolveAssemblyReferences: true, includeInternalSymbols: includeInternalSymbols);
             assemblySymbolLoader.AddReferenceSearchPaths(typeof(object).Assembly!.Location!);
             assemblySymbolLoader.AddReferenceSearchPaths(typeof(DynamicAttribute).Assembly!.Location!);
             IAssemblySymbol assemblySymbol = assemblySymbolLoader.LoadAssembly(assemblyName, assemblyStream);

test/Microsoft.DotNet.GenAPI.Tests/Microsoft.DotNet.GenAPI.Tests.csproj

@@ -12,10 +12,10 @@
 
   <ItemGroup>
     <Compile Include="..\Microsoft.DotNet.ApiSymbolExtensions.Tests\SymbolFactory.cs" />
+    <Compile Include="..\Microsoft.DotNet.ApiSymbolExtensions.Tests\TempDirectory.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)test\Microsoft.DotNet.ApiCompatibility.Tests\Microsoft.DotNet.ApiCompatibility.Tests.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Compatibility\GenAPI\Microsoft.DotNet.GenAPI\Microsoft.DotNet.GenAPI.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Compatibility\Microsoft.DotNet.ApiSymbolExtensions\Microsoft.DotNet.ApiSymbolExtensions.csproj" />
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />