Addressed cross platform new line isses and handled MSTest defect See m…

…icrosoft/vstest#311 - Converted all new lines to use Evironment.NewLine - Used reflection to locate directory of test assembly and then switched that to the current directory due to incorrect starting directory as described at See microsoft/vstest#311
IntelliTect · Aug 3, 2018 · f61ad94 · f61ad94
1 parent acff111
commit f61ad94
Show file tree

Hide file tree

Showing 10 changed files with 139 additions and 603 deletions.
diff --git a/src/Chapter15.Tests/Listing15.03.TuplesWithinQueryExpressions.Tests.cs b/src/Chapter15.Tests/Listing15.03.TuplesWithinQueryExpressions.Tests.cs
@@ -3,6 +3,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System;
+using System.Reflection;
 
 namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter15.Listing15_03.Tests
 {
@@ -12,16 +14,25 @@ public class ProgramTests
         [TestMethod]
         public void ProjectionWithLinqsSelect()
         {
+            // Required due to defect in MSTest that has the current directory
+            // set to the MSTest executable directory, rather than the 
+            // assembly directory. See https://github.com/Microsoft/vstest/issues/311
+            Directory.SetCurrentDirectory(Path.GetDirectoryName( 
+                typeof(Program).GetTypeInfo().Assembly.Location));
+
+            int expectedItemCount = Directory.EnumerateFiles(
+                Directory.GetCurrentDirectory(), "*").Count();
             string expectedPattern = $@"{ Directory.GetCurrentDirectory() }{Path.DirectorySeparatorChar}*(*)";
 
             string output = IntelliTect.TestTools.Console.ConsoleAssert.Execute(null, () =>
             {
                 Program.ChapterMain();
             });
 
-            IEnumerable<string> outputItems = output.Split('\n');
+            IEnumerable<string> outputItems = output.Split(
+                Environment.NewLine.ToArray(), StringSplitOptions.RemoveEmptyEntries);
 
-            Assert.AreEqual(14, outputItems.Count());
+            Assert.AreEqual(expectedItemCount, outputItems.Count());
             foreach (string item in outputItems)
             {
                 Assert.IsTrue(item.IsLike(expectedPattern));

diff --git a/src/Chapter15.Tests/Listing15.03A.AnonymousTypesWithinQueryExpressions.Tests.cs b/src/Chapter15.Tests/Listing15.03A.AnonymousTypesWithinQueryExpressions.Tests.cs
@@ -3,25 +3,36 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
+using System;
 
-namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter15.Listing15_03.Tests
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter15.Listing15_03A.Tests
 {
     [TestClass]
     public class ProgramTests
     {
         [TestMethod]
         public void ProjectionWithLinqsSelect()
         {
-            string expectedPattern = $@"{ Directory.GetCurrentDirectory() }{Path.DirectorySeparatorChar}*(*)";
+            // Required due to defect in MSTest that has the current directory
+            // set to the MSTest executable directory, rather than the 
+            // assembly directory. See https://github.com/Microsoft/vstest/issues/311
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(
+                typeof(Program).GetTypeInfo().Assembly.Location));
+
+            string expectedPattern = $@"{ Directory.GetCurrentDirectory() }{Path.DirectorySeparatorChar}*";
+            int expectedItemCount = Directory.EnumerateFiles(
+                Directory.GetCurrentDirectory(), "*").Count();
 
             string output = IntelliTect.TestTools.Console.ConsoleAssert.Execute(null, () =>
             {
                 Program.ChapterMain();
             });
 
-            IEnumerable<string> outputItems = output.Split('\n');
+            IEnumerable<string> outputItems = output.Split(
+                new string[]{ Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries);
 
-            Assert.AreEqual(14, outputItems.Count());
+            Assert.AreEqual(expectedItemCount, outputItems.Count());
             foreach (string item in outputItems)
             {
                 Assert.IsTrue(item.IsLike(expectedPattern));

diff --git a/src/Chapter15.Tests/Listing15.07.SortingUsingAQueryExpressionWithAnOrderbyClause.Tests.cs b/src/Chapter15.Tests/Listing15.07.SortingUsingAQueryExpressionWithAnOrderbyClause.Tests.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 
 namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter15.Listing15_07.Tests
 {
@@ -12,6 +13,14 @@ public class ProgramTests
         [TestMethod]
         public void ProjectionWithLinqsSelect()
         {
+            // Required due to defect in MSTest that has the current directory
+            // set to the MSTest executable directory, rather than the 
+            // assembly directory. See https://github.com/Microsoft/vstest/issues/311
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(
+                typeof(Program).GetTypeInfo().Assembly.Location));
+
+            int expectedItemCount = Directory.EnumerateFiles(
+                Directory.GetCurrentDirectory(), "*").Count();
             string expectedPattern = $@"{ Directory.GetCurrentDirectory() }{Path.DirectorySeparatorChar}*";
 
             string output = IntelliTect.TestTools.Console.ConsoleAssert.Execute(null, () =>
@@ -21,7 +30,7 @@ public void ProjectionWithLinqsSelect()
 
             IEnumerable<string> outputItems = output.Split('\n');
 
-            Assert.AreEqual(14, outputItems.Count());
+            Assert.AreEqual(expectedItemCount, outputItems.Count());
             foreach (string item in outputItems)
             {
                 Assert.IsTrue(item.IsLike(expectedPattern));

diff --git a/src/Chapter15.Tests/Listing15.08.ProjectingAFileInfoCollectionAndSortingByFileSize.Tests.cs b/src/Chapter15.Tests/Listing15.08.ProjectingAFileInfoCollectionAndSortingByFileSize.Tests.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System;
 
 namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter15.Listing15_08.Tests
 {
@@ -13,19 +14,29 @@ public class ProgramTests
         [TestMethod]
         public void ProjectionWithLinqsSelect()
         {
+            // Required due to defect in MSTest that has the current directory
+            // set to the MSTest executable directory, rather than the 
+            // assembly directory. See https://github.com/Microsoft/vstest/issues/311
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(
+                typeof(Program).GetTypeInfo().Assembly.Location));
+
+            int expectedItemCount = Directory.EnumerateFiles(
+                Directory.GetCurrentDirectory(), "*").Count();
             string expectedPattern = $@".{Path.DirectorySeparatorChar}*(*)";
 
             string output = IntelliTect.TestTools.Console.ConsoleAssert.Execute(null, () =>
             {
                 Program.ChapterMain();
             });
 
-            IEnumerable<string> outputItems = output.Split('\n');
+            IEnumerable<string> outputItems = output.Split(
+                new string[] { Environment.NewLine }, StringSplitOptions.None);
 
-            Assert.AreEqual(14, outputItems.Count());
+            Assert.AreEqual(expectedItemCount, outputItems.Count());
             foreach (string item in outputItems)
             {
-                Assert.IsTrue(item.IsLike(expectedPattern), item);
+                Assert.IsTrue(item.IsLike(expectedPattern),
+                    $"{item} is not like {expectedPattern}");
             }
         }
     }

diff --git a/src/Chapter15.Tests/Listing15.10.Tests.cs b/src/Chapter15.Tests/Listing15.10.Tests.cs
@@ -10,11 +10,8 @@ public class ProgramTests
         [TestMethod]
         public void InvokingDelegateWithoutCheckingForNull()
         {
-            string expected = $@"
-Keywords:
- abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null operator out override object params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unsafe ushort using virtual unchecked void volatile while
-Contextual Keywords:
- add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var where yield";
+            string expected = $@"{Environment.NewLine}Keywords:{Environment.NewLine} abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null operator out override object params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unsafe ushort using virtual unchecked void volatile while{Environment.NewLine}Contextual Keywords:{Environment.NewLine} add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var where yield";
+
 
             IntelliTect.TestTools.Console.ConsoleAssert.Expect(expected,
             () =>

diff --git a/src/Chapter15.Tests/Listing15.11.Tests.cs b/src/Chapter15.Tests/Listing15.11.Tests.cs
@@ -10,7 +10,8 @@ public class ProgramTests
         [TestMethod]
         public void SelectingAnonymousTypeFollowingGroupClause()
         {
-            string expected = $@"{Environment.NewLine}Keywords:
+            string expected = $@"
+Keywords:
  abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null operator out override object params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unsafe ushort using virtual unchecked void volatile while
 Contextual Keywords:
  add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var where yield";

diff --git a/src/Chapter15.Tests/Listing15.12.Tests.cs b/src/Chapter15.Tests/Listing15.12.Tests.cs
@@ -0,0 +1,26 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace AddisonWesley.Michaelis.EssentialCSharp.Chapter15.Listing15_12.Tests
+{
+
+    [TestClass]
+    public class ProgramTests
+    {
+        [TestMethod]
+        public void SelectingAnonymousTypeFollowingGroupClause()
+        {
+            string expected = $@"
+Keywords:
+ abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null operator out override object params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unsafe ushort using virtual unchecked void volatile while
+Contextual Keywords:
+ add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var where yield";
+
+            IntelliTect.TestTools.Console.ConsoleAssert.Expect(expected,
+            () =>
+            {
+                Program.ChapterMain();
+            });
+        }
+    }
+}