asd

GitHubActionsTestLogger.Tests/VsTestAnnotationSpecs.cs

@@ -1,7 +1,6 @@
+using System.Collections.Generic;
 using System.IO;
 using FluentAssertions;
-using GitHubActionsTestLogger.GitHub;
-using GitHubActionsTestLogger.Reporting;
 using GitHubActionsTestLogger.Tests.VsTest;
 using Xunit;
 using Xunit.Abstractions;
@@ -20,13 +19,7 @@ public void I_can_use_the_logger_to_produce_annotations_for_failed_tests()
         var events = new FakeTestLoggerEvents();
         var logger = new VsTestLogger();
 
-        logger.Initialize(
-            events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                TestReportingOptions.Default
-            )
-        );
+        logger.Initialize(events, [], commandWriter, TextWriter.Null);
 
         // Act
         events.SimulateTestRun(
@@ -70,13 +63,7 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_source_info
         var events = new FakeTestLoggerEvents();
         var logger = new VsTestLogger();
 
-        logger.Initialize(
-            events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                TestReportingOptions.Default
-            )
-        );
+        logger.Initialize(events, [], commandWriter, TextWriter.Null);
 
         // Act
         events.SimulateTestRun(
@@ -126,13 +113,7 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_source_info
         var events = new FakeTestLoggerEvents();
         var logger = new VsTestLogger();
 
-        logger.Initialize(
-            events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                TestReportingOptions.Default
-            )
-        );
+        logger.Initialize(events, [], commandWriter, TextWriter.Null);
 
         // Act
         events.SimulateTestRun(
@@ -185,14 +166,13 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_the_test_na
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                new TestReportingOptions
-                {
-                    AnnotationTitleFormat = "<@test>",
-                    AnnotationMessageFormat = "[@test]",
-                }
-            )
+            new Dictionary<string, string?>
+            {
+                ["annotations-title"] = "<@test>",
+                ["annotations-message"] = "[@test]",
+            },
+            commandWriter,
+            TextWriter.Null
         );
 
         // Act
@@ -220,14 +200,13 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_test_traits
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                new TestReportingOptions
-                {
-                    AnnotationTitleFormat = "<@traits.Category -> @test>",
-                    AnnotationMessageFormat = "[@traits.Category -> @test]",
-                }
-            )
+            new Dictionary<string, string?>
+            {
+                ["annotations-title"] = "<@traits.Category -> @test>",
+                ["annotations-message"] = "[@traits.Category -> @test]",
+            },
+            commandWriter,
+            TextWriter.Null
         );
 
         // Act
@@ -260,14 +239,13 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_the_error_m
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                new TestReportingOptions
-                {
-                    AnnotationTitleFormat = "<@test: @error>",
-                    AnnotationMessageFormat = "[@test: @error]",
-                }
-            )
+            new Dictionary<string, string?>
+            {
+                ["annotations-title"] = "<@test: @error>",
+                ["annotations-message"] = "[@test: @error]",
+            },
+            commandWriter,
+            TextWriter.Null
         );
 
         // Act
@@ -299,14 +277,13 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_the_error_s
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                new TestReportingOptions
-                {
-                    AnnotationTitleFormat = "<@test: @trace>",
-                    AnnotationMessageFormat = "[@test: @trace]",
-                }
-            )
+            new Dictionary<string, string?>
+            {
+                ["annotations-title"] = "<@test: @trace>",
+                ["annotations-message"] = "[@test: @trace]",
+            },
+            commandWriter,
+            TextWriter.Null
         );
 
         // Act
@@ -338,14 +315,13 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_the_target_
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                new TestReportingOptions
-                {
-                    AnnotationTitleFormat = "<@test (@framework)>",
-                    AnnotationMessageFormat = "[@test (@framework)]",
-                }
-            )
+            new Dictionary<string, string?>
+            {
+                ["annotations-title"] = "<@test (@framework)>",
+                ["annotations-message"] = "[@test (@framework)]",
+            },
+            commandWriter,
+            TextWriter.Null
         );
 
         // Act
