trackler 2.0.8.14 → 2.0.8.15

data/tracks/csharp/exercises/grade-school/Example.cs

@@ -1,28 +1,26 @@
 using System.Collections.Generic;
+using System.Linq;
 
 public class School
 {
-    public IDictionary<int, IList<string>> Roster { get; private set; }
-
-    public School()
-    {
-        Roster = new Dictionary<int, IList<string>>();
-    }
-
+    private readonly Dictionary<int, IList<string>> roster = new Dictionary<int, IList<string>>();
+    
     public void Add(string student, int grade)
     {
-        if (Roster.ContainsKey(grade))
-            Roster[grade].Add(student);
+        if (roster.ContainsKey(grade))
+            roster[grade].Add(student);
         else
-            Roster.Add(grade, new SortedList<string> { student });
+            roster.Add(grade, new SortedList<string> { student });
     }
 
-    public IList<string> Grade(int grade)
+    public IEnumerable<string> Roster(int grade) => roster[grade];
+
+    public IEnumerable<string> Grade(int grade)
     {
         IList<string> students;
-        if (Roster.TryGetValue(grade, out students))
-            return students;
-        return new List<string>(0);
+        if (roster.TryGetValue(grade, out students))
+            return students.AsEnumerable();
+        return Enumerable.Empty<string>();
     }
 }
 

data/tracks/csharp/exercises/grade-school/GradeSchool.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+public class School
+{
+    public void Add(string student, int grade)
+    {
+        throw new NotImplementedException("You need to implement this function.");
+    }
+
+    public IEnumerable<string> Roster(int grade)
+    {
+        throw new NotImplementedException("You need to implement this function.");
+    }
+
+    public IEnumerable<string> Grade(int grade)
+    {
+        throw new NotImplementedException("You need to implement this function.");
+    }
+}

data/tracks/csharp/exercises/grade-school/GradeSchool.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Example.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+
+</Project>

data/tracks/csharp/exercises/grade-school/GradeSchoolTest.cs

@@ -1,81 +1,61 @@
-using System.Collections.Generic;
-using NUnit.Framework;
+using Xunit;
 
