Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make attachment description optional for nunit test logger. #87

Merged
merged 2 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/NUnit.Xml.TestLogger/NUnitXmlSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class NUnitXmlSerializer : ITestResultSerializer
private const string ResultStatusPassed = "Passed";
private const string ResultStatusFailed = "Failed";

public IInputSanitizer InputSanitizer { get; } = new InputSanitizerXml();
public IInputSanitizer InputSanitizer { get; } = new InputSanitizerXml();

public static IEnumerable<TestSuite> GroupTestSuites(IEnumerable<TestSuite> suites)
{
Expand Down Expand Up @@ -285,10 +285,15 @@ private static XElement CreateTestCaseElement(TestResultInfo result)
var attachmentElement = new XElement("attachments");
foreach (var attachment in result.Attachments)
{
attachmentElement.Add(new XElement(
"attachment",
new XElement("filePath", attachment.FilePath),
new XElement("description", new XCData(attachment.Description))));
var attachmentContent = new List<XElement> { new XElement("filePath", attachment.FilePath) };

if (!string.IsNullOrEmpty(attachment.Description))
{
// Description is optional, add if available
attachmentContent.Add(new XElement("description", new XCData(attachment.Description)));
}

attachmentElement.Add(new XElement("attachment", attachmentContent));
}

element.Add(attachmentElement);
Expand Down
19 changes: 16 additions & 3 deletions src/TestLogger/Core/TestRunBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ public ITestRunBuilder Subscribe(TestLoggerEvents loggerEvents)
{
this.testRun.RunConfiguration = this.testRun.Start(eventArgs);
};
loggerEvents.TestRunMessage += (_, eventArgs) => this.testRun.Message(eventArgs);
loggerEvents.TestResult += (_, eventArgs) => this.testRun.Result(eventArgs);
loggerEvents.TestRunComplete += (_, eventArgs) => this.testRun.Complete(eventArgs);
loggerEvents.TestRunMessage += (_, eventArgs) => this.TraceAndThrow(() => this.testRun.Message(eventArgs), "TestRunMessage");
loggerEvents.TestResult += (_, eventArgs) => this.TraceAndThrow(() => this.testRun.Result(eventArgs), "TestResult");
loggerEvents.TestRunComplete += (_, eventArgs) => this.TraceAndThrow(() => this.testRun.Complete(eventArgs), "TestRunComplete");

return this;
}
Expand All @@ -73,5 +73,18 @@ public ITestRun Build()
{
return this.testRun;
}

private void TraceAndThrow(Action action, string source)
{
try
{
action();
}
catch (Exception)
{
this.testRun.ConsoleOutput?.WriteError($"Test Logger: Unexpected error in {source} workflow. Please rerun with `dotnet test --diag:log.txt` to see the stacktrace and report the issue at https://github.com/spekt/testlogger/issues/new.");
throw;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ namespace NUnit.Xml.TestLogger.AcceptanceTests
public class NUnitTestLoggerAcceptanceTests
{
private const string AssetName = "NUnit.Xml.TestLogger.NetCore.Tests";
private const string ExpectedTestCaseCount = "54";
private const string ExpectedTestCasePassedCount = "26";
private const string ExpectedTestCaseCount = "55";
private const string ExpectedTestCasePassedCount = "27";

private readonly string resultsFile;
private readonly XDocument resultsXml;
Expand Down Expand Up @@ -99,8 +99,8 @@ public void TestResultFileShouldContainNamespaceTestSuiteForNetFull()
var node = this.resultsXml.XPathSelectElement(query);

Assert.IsNotNull(node);
Assert.AreEqual("30", node.Attribute(XName.Get("total")).Value);
Assert.AreEqual("16", node.Attribute(XName.Get("passed")).Value);
Assert.AreEqual("31", node.Attribute(XName.Get("total")).Value);
Assert.AreEqual("17", node.Attribute(XName.Get("passed")).Value);
Assert.AreEqual("7", node.Attribute(XName.Get("failed")).Value);
Assert.AreEqual("3", node.Attribute(XName.Get("inconclusive")).Value);
Assert.AreEqual("4", node.Attribute(XName.Get("skipped")).Value);
Expand Down
8 changes: 4 additions & 4 deletions test/TestLogger.UnitTests/TestDoubles/FakeConsoleOutput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ namespace Spekt.TestLogger.UnitTests.TestDoubles

public class FakeConsoleOutput : IConsoleOutput
{
private readonly List<(string, string)> messages;
public FakeConsoleOutput() => this.Messages = new List<(string, string)>();

public FakeConsoleOutput() => this.messages = new List<(string, string)>();
public List<(string, string)> Messages { get; private set; }

public void WriteMessage(string message)
{
this.messages.Add(("stdout", message));
this.Messages.Add(("stdout", message));
}

public void WriteError(string message)
{
this.messages.Add(("stderr", message));
this.Messages.Add(("stderr", message));
}
}
}
25 changes: 24 additions & 1 deletion test/TestLogger.UnitTests/TestRunBuilderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@
namespace Spekt.TestLogger.UnitTests
{
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Spekt.TestLogger.Core;
using Spekt.TestLogger.UnitTests.TestDoubles;

[TestClass]
public class TestRunBuilderTests
Expand Down Expand Up @@ -37,7 +42,7 @@ public void TestRunBuilderShouldCreateDefaultTestAdapterFactory()
[TestMethod]
public void WithLoggerConfigurationShouldSetTestLoggerConfiguration()
{
var config = new LoggerConfiguration(new ()
var config = new LoggerConfiguration(new Dictionary<string, string>()
{
{ LoggerConfiguration.LogFilePathKey, "/tmp/results.json" },
{ DefaultLoggerParameterNames.TestRunDirectory, "/tmp" }
Expand Down Expand Up @@ -66,6 +71,24 @@ public void SubscribeShouldThrowForNullLoggerEvents()
Assert.ThrowsException<ArgumentNullException>(() => this.testRunBuilder.Subscribe(null));
}

[TestMethod]
public void SubscribeShouldSetupTraceAndThrowExceptionForEvents()
{
var testEvents = new MockTestLoggerEvents();
var consoleOutput = new FakeConsoleOutput();

this.testRunBuilder.WithConsoleOutput(consoleOutput).Subscribe(testEvents);

Assert.ThrowsException<NullReferenceException>(() => testEvents.RaiseTestRunMessage(TestMessageLevel.Error, "dummy message"));
Assert.ThrowsException<NullReferenceException>(() => testEvents.RaiseTestResult(new Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult(new TestCase())));
Assert.ThrowsException<NullReferenceException>(() => testEvents.RaiseTestRunComplete(null));
Assert.AreEqual(3, consoleOutput.Messages.Count);
Assert.IsTrue(consoleOutput.Messages.All(x => x.Item1 == "stderr"));
StringAssert.Contains(consoleOutput.Messages[0].Item2, "Unexpected error in TestRunMessage workflow");
StringAssert.Contains(consoleOutput.Messages[1].Item2, "Unexpected error in TestResult workflow");
StringAssert.Contains(consoleOutput.Messages[2].Item2, "Unexpected error in TestRunComplete workflow");
}

[TestMethod]
public void WithFileSystemShouldThrowForNullFileSystem()
{
Expand Down
11 changes: 11 additions & 0 deletions test/assets/NUnit.Xml.TestLogger.NetCore.Tests/AttachmentTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,16 @@ public void TestAddAttachment()
}
TestContext.AddTestAttachment(file, "description");
}

[Test]
public void TestAddAttachmentWithoutDescription()
{
var file = Path.Combine(Path.GetTempPath(), "x.txt");
if (!File.Exists(file))
{
File.Create(file);
}
TestContext.AddTestAttachment(file);
}
}
}
Loading