@@ -379,10 +355,9 @@ public void I_can_use_the_logger_to_produce_annotations_that_include_line_breaks
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(commandWriter, TextWriter.Null),
-                new TestReportingOptions { AnnotationMessageFormat = "foo\\nbar" }
-            )
+            new Dictionary<string, string?> { ["annotations-message"] = "foo\\nbar" },
+            commandWriter,
+            TextWriter.Null
         );
 
         // Act

GitHubActionsTestLogger.Tests/VsTestInitializationSpecs.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using FluentAssertions;
-using GitHubActionsTestLogger.Reporting;
 using GitHubActionsTestLogger.Tests.VsTest;
 using Xunit;
 
@@ -16,12 +14,11 @@ public void I_can_use_the_logger_with_the_default_configuration()
         var logger = new VsTestLogger();
         var events = new FakeTestLoggerEvents();
 
-        // Act
+        // Act & assert
         logger.Initialize(events, Directory.GetCurrentDirectory());
 
-        // Assert
-        logger.Context.Should().NotBeNull();
-        logger.Context?.Options.Should().BeEquivalentTo(TestReportingOptions.Default);
+        // Can't perform a more meaningful assertion here without
+        // accessing internal members of the logger.
     }
 
     [Fact]
@@ -31,39 +28,10 @@ public void I_can_use_the_logger_with_an_empty_configuration()
         var logger = new VsTestLogger();
         var events = new FakeTestLoggerEvents();
 
-        // Act
+        // Act & assert
         logger.Initialize(events, new Dictionary<string, string?>());
 
-        // Assert
-        logger.Context.Should().NotBeNull();
-        logger.Context?.Options.Should().BeEquivalentTo(TestReportingOptions.Default);
-    }
-
-    [Fact]
-    public void I_can_use_the_logger_with_a_custom_configuration()
-    {
-        // Arrange
-        var logger = new VsTestLogger();
-
-        var events = new FakeTestLoggerEvents();
-        var parameters = new Dictionary<string, string?>
-        {
-            ["annotations-title"] = "TitleFormat",
-            ["annotations-message"] = "MessageFormat",
-            ["summary-allow-empty"] = "true",
-            ["summary-include-passed"] = "true",
-            ["summary-include-skipped"] = "true",
-        };
-
-        // Act
-        logger.Initialize(events, parameters);
-
-        // Assert
-        logger.Context.Should().NotBeNull();
-        logger.Context?.Options.AnnotationTitleFormat.Should().Be("TitleFormat");
-        logger.Context?.Options.AnnotationMessageFormat.Should().Be("MessageFormat");
-        logger.Context?.Options.SummaryAllowEmpty.Should().BeTrue();
-        logger.Context?.Options.SummaryIncludePassedTests.Should().BeTrue();
-        logger.Context?.Options.SummaryIncludeSkippedTests.Should().BeTrue();
+        // Can't perform a more meaningful assertion here without
+        // accessing internal members of the logger.
     }
 }

GitHubActionsTestLogger.Tests/VsTestSummarySpecs.cs

@@ -1,7 +1,6 @@
+using System.Collections.Generic;
 using System.IO;
 using FluentAssertions;
-using GitHubActionsTestLogger.GitHub;
-using GitHubActionsTestLogger.Reporting;
 using GitHubActionsTestLogger.Tests.VsTest;
 using Xunit;
 using Xunit.Abstractions;
@@ -22,10 +21,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_the_test_sui
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(TextWriter.Null, summaryWriter),
-                new TestReportingOptions { SummaryAllowEmpty = true }
-            )
+            new Dictionary<string, string?> { ["summary-allow-empty"] = "true" },
+            TextWriter.Null,
+            summaryWriter
         );
 
         // Act
@@ -48,13 +46,7 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_
         var events = new FakeTestLoggerEvents();
         var logger = new VsTestLogger();
 
