Fix broken tests from new direct dep feature

kzu · kzu · commit 2a5e198c9825 · 2024-07-11T10:48:59.000-03:00
diff --git a/samples/dotnet/Tests/AnalyzerTests.cs b/samples/dotnet/Tests/AnalyzerTests.cs
@@ -44,7 +44,14 @@ void IDisposable.Dispose()
     public async Task WhenNoAdditionalFiles_ThenReportsUnknown()
     {
         var compilation = CSharpCompilation.Create("test", [CSharpSyntaxTree.ParseText("//")])
-            .WithAnalyzers([new SponsorLinkAnalyzer()]);
+            .WithAnalyzers([new SponsorLinkAnalyzer()],
+                new AnalyzerOptions([], new TestAnalyzerConfigOptionsProvider(new())
+                {
+                    // Force reporting without wait period
+                    { "build_property.SponsorLinkNoInstallGrace", "true" },
+                    // Simulate directly referenced package
+                    { "build_property.SponsorableLib", "1.0.0" },
+                }));
 
         var diagnostics = await compilation.GetAnalyzerDiagnosticsAsync();
 
@@ -91,7 +98,9 @@ public async Task WhenUnknownAndNoGraceOption_ThenReportsUnknown()
             {
                 { "build_property.SponsorLinkNoInstallGrace", "true" },
                 { "build_metadata.Analyzer.ItemType", "Analyzer" },
-                { "build_metadata.Analyzer.NuGetPackageId", "SponsorableLib" }
+                { "build_metadata.Analyzer.NuGetPackageId", "SponsorableLib" },
+                // Simulate directly referenced package
+                { "build_property.SponsorableLib", "1.0.0" },
             }));
 
         var diagnostics = await compilation.GetAnalyzerDiagnosticsAsync();
@@ -119,7 +128,9 @@ public async Task WhenUnknownAndGraceExpired_ThenReportsUnknown()
             .WithAnalyzers([new SponsorLinkAnalyzer()], new AnalyzerOptions([new AdditionalTextFile(dll)], new TestAnalyzerConfigOptionsProvider(new())
             {
                 { "build_metadata.Analyzer.ItemType", "Analyzer" },
-                { "build_metadata.Analyzer.NuGetPackageId", "SponsorableLib" }
+                { "build_metadata.Analyzer.NuGetPackageId", "SponsorableLib" },
+                // Simulate directly referenced package
+                { "build_property.SponsorableLib", "1.0.0" },
             }));
 
         var diagnostics = await compilation.GetAnalyzerDiagnosticsAsync();
@@ -144,7 +155,9 @@ public async Task WhenSponsoring_ThenReportsSponsor()
         var compilation = CSharpCompilation.Create("test", [CSharpSyntaxTree.ParseText("//")])
             .WithAnalyzers([new SponsorLinkAnalyzer()], new AnalyzerOptions([new AdditionalTextFile(jwt)], new TestAnalyzerConfigOptionsProvider(new())
             {
-                { "build_metadata.SponsorManifest.ItemType", "SponsorManifest" }
+                { "build_metadata.SponsorManifest.ItemType", "SponsorManifest" },
+                // Simulate directly referenced package
+                { "build_property.SponsorableLib", "1.0.0" },
             }));
 
         var diagnostics = await compilation.GetAnalyzerDiagnosticsAsync();
@@ -163,21 +176,41 @@ public async Task WhenSponsoring_ThenReportsSponsor()
     public async Task WhenMultipleAnalyzers_ThenReportsOnce()
     {
         var compilation = CSharpCompilation.Create("test", [CSharpSyntaxTree.ParseText("//")])
-            .WithAnalyzers([new SponsorLinkAnalyzer(), new SponsorLinkAnalyzer()]);
-
-        var diagnostics = await compilation.GetAnalyzerDiagnosticsAsync();
+            .WithAnalyzers([new SponsorLinkAnalyzer(), new SponsorLinkAnalyzer()],
+                new AnalyzerOptions([], new TestAnalyzerConfigOptionsProvider(new())
+                {
+                    // Force reporting without wait period
+                    { "build_property.SponsorLinkNoInstallGrace", "true" },
+                    // Simulate directly referenced package
+                    { "build_property.SponsorableLib", "1.0.0" },
+                    { "build_property.SponsorLink", "1.0.0" },
+                }));
+
+        var diagnostics = (await compilation.GetAnalyzerDiagnosticsAsync())
+            .Where(x => x.Properties.TryGetValue(nameof(SponsorStatus), out var _));
 
         Assert.NotEmpty(diagnostics);
+        Assert.Single(diagnostics.Where(x => x.Properties.TryGetValue(nameof(SponsorStatus), out var value)));
+    }
 
-        var diagnostic = diagnostics.Single(x => x.Properties.TryGetValue(nameof(SponsorStatus), out var value));
+    [Fact]
+    public async Task WhenAnalyzerNotDirectlyReferenced_ThenDoesNotReport()
+    {
+        var compilation = CSharpCompilation.Create("test", [CSharpSyntaxTree.ParseText("//")])
+            .WithAnalyzers([new SponsorLinkAnalyzer()],
+                new AnalyzerOptions([], new TestAnalyzerConfigOptionsProvider(new())
+                {
+                    // Force reporting if necessary without wait period
+                    { "build_property.SponsorLinkNoInstallGrace", "true" },
+                    // Directly referenced package would result in a compiler visible property like: 
+                    //{ "build_property.SponsorableLib", "1.0.0" },
+                }));
 
-        Assert.True(diagnostic.Properties.TryGetValue(nameof(SponsorStatus), out var value));
-        var status = Enum.Parse<SponsorStatus>(value);
+        var diagnostics = await compilation.GetAnalyzerDiagnosticsAsync();
 
-        Assert.Equal(SponsorStatus.Unknown, status);
+        Assert.Empty(diagnostics);
     }
 
-
     string GetTempPath([CallerMemberName] string? test = default)
     {
         var path = Path.Combine(Path.GetTempPath(), test ?? nameof(AnalyzerTests));
