Fix tests

JetBrains · Dec 26, 2019 · 68c1440 · 68c1440
1 parent ba52f4b
commit 68c1440
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 24 deletions.
diff --git a/TeamCity.MSBuild.Logger.Tests/DotnetIntegrationTests.cs b/TeamCity.MSBuild.Logger.Tests/DotnetIntegrationTests.cs
@@ -1,6 +1,6 @@
-namespace TeamCity.MSBuild.Logger.Tests
+// ReSharper disable StringLiteralTypo
+namespace TeamCity.MSBuild.Logger.Tests
 {
-    using System;
     using System.Collections;
     using System.Collections.Generic;
     using System.IO;
@@ -9,11 +9,15 @@
     using IoC;
     using Shouldly;
     using Xunit;
+    using Xunit.Abstractions;
 
-#if NETCOREAPP1_0
     [Collection("Integration")]
     public class DotnetIntegrationTests
     {
+        private readonly ITestOutputHelper _testOutputHelper;
+
+        public DotnetIntegrationTests(ITestOutputHelper testOutputHelper) => _testOutputHelper = testOutputHelper;
+
         [Theory]
         [ClassData(typeof(TestDataGenerator))]
         public void ShouldProduceSameMessagesAsConsoleLoggerViaDotnet(
@@ -25,8 +29,8 @@ public void ShouldProduceSameMessagesAsConsoleLoggerViaDotnet(
             string dotnetVersion)
         {
             // Given
-            Console.WriteLine();
-            Console.WriteLine($@"Run: framework={framework}, sdk={dotnetVersion}, processCount={processCount}, verbosity={verbosity}");
+            WriteLine();
+            WriteLine($@"Run: framework={framework}, sdk={dotnetVersion}, processCount={processCount}, verbosity={verbosity}");
 
             var environmentVariables = new Dictionary<string, string>();
             var loggerString = framework.CreateLoggerString(parameters);
@@ -84,14 +88,14 @@ public void ShouldProduceSameMessagesAsConsoleLoggerViaDotnet(
                 $"/m:{processCount}");
 
             // When
-            Console.WriteLine();
-            Console.WriteLine(@"Without TeamCity logger");
+            WriteLine();
+            WriteLine(@"Without TeamCity logger");
 
             restoreCommandLine.TryExecute(out var restoreResult).ShouldBe(true);
             buildCommandLine.TryExecute(out var buildResult).ShouldBe(true);
 
-            Console.WriteLine();
-            Console.WriteLine(@"With TeamCity logger");
+            WriteLine();
+            WriteLine(@"With TeamCity logger");
 
             restoreWithLoggerCommandLine.TryExecute(out var restoreWithLoggerResult).ShouldBe(true);
             buildWithLoggerCommandLine.TryExecute(out var buildWithLoggerResult).ShouldBe(true);
@@ -110,6 +114,8 @@ public void ShouldProduceSameMessagesAsConsoleLoggerViaDotnet(
             }
         }
 
+        private void WriteLine(string message = "") => _testOutputHelper.WriteLine(message);
+
         private class TestDataGenerator : IEnumerable<object[]>
         {
             private static readonly object[][] Cases =
@@ -153,10 +159,9 @@ private static object[] CreateCase(object[] caseData, string dotNetVersion)
             {
                 var data = new object[caseData.Length + 1];
                 caseData.CopyTo(data, 0);
-                data[data.Length - 1] = dotNetVersion;
+                data[^1] = dotNetVersion;
                 return data;
             }
         }
     }
-#endif
 }
diff --git a/TeamCity.MSBuild.Logger.Tests/MSBuildIntegrationTests.cs b/TeamCity.MSBuild.Logger.Tests/MSBuildIntegrationTests.cs
@@ -1,18 +1,22 @@
-namespace TeamCity.MSBuild.Logger.Tests
+// ReSharper disable StringLiteralTypo
+namespace TeamCity.MSBuild.Logger.Tests
 {
-    using System;
     using System.Collections.Generic;
     using System.IO;
     using Helpers;
     using IoC;
     using Shouldly;
     using Xunit;
+    using Xunit.Abstractions;
 
-#if NETCOREAPP1_0
     [Collection("Integration")]
     // ReSharper disable once InconsistentNaming
     public class MSBuildIntegrationTests
     {
+        private readonly ITestOutputHelper _testOutputHelper;
+
+        public MSBuildIntegrationTests(ITestOutputHelper testOutputHelper) => _testOutputHelper = testOutputHelper;
+
         [Theory]
         [InlineData("net452", 10, "minimal", null, false)]
         [InlineData("net452", 1, "m", null, false)]
@@ -39,8 +43,8 @@ public void ShouldProduceSameMessagesAsConsoleLoggerWhenMSBuild(
             bool producesTeamCityServiceMessages)
         {
             // Given
-            Console.WriteLine();
-            Console.WriteLine($@"Run: framework={framework}, processCount={processCount}, verbosity={verbosity}");
+            WriteLine();
+            WriteLine($@"Run: framework={framework}, processCount={processCount}, verbosity={verbosity}");
 
             var environmentVariables = new Dictionary<string, string>();
             var loggerString = framework.CreateLoggerString(parameters);
@@ -80,14 +84,14 @@ public void ShouldProduceSameMessagesAsConsoleLoggerWhenMSBuild(
                 $"/m:{processCount}");
 
             // When
-            Console.WriteLine();
-            Console.WriteLine(@"Without TeamCity logger");
+            WriteLine();
+            WriteLine(@"Without TeamCity logger");
 
             restoreWithLoggerCommandLine.TryExecute(out var restoreWithLoggerResult).ShouldBe(true);
             buildCommandLine.TryExecute(out var buildResult).ShouldBe(true);
 
-            Console.WriteLine();
-            Console.WriteLine(@"With TeamCity logger");
+            WriteLine();
+            WriteLine(@"With TeamCity logger");
 
             restoreCommandLine.TryExecute(out var restoreResult).ShouldBe(true);
             buildWithLoggerCommandLine.TryExecute(out var buildWithLoggerResult).ShouldBe(true);
@@ -96,6 +100,7 @@ public void ShouldProduceSameMessagesAsConsoleLoggerWhenMSBuild(
             restoreWithLoggerResult.ResultShouldBe(restoreResult, producesTeamCityServiceMessages);
             buildWithLoggerResult.ResultShouldBe(buildResult);
         }
+
+        private void WriteLine(string message = "") => _testOutputHelper.WriteLine(message);
     }
-#endif
 }
diff --git a/TeamCity.MSBuild.Logger.Tests/TeamCityHierarchicalMessageWriterTests.cs b/TeamCity.MSBuild.Logger.Tests/TeamCityHierarchicalMessageWriterTests.cs
@@ -78,7 +78,7 @@ public void ShouldNotCreateNestedServiceMessage(string serviceMessage)
         }
 
         [Fact]
-        public void ShouldSendMessageAsIsWhenCanntoParseAnyServiceMessages()
+        public void ShouldSendMessageAsIsWhenCannotParseAnyServiceMessages()
         {
             // Given
             var writer = CreateInstance();
@@ -314,7 +314,7 @@ public void ShouldCreateBlocksInDefaultFlow()
         }
 
         [Fact]
-        public void ShouldSendBufferdMessageWhenBlockClosedWhenMainFlow()
+        public void ShouldSendBufferedMessageWhenBlockClosedWhenMainFlow()
         {
             // Given
             var writer = CreateInstance();
@@ -331,7 +331,7 @@ public void ShouldSendBufferdMessageWhenBlockClosedWhenMainFlow()
         }
 
         [Fact]
-        public void ShouldSendBufferdMessageWhenBlockClosedWhenSomeFlow()
+        public void ShouldSendBufferedMessageWhenBlockClosedWhenSomeFlow()
         {
             // Given
             var writer = CreateInstance();