-        logger.Initialize(
-            events,
-            new TestReportingContext(
-                new GitHubWorkflow(TextWriter.Null, summaryWriter),
-                TestReportingOptions.Default
-            )
-        );
+        logger.Initialize(events, [], TextWriter.Null, summaryWriter);
 
         // Act
         events.SimulateTestRun(
@@ -112,10 +104,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(TextWriter.Null, summaryWriter),
-                new TestReportingOptions { SummaryIncludePassedTests = true }
-            )
+            new Dictionary<string, string?> { ["summary-include-passed"] = "true" },
+            TextWriter.Null,
+            summaryWriter
         );
 
         // Act
@@ -165,10 +156,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_does_not_include_the_
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(TextWriter.Null, summaryWriter),
-                new TestReportingOptions { SummaryIncludePassedTests = false }
-            )
+            new Dictionary<string, string?> { ["summary-include-passed"] = "false" },
+            TextWriter.Null,
+            summaryWriter
         );
 
         // Act
@@ -218,10 +208,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_the_list_of_
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(TextWriter.Null, summaryWriter),
-                new TestReportingOptions { SummaryIncludeSkippedTests = true }
-            )
+            new Dictionary<string, string?> { ["summary-include-skipped"] = "true" },
+            TextWriter.Null,
+            summaryWriter
         );
 
         // Act
@@ -271,10 +260,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_does_not_include_the_
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(TextWriter.Null, summaryWriter),
-                new TestReportingOptions { SummaryIncludeSkippedTests = false }
-            )
+            new Dictionary<string, string?> { ["summary-include-skipped"] = "false" },
+            TextWriter.Null,
+            summaryWriter
         );
 
         // Act
@@ -324,10 +312,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_includes_empty_test_r
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(TextWriter.Null, summaryWriter),
-                new TestReportingOptions { SummaryAllowEmpty = true }
-            )
+            new Dictionary<string, string?> { ["summary-allow-empty"] = "true" },
+            TextWriter.Null,
+            summaryWriter
         );
 
         // Act
@@ -351,10 +338,9 @@ public void I_can_use_the_logger_to_produce_a_summary_that_does_not_include_empt
 
         logger.Initialize(
             events,
-            new TestReportingContext(
-                new GitHubWorkflow(TextWriter.Null, summaryWriter),
-                new TestReportingOptions { SummaryAllowEmpty = false }
-            )
+            new Dictionary<string, string?> { ["summary-allow-empty"] = "false" },
+            TextWriter.Null,
+            summaryWriter
         );
 
         // Act

GitHubActionsTestLogger/GitHub/GitHubWorkflow.cs

@@ -81,19 +81,13 @@ public void CreateSummary(string content)
 
 internal partial class GitHubWorkflow
 {
-    public static GitHubWorkflow Default { get; } =
-        new(
-            // Commands are written to the standard output
-            Console.Out,
-            // Summary is written to the file specified by an environment variable.
-            // We may need to write to the summary file from multiple test suites in parallel,
-            // so we should use a stream that delays acquiring the file lock until the very last moment,
-            // and employs retry logic to handle potential race conditions.
-            GitHubEnvironment
-                .SummaryFilePath?.Pipe(f => new ContentionTolerantWriteFileStream(
-                    f,
-                    FileMode.Append
-                ))
-                .Pipe(s => new StreamWriter(s)) ?? TextWriter.Null
-        );
+    public static TextWriter DefaultCommandWriter => Console.Out;
+
+    public static TextWriter DefaultSummaryWriter => // Summary is written to the file specified by an environment variable.
+        // We may need to write to the summary file from multiple test suites in parallel,
+        // so we should use a stream that delays acquiring the file lock until the very last moment,
+        // and employs retry logic to handle potential race conditions.
+        GitHubEnvironment
+            .SummaryFilePath?.Pipe(f => new ContentionTolerantWriteFileStream(f, FileMode.Append))
+            .Pipe(s => new StreamWriter(s)) ?? TextWriter.Null;
 }