From f630f4bad6153f5e4e1afddd47432e400900d331 Mon Sep 17 00:00:00 2001 From: Sarabjot Singh Date: Fri, 26 Apr 2019 20:41:41 +0530 Subject: [PATCH] Fixing the code to preserve newline for adapter logs to stdout --- .../TrxLogger.cs | 2 +- .../TrxLoggerTests.cs | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs index fe26288e64..b3c1ebc13b 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs @@ -424,7 +424,7 @@ private void InitializeInternal() /// private void AddRunLevelInformationalMessage(string message) { - this.runLevelStdOut.Append(message); + this.runLevelStdOut.AppendLine(message); } // Handle the skipped test result diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs index 51e16e0e5b..0eb5f6f1a4 100644 --- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs +++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs @@ -109,11 +109,16 @@ public void TestMessageHandlerShouldThrowExceptionIfEventArgsIsNull() [TestMethod] public void TestMessageHandlerShouldAddMessageWhenItIsInformation() { - string message = "The information to test"; + string message = "First message"; + string message2 = "Second message"; TestRunMessageEventArgs trme = new TestRunMessageEventArgs(TestMessageLevel.Informational, message); this.testableTrxLogger.TestMessageHandler(new object(), trme); - Assert.IsTrue(this.testableTrxLogger.GetRunLevelInformationalMessage().Contains(message)); + TestRunMessageEventArgs trme2 = new TestRunMessageEventArgs(TestMessageLevel.Informational, message2); + this.testableTrxLogger.TestMessageHandler(new object(), trme2); + + string expectedMessage = message + Environment.NewLine + message2 + Environment.NewLine; + Assert.AreEqual(expectedMessage, this.testableTrxLogger.GetRunLevelInformationalMessage()); } [TestMethod] @@ -234,7 +239,7 @@ public void TestResultHandlerLockingAMessageForSkipTest() string expectedMessage = String.Format(CultureInfo.CurrentCulture, TrxLoggerResources.MessageForSkippedTests, "Skip1"); - Assert.AreEqual(String.Compare(this.testableTrxLogger.GetRunLevelInformationalMessage(), expectedMessage, true), 0); + Assert.AreEqual(expectedMessage + Environment.NewLine, this.testableTrxLogger.GetRunLevelInformationalMessage()); } [TestMethod]