-[TestFixture]
 public class GradeSchoolTest
 {
-    private School school;
-
-    [SetUp]
-    public void Setup()
-    {
-        school = new School();
-    }
-
-    [Test]
-    public void New_school_has_an_empty_roster()
-    {
-        Assert.That(school.Roster, Has.Count.EqualTo(0));
-    }
-
-    [Ignore("Remove to run test")]
-    [Test]
+    private readonly School school = new School();
+    
+    [Fact]
     public void Adding_a_student_adds_them_to_the_roster_for_the_given_grade()
     {
         school.Add("Aimee", 2);
-        var expected = new List<string> { "Aimee" };
-        Assert.That(school.Roster[2], Is.EqualTo(expected));
+        var expected = new [] { "Aimee" };
+        Assert.Equal(expected, school.Roster(2));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Adding_more_students_to_the_same_grade_adds_them_to_the_roster()
     {
         school.Add("Blair", 2);
         school.Add("James", 2);
         school.Add("Paul", 2);
-        var expected = new List<string> { "Blair", "James", "Paul" };
-        Assert.That(school.Roster[2], Is.EqualTo(expected));
+        var expected = new [] { "Blair", "James", "Paul" };
+        Assert.Equal(expected, school.Roster(2));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Adding_students_to_different_grades_adds_them_to_the_roster()
     {
         school.Add("Chelsea", 3);
         school.Add("Logan", 7);
-        Assert.That(school.Roster[3], Is.EqualTo(new List<string> { "Chelsea" }));
-        Assert.That(school.Roster[7], Is.EqualTo(new List<string> { "Logan" }));
+        Assert.Equal(new [] { "Chelsea" }, school.Roster(3));
+        Assert.Equal(new [] { "Logan" }, school.Roster(7));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Grade_returns_the_students_in_that_grade_in_alphabetical_order()
     {
         school.Add("Franklin", 5);
         school.Add("Bradley", 5);
         school.Add("Jeff", 1);
-        var expected = new List<string> { "Bradley", "Franklin" };
-        Assert.That(school.Grade(5), Is.EqualTo(expected));
+        var expected = new [] { "Bradley", "Franklin" };
+        Assert.Equal(expected, school.Grade(5));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Grade_returns_an_empty_list_if_there_are_no_students_in_that_grade()
     {
-        Assert.That(school.Grade(1), Is.EqualTo(new List<string>()));
+        Assert.Empty(school.Grade(1));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Student_names_in_each_grade_in_roster_are_sorted()
     {
         school.Add("Jennifer", 4);
         school.Add("Kareem", 6);
         school.Add("Christopher", 4);
         school.Add("Kyle", 3);
-        Assert.That(school.Roster[3], Is.EqualTo(new List<string> { "Kyle" }));
-        Assert.That(school.Roster[4], Is.EqualTo(new List<string> { "Christopher", "Jennifer" }));
-        Assert.That(school.Roster[6], Is.EqualTo(new List<string> { "Kareem" }));
+        Assert.Equal(new [] { "Kyle" }, school.Roster(3));
+        Assert.Equal(new [] { "Christopher", "Jennifer" }, school.Roster(4));
+        Assert.Equal(new [] { "Kareem" }, school.Roster(6));
     }
 }

data/tracks/csharp/exercises/grains/Example.cs

@@ -1,4 +1,4 @@
-public class Grains
+public static class Grains
 {
     public static ulong Square(int n)
     {

data/tracks/csharp/exercises/grains/Grains.cs

@@ -0,0 +1,14 @@
+using System;
+
+public static class Grains
+{
+    public static ulong Square(int n)
+    {
+        throw new NotImplementedException("You need to implement this function.");
+    }
+
+    public static ulong Total()
+    {
+        throw new NotImplementedException("You need to implement this function.");
+    }
+}

data/tracks/csharp/exercises/grains/Grains.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Example.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+
+</Project>

data/tracks/csharp/exercises/grains/GrainsTest.cs

@@ -1,60 +1,52 @@
-using NUnit.Framework;
+using Xunit;
 
-[TestFixture]
 public class GrainsTest
 {
-    [Test]
+    [Fact]
     public void Test_square_1()
     {
-        Assert.That(Grains.Square(1), Is.EqualTo(1));
+        Assert.Equal(1ul, Grains.Square(1));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Test_square_2()
     {
-        Assert.That(Grains.Square(2), Is.EqualTo(2));
+        Assert.Equal(2ul, Grains.Square(2));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Test_square_3()
     {
-        Assert.That(Grains.Square(3), Is.EqualTo(4));
+        Assert.Equal(4ul, Grains.Square(3));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Test_square_4()
     {
-        Assert.That(Grains.Square(4), Is.EqualTo(8));
+        Assert.Equal(8ul, Grains.Square(4));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Test_square_16()
     {
-        Assert.That(Grains.Square(16), Is.EqualTo(32768));
+        Assert.Equal(32768ul, Grains.Square(16));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Test_square_32()
     {
-        Assert.That(Grains.Square(32), Is.EqualTo(2147483648));
+        Assert.Equal(2147483648ul, Grains.Square(32));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Test_square_64()
     {
-        Assert.That(Grains.Square(64), Is.EqualTo(9223372036854775808));
+        Assert.Equal(9223372036854775808ul, Grains.Square(64));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Test_total_grains()
     {
-        Assert.That(Grains.Total(), Is.EqualTo(18446744073709551615));
+        Assert.Equal(18446744073709551615ul, Grains.Total());
     }
 }

data/tracks/csharp/exercises/grep/Grep.cs

@@ -0,0 +1,9 @@
+using System;
+
+public static class Grep
+{
+    public static string Find(string pattern, string flags, string[] files)
+    {
+        throw new NotImplementedException("You need to implement this function.");
+    }
+}

data/tracks/csharp/exercises/grep/Grep.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Example.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+
+</Project>

data/tracks/csharp/exercises/grep/GrepTest.cs

@@ -1,7 +1,8 @@
-using System.IO;
-using NUnit.Framework;
+using System;
+using System.IO;
+using Xunit;
 
-public class GrepTest
+public class GrepTest : IDisposable
 {
     private const string IliadFileName = "iliad.txt";
     private const string IliadContents =
@@ -38,18 +39,16 @@ Sing Heav'nly Muse, that on the secret top
 Of Oreb, or of Sinai, didst inspire
 That Shepherd, who first taught the chosen Seed
 ";
-
-    [OneTimeSetUp]
-    public void SetUp()
+    
+    public GrepTest()
     {
         Directory.SetCurrentDirectory(Path.GetTempPath());
         File.WriteAllText(IliadFileName, IliadContents);
         File.WriteAllText(MidsummerNightFileName, MidsummerNightContents);
         File.WriteAllText(ParadiseLostFileName, ParadiseLostContents);
     }
-
-    [OneTimeTearDown]
-    public void TearDown()
+    
+    public void Dispose()
     {
         Directory.SetCurrentDirectory(Path.GetTempPath());
         File.Delete(IliadFileName);
@@ -57,7 +56,7 @@ That Shepherd, who first taught the chosen Seed
         File.Delete(ParadiseLostFileName);
     }
 
-    [Test]
+    [Fact]
     public void One_file_one_match_no_flags()
     {
         const string pattern = "Agamemnon";
@@ -67,11 +66,10 @@ That Shepherd, who first taught the chosen Seed
         const string expected =
             "Of Atreus, Agamemnon, King of men.\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_one_match_print_line_numbers_flag()
     {
         const string pattern = "Forbidden";
@@ -81,11 +79,10 @@ That Shepherd, who first taught the chosen Seed
         const string expected =
             "2:Of that Forbidden Tree, whose mortal tast\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_one_match_case_insensitive_flag()
     {
         const string pattern = "Forbidden";
@@ -95,11 +92,10 @@ That Shepherd, who first taught the chosen Seed
         const string expected =
             "Of that Forbidden Tree, whose mortal tast\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_one_match_print_file_names_flag()
     {
         const string pattern = "Forbidden";
@@ -109,11 +105,10 @@ That Shepherd, who first taught the chosen Seed
         var expected =
             $"{ParadiseLostFileName}\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_one_match_match_entire_lines_flag()
     {
         const string pattern = "With loss of Eden, till one greater Man";
@@ -123,11 +118,10 @@ That Shepherd, who first taught the chosen Seed
         const string expected =
             "With loss of Eden, till one greater Man\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_one_match_multiple_flags()
     {
         const string pattern = "OF ATREUS, Agamemnon, KIng of MEN.";
@@ -136,11 +130,10 @@ That Shepherd, who first taught the chosen Seed
         const string expected =
             "9:Of Atreus, Agamemnon, King of men.\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_several_matches_no_flags()
     {
         const string pattern = "may";
@@ -152,11 +145,10 @@ That Shepherd, who first taught the chosen Seed
             "But I beseech your grace that I may know\n" +
             "The worst that may befall me in this case,\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_several_matches_print_line_numbers_flag()
     {
         const string pattern = "may";
@@ -168,11 +160,10 @@ That Shepherd, who first taught the chosen Seed
             "5:But I beseech your grace that I may know\n" +
             "6:The worst that may befall me in this case,\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_several_matches_match_entire_lines_flag()
     {
         const string pattern = "may";
@@ -181,11 +172,10 @@ That Shepherd, who first taught the chosen Seed
 
         const string expected = "";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_several_matches_case_insensitive_flag()
     {
         const string pattern = "ACHILLES";
@@ -196,11 +186,10 @@ That Shepherd, who first taught the chosen Seed
             "Achilles sing, O Goddess! Peleus' son;\n" +
             "The noble Chief Achilles from the son\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void One_file_several_matches_inverted_flag()
     {
         const string pattern = "Of";
@@ -214,26 +203,26 @@ That Shepherd, who first taught the chosen Seed
             "Sing Heav'nly Muse, that on the secret top\n" +
             "That Shepherd, who first taught the chosen Seed\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [TestCase("", Ignore = "Remove to run test case")]
-    [TestCase("-n", Ignore = "Remove to run test case")]
-    [TestCase("-l", Ignore = "Remove to run test case")]
-    [TestCase("-x", Ignore = "Remove to run test case")]
-    [TestCase("-i", Ignore = "Remove to run test case")]
-    [TestCase("-n -l -x -i", Ignore = "Remove to run test case")]
+    [Theory(Skip = "Remove to run test")]
+    [InlineData("")]
+    [InlineData("-n")]
+    [InlineData("-l")]
+    [InlineData("-x")]
+    [InlineData("-i")]
+    [InlineData("-n -l -x -i")]
     public void One_file_no_matches_various_flags(string flags)
     {
         const string pattern = "Gandalf";
         var files = new[] { IliadFileName };
         const string expected = "";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Multiple_files_one_match_no_flags()
     {
         const string pattern = "Agamemnon";
@@ -243,11 +232,10 @@ That Shepherd, who first taught the chosen Seed
         var expected =
             $"{IliadFileName}:Of Atreus, Agamemnon, King of men.\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Multiple_files_several_matches_no_flags()
     {
         const string pattern = "may";
@@ -259,11 +247,10 @@ That Shepherd, who first taught the chosen Seed
             $"{MidsummerNightFileName}:But I beseech your grace that I may know\n" +
             $"{MidsummerNightFileName}:The worst that may befall me in this case,\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Multiple_files_several_matches_print_line_numbers_flag()
     {
         const string pattern = "that";
@@ -276,11 +263,10 @@ That Shepherd, who first taught the chosen Seed
             $"{ParadiseLostFileName}:2:Of that Forbidden Tree, whose mortal tast\n" +
             $"{ParadiseLostFileName}:6:Sing Heav'nly Muse, that on the secret top\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Multiple_files_several_matches_print_file_names_flag()
     {
         const string pattern = "who";
@@ -291,11 +277,10 @@ That Shepherd, who first taught the chosen Seed
             $"{IliadFileName}\n" +
             $"{ParadiseLostFileName}\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Multiple_files_several_matches_case_insensitive_flag()
     {
         const string pattern = "TO";
@@ -314,11 +299,10 @@ That Shepherd, who first taught the chosen Seed
             $"{ParadiseLostFileName}:Restore us, and regain the blissful Seat,\n" +
             $"{ParadiseLostFileName}:Sing Heav'nly Muse, that on the secret top\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Multiple_files_several_matches_inverted_flag()
     {
         const string pattern = "a";
@@ -330,11 +314,10 @@ That Shepherd, who first taught the chosen Seed
             $"{IliadFileName}:The noble Chief Achilles from the son\n" +
             $"{MidsummerNightFileName}:If I refuse to wed Demetrius.\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Multiple_files_one_match_match_entire_lines_flag()
     {
         const string pattern = "But I beseech your grace that I may know";
@@ -344,11 +327,10 @@ That Shepherd, who first taught the chosen Seed
         var expected =
             $"{MidsummerNightFileName}:But I beseech your grace that I may know\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [Ignore("Remove to run test")]
-    [Test]
+    [Fact(Skip = "Remove to run test")]
     public void Multiple_files_one_match_multiple_flags()
     {
         const string pattern = "WITH LOSS OF EDEN, TILL ONE GREATER MAN";
@@ -357,15 +339,16 @@ That Shepherd, who first taught the chosen Seed
         var expected =
             $"{ParadiseLostFileName}:4:With loss of Eden, till one greater Man\n";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 
-    [TestCase("", Ignore = "Remove to run test case")]
-    [TestCase("-n", Ignore = "Remove to run test case")]
-    [TestCase("-l", Ignore = "Remove to run test case")]
-    [TestCase("-x", Ignore = "Remove to run test case")]
-    [TestCase("-i", Ignore = "Remove to run test case")]
-    [TestCase("-n -l -x -i", Ignore = "Remove to run test case")]
+    [Theory(Skip = "Remove to run test")]
+    [InlineData("")]
+    [InlineData("-n")]
+    [InlineData("-l")]
+    [InlineData("-x")]
+    [InlineData("-i")]
+    [InlineData("-n -l -x -i")]
     public void Multiple_files_no_matches_various_flags(string flags)
     {
         const string pattern = "Frodo";
@@ -373,6 +356,6 @@ That Shepherd, who first taught the chosen Seed
 
         const string expected = "";
 
-        Assert.That(Grep.Find(pattern, flags, files), Is.EqualTo(expected));
+        Assert.Equal(expected, Grep.Find(pattern, flags, files));
     }
 }