diff --git a/AdventOfCodeTests/AdventOfCodeTests.csproj b/AdventOfCodeTests/AdventOfCodeTests.csproj index c91df16..29fe348 100644 --- a/AdventOfCodeTests/AdventOfCodeTests.csproj +++ b/AdventOfCodeTests/AdventOfCodeTests.csproj @@ -11,16 +11,15 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/AdventOfCodeTests/Events/2018/Day01Tests.cs b/AdventOfCodeTests/Events/2018/Day01Tests.cs deleted file mode 100644 index 0a9b794..0000000 --- a/AdventOfCodeTests/Events/2018/Day01Tests.cs +++ /dev/null @@ -1,32 +0,0 @@ -using AdventOfCode.Events._2018.Days; - -namespace AdventOfCodeTests.Events._2018; - -[TestFixture] -public class Day01Tests -{ - [TestCase("+1, +1, +1", "3")] - [TestCase("+1, +1, -2", "0")] - [TestCase("-1, -2, -3", "-6")] - public void Part1Test(string inputString, string expectedOutput) - { - var input = inputString.Split(", "); - - var output = Day01.Part1Impl(input); - - Assert.That(output, Is.EqualTo(expectedOutput)); - } - - [TestCase("+1, -1", "0")] - [TestCase("+3, +3, +4, -2, -4", "10")] - [TestCase("-6, +3, +8, +5, -6", "5")] - [TestCase("+7, +7, -2, -7, -4", "14")] - public void Part2Test(string inputString, string expectedOutput) - { - var input = inputString.Split(", "); - - var output = Day01.Part2Impl(input); - - Assert.That(output, Is.EqualTo(expectedOutput)); - } -} \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2018/Days/Day01Tests.cs b/AdventOfCodeTests/Events/2018/Days/Day01Tests.cs new file mode 100644 index 0000000..790d9a5 --- /dev/null +++ b/AdventOfCodeTests/Events/2018/Days/Day01Tests.cs @@ -0,0 +1,33 @@ +using AdventOfCode.Events._2018.Days; + +namespace AdventOfCodeTests.Events._2018.Days; + +public class Day01Tests +{ + [Theory] + [InlineData("+1, +1, +1", "3")] + [InlineData("+1, +1, -2", "0")] + [InlineData("-1, -2, -3", "-6")] + public void Part1Test(string inputString, string expectedOutput) + { + var input = inputString.Split(", "); + + var output = Day01.Part1Impl(input); + + Assert.Equal(expectedOutput, output); + } + + [Theory] + [InlineData("+1, -1", "0")] + [InlineData("+3, +3, +4, -2, -4", "10")] + [InlineData("-6, +3, +8, +5, -6", "5")] + [InlineData("+7, +7, -2, -7, -4", "14")] + public void Part2Test(string inputString, string expectedOutput) + { + var input = inputString.Split(", "); + + var output = Day01.Part2Impl(input); + + Assert.Equal(expectedOutput, output); + } +} \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2019/Days/Day01Tests.cs b/AdventOfCodeTests/Events/2019/Days/Day01Tests.cs index bde4388..5630ed1 100644 --- a/AdventOfCodeTests/Events/2019/Days/Day01Tests.cs +++ b/AdventOfCodeTests/Events/2019/Days/Day01Tests.cs @@ -2,28 +2,29 @@ namespace AdventOfCodeTests.Events._2019.Days; -[TestFixture] public class Day01Tests { - [TestCase(12, 2)] - [TestCase(14, 2)] - [TestCase(1969, 654)] - [TestCase(100756, 33583)] + [Theory] + [InlineData(12, 2)] + [InlineData(14, 2)] + [InlineData(1969, 654)] + [InlineData(100756, 33583)] public void Module_FuelCalculation_Part1(int mass, int expectedFuel) { var sut = new Day01.Module(mass); - - Assert.That(sut.FuelRequirement(false), Is.EqualTo(expectedFuel)); + + Assert.Equal(expectedFuel, sut.FuelRequirement(false)); } - - [TestCase(12, 2)] - [TestCase(14, 2)] - [TestCase(1969, 966)] - [TestCase(100756, 50346)] + + [Theory] + [InlineData(12, 2)] + [InlineData(14, 2)] + [InlineData(1969, 966)] + [InlineData(100756, 50346)] public void Module_FuelCalculation_Part2(int mass, int expectedFuel) { var sut = new Day01.Module(mass); - - Assert.That(sut.FuelRequirement(true), Is.EqualTo(expectedFuel)); + + Assert.Equal(expectedFuel, sut.FuelRequirement(true)); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2019/Days/Day02Tests.cs b/AdventOfCodeTests/Events/2019/Days/Day02Tests.cs index 7a1b7c2..744520a 100644 --- a/AdventOfCodeTests/Events/2019/Days/Day02Tests.cs +++ b/AdventOfCodeTests/Events/2019/Days/Day02Tests.cs @@ -2,21 +2,21 @@ namespace AdventOfCodeTests.Events._2019.Days; -[TestFixture] public class Day02Tests { - [TestCase("1,0,0,0,99","2,0,0,0,99")] - [TestCase("2,3,0,3,99","2,3,0,6,99")] - [TestCase("2,4,4,5,99,0","2,4,4,5,99,9801")] - [TestCase("1,1,1,4,99,5,6,0,99","30,1,1,4,2,5,6,0,99")] + [Theory] + [InlineData("1,0,0,0,99","2,0,0,0,99")] + [InlineData("2,3,0,3,99","2,3,0,6,99")] + [InlineData("2,4,4,5,99,0","2,4,4,5,99,9801")] + [InlineData("1,1,1,4,99,5,6,0,99","30,1,1,4,2,5,6,0,99")] public void Computer_Run_Part1(string input, string expectedOutput) { var sut = new Day02.Computer(); - + sut.Program(input); - + sut.Run(); - - Assert.That(sut.ToString(), Is.EqualTo(expectedOutput)); + + Assert.Equal(expectedOutput, sut.ToString()); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2019/Days/Day04Tests.cs b/AdventOfCodeTests/Events/2019/Days/Day04Tests.cs index 9f7b736..19c8289 100644 --- a/AdventOfCodeTests/Events/2019/Days/Day04Tests.cs +++ b/AdventOfCodeTests/Events/2019/Days/Day04Tests.cs @@ -2,22 +2,23 @@ namespace AdventOfCodeTests.Events._2019.Days; -[TestFixture] public class Day04Tests { - [TestCase(111111,true)] - [TestCase(223450,false)] - [TestCase(123789,false)] + [Theory] + [InlineData(111111,true)] + [InlineData(223450,false)] + [InlineData(123789,false)] public void MeetsCriteriaPart1(int value, bool expectedResult) { - Assert.That(Day04.MeetsCriteria(value, 1), Is.EqualTo(expectedResult)); + Assert.Equal(expectedResult, Day04.MeetsCriteria(value, 1)); } - - [TestCase(112233,true)] - [TestCase(123444,false)] - [TestCase(111122,true)] + + [Theory] + [InlineData(112233,true)] + [InlineData(123444,false)] + [InlineData(111122,true)] public void MeetsCriteriaPart2(int value, bool expectedResult) { - Assert.That(Day04.MeetsCriteria(value, 2), Is.EqualTo(expectedResult)); + Assert.Equal(expectedResult, Day04.MeetsCriteria(value, 2)); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2020/Days/Day01Tests.cs b/AdventOfCodeTests/Events/2020/Days/Day01Tests.cs index cd0fb5a..9b59fc4 100644 --- a/AdventOfCodeTests/Events/2020/Days/Day01Tests.cs +++ b/AdventOfCodeTests/Events/2020/Days/Day01Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2020.Days; -[TestFixture] public class Day01Tests { private readonly Day01 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2020/TestData/1.txt"), Is.EqualTo("514579")); + Assert.Equal("514579", _systemUnderTest.Part1("Events/2020/TestData/1.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2020/TestData/1.txt"), Is.EqualTo("241861950")); + Assert.Equal("241861950", _systemUnderTest.Part2("Events/2020/TestData/1.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2021/Days/Day01Tests.cs b/AdventOfCodeTests/Events/2021/Days/Day01Tests.cs index cd1b2a3..082eb48 100644 --- a/AdventOfCodeTests/Events/2021/Days/Day01Tests.cs +++ b/AdventOfCodeTests/Events/2021/Days/Day01Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2021.Days; -[TestFixture] public class Day01Tests { private readonly Day01 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2021/TestData/1.txt"), Is.EqualTo("7")); + Assert.Equal("7", _systemUnderTest.Part1("Events/2021/TestData/1.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2021/TestData/1.txt"), Is.EqualTo("5")); + Assert.Equal("5", _systemUnderTest.Part2("Events/2021/TestData/1.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2022/Days/Day01Tests.cs b/AdventOfCodeTests/Events/2022/Days/Day01Tests.cs index e41af51..9bb7e33 100644 --- a/AdventOfCodeTests/Events/2022/Days/Day01Tests.cs +++ b/AdventOfCodeTests/Events/2022/Days/Day01Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2022.Days; -[TestFixture] public class Day01Tests { private readonly Day01 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2022/TestData/1.txt"), Is.EqualTo("24000")); + Assert.Equal("24000", _systemUnderTest.Part1("Events/2022/TestData/1.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2022/TestData/1.txt"), Is.EqualTo("45000")); + Assert.Equal("45000", _systemUnderTest.Part2("Events/2022/TestData/1.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2022/Days/Day02Tests.cs b/AdventOfCodeTests/Events/2022/Days/Day02Tests.cs index 5a3ca95..919b6a9 100644 --- a/AdventOfCodeTests/Events/2022/Days/Day02Tests.cs +++ b/AdventOfCodeTests/Events/2022/Days/Day02Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2022.Days; -[TestFixture] public class Day02Tests { private readonly Day02 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2022/TestData/2.txt"), Is.EqualTo("15")); + Assert.Equal("15", _systemUnderTest.Part1("Events/2022/TestData/2.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2022/TestData/2.txt"), Is.EqualTo("12")); + Assert.Equal("12", _systemUnderTest.Part2("Events/2022/TestData/2.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2022/Days/Day03Tests.cs b/AdventOfCodeTests/Events/2022/Days/Day03Tests.cs index ad67a2c..5b48cd6 100644 --- a/AdventOfCodeTests/Events/2022/Days/Day03Tests.cs +++ b/AdventOfCodeTests/Events/2022/Days/Day03Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2022.Days; -[TestFixture] public class Day03Tests { private readonly Day03 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2022/TestData/3.txt"), Is.EqualTo("157")); + Assert.Equal("157", _systemUnderTest.Part1("Events/2022/TestData/3.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2022/TestData/3.txt"), Is.EqualTo("70")); + Assert.Equal("70", _systemUnderTest.Part2("Events/2022/TestData/3.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2022/Days/Day04Tests.cs b/AdventOfCodeTests/Events/2022/Days/Day04Tests.cs index a22c6ae..72cbc67 100644 --- a/AdventOfCodeTests/Events/2022/Days/Day04Tests.cs +++ b/AdventOfCodeTests/Events/2022/Days/Day04Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2022.Days; -[TestFixture] public class Day04Tests { private readonly Day04 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2022/TestData/4.txt"), Is.EqualTo("2")); + Assert.Equal("2", _systemUnderTest.Part1("Events/2022/TestData/4.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2022/TestData/4.txt"), Is.EqualTo("4")); + Assert.Equal("4", _systemUnderTest.Part2("Events/2022/TestData/4.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2022/Days/Day05Tests.cs b/AdventOfCodeTests/Events/2022/Days/Day05Tests.cs index 1d2636b..4e753c2 100644 --- a/AdventOfCodeTests/Events/2022/Days/Day05Tests.cs +++ b/AdventOfCodeTests/Events/2022/Days/Day05Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2022.Days; -[TestFixture] public class Day05Tests { private readonly Day05 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2022/TestData/5.txt"), Is.EqualTo("CMZ")); + Assert.Equal("CMZ", _systemUnderTest.Part1("Events/2022/TestData/5.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2022/TestData/5.txt"), Is.EqualTo("MCD")); + Assert.Equal("MCD", _systemUnderTest.Part2("Events/2022/TestData/5.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day01Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day01Tests.cs index 254cc26..bd387f7 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day01Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day01Tests.cs @@ -2,40 +2,41 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day01Tests { private readonly Day01 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/1a.txt"), Is.EqualTo("142")); + Assert.Equal("142", _systemUnderTest.Part1("Events/2023/TestData/1a.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/1b.txt"), Is.EqualTo("281")); + Assert.Equal("281", _systemUnderTest.Part2("Events/2023/TestData/1b.txt")); } - [TestCase("treb7uchet", 77, Description = "one digit")] - [TestCase("1abc2e", 12, Description = "two digits")] - [TestCase("a1b2c3d4e5f", 15, Description = "more than two digits")] + [Theory] + [InlineData("treb7uchet", 77)] // one digit + [InlineData("1abc2e", 12)] // two digits + [InlineData("a1b2c3d4e5f", 15)] // more than two digits public void GetPart1CalibrationValue(string input, int expectedCalibrationValue) { - Assert.That(Day01.GetPart1CalibrationValue(input), Is.EqualTo(expectedCalibrationValue)); + Assert.Equal(expectedCalibrationValue, Day01.GetPart1CalibrationValue(input)); } - - [TestCase("two", 22, Description = "one match - words")] - [TestCase("twothree", 23, Description = "two matches - words")] - [TestCase("twofournine", 29, Description = "more than two matches - words")] - [TestCase("2", 22, Description = "one match - digits")] - [TestCase("23", 23, Description = "two matches - digits")] - [TestCase("249", 29, Description = "more than two matches - digits")] - [TestCase("eighthree", 83, Description = "Sneaky overlapping words")] + + [Theory] + [InlineData("two", 22)] // one match - words + [InlineData("twothree", 23)] // two matches - words + [InlineData("twofournine", 29)] // more than two matches - words + [InlineData("2", 22)] // one match - digits + [InlineData("23", 23)] // two matches - digits + [InlineData("249", 29)] // more than two matches - digits + [InlineData("eighthree", 83)] // Sneaky overlapping words public void GetPart2CalibrationValue(string input, int expectedCalibrationValue) { - Assert.That(Day01.GetPart2CalibrationValue(input), Is.EqualTo(expectedCalibrationValue)); + Assert.Equal(expectedCalibrationValue, Day01.GetPart2CalibrationValue(input)); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day02Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day02Tests.cs index ecac2a9..28b4d58 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day02Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day02Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day02Tests { private readonly Day02 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/2.txt"), Is.EqualTo("8")); + Assert.Equal("8", _systemUnderTest.Part1("Events/2023/TestData/2.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/2.txt"), Is.EqualTo("2286")); + Assert.Equal("2286", _systemUnderTest.Part2("Events/2023/TestData/2.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day03Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day03Tests.cs index f4095cd..a54cb11 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day03Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day03Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day03Tests { private readonly Day03 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/3.txt"), Is.EqualTo("4361")); + Assert.Equal("4361", _systemUnderTest.Part1("Events/2023/TestData/3.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/3.txt"), Is.EqualTo("467835")); + Assert.Equal("467835", _systemUnderTest.Part2("Events/2023/TestData/3.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day04Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day04Tests.cs index e77bf6d..924b85f 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day04Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day04Tests.cs @@ -2,35 +2,31 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day04Tests { private readonly Day04 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/4.txt"), Is.EqualTo("13")); + Assert.Equal("13", _systemUnderTest.Part1("Events/2023/TestData/4.txt")); } - [Test] + [Fact] public void ParseCardTest() { const string inputLine = "Card 3: 1 21 53 59 44 | 69 82 63 72 16 21 14 1"; var card = Day04.ParseCard(inputLine); - Assert.Multiple(() => - { - Assert.That(card.Id, Is.EqualTo(3)); - Assert.That(card.WinningNumbers, Is.EquivalentTo(new[] { 1, 21, 53, 59, 44 })); - Assert.That(card.OurNumbers, Is.EquivalentTo(new[] { 69, 82, 63, 72, 16, 21, 14, 1 })); - Assert.That(card.CopiesHeld, Is.EqualTo(1)); - }); + Assert.Equal(3, card.Id); + Assert.Equal(new[] { 1, 21, 53, 59, 44 }, card.WinningNumbers); + Assert.Equal(new[] { 69, 82, 63, 72, 16, 21, 14, 1 }, card.OurNumbers); + Assert.Equal(1, card.CopiesHeld); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/4.txt"), Is.EqualTo("30")); + Assert.Equal("30", _systemUnderTest.Part2("Events/2023/TestData/4.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day05Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day05Tests.cs index 2b41a41..34e4af9 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day05Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day05Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day05Tests { private readonly Day05 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/5.txt"), Is.EqualTo("35")); + Assert.Equal("35", _systemUnderTest.Part1("Events/2023/TestData/5.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/5.txt"), Is.EqualTo("46")); + Assert.Equal("46", _systemUnderTest.Part2("Events/2023/TestData/5.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day06Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day06Tests.cs index 681edb8..f2a77a7 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day06Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day06Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day06Tests { private readonly Day06 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/6.txt"), Is.EqualTo("288")); + Assert.Equal("288", _systemUnderTest.Part1("Events/2023/TestData/6.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/6.txt"), Is.EqualTo("71503")); + Assert.Equal("71503", _systemUnderTest.Part2("Events/2023/TestData/6.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day07Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day07Tests.cs index dd1e62c..98c67a3 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day07Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day07Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day07Tests { private readonly Day07 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/7.txt"), Is.EqualTo("6440")); + Assert.Equal("6440", _systemUnderTest.Part1("Events/2023/TestData/7.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/7.txt"), Is.EqualTo("5905")); + Assert.Equal("5905", _systemUnderTest.Part2("Events/2023/TestData/7.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day08Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day08Tests.cs index ef52337..1baa809 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day08Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day08Tests.cs @@ -2,21 +2,21 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day08Tests { private readonly Day08 _systemUnderTest = new(); - [TestCase("Events/2023/TestData/8a.txt", "2")] - [TestCase("Events/2023/TestData/8b.txt", "6")] + [Theory] + [InlineData("Events/2023/TestData/8a.txt", "2")] + [InlineData("Events/2023/TestData/8b.txt", "6")] public void Part1Test(string inputFilePath, string expectedSteps) { - Assert.That(_systemUnderTest.Part1(inputFilePath), Is.EqualTo(expectedSteps)); + Assert.Equal(expectedSteps, _systemUnderTest.Part1(inputFilePath)); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/8c.txt"), Is.EqualTo("6")); + Assert.Equal("6", _systemUnderTest.Part2("Events/2023/TestData/8c.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day09Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day09Tests.cs index 74e0b75..846f090 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day09Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day09Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day09Tests { private readonly Day09 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/9.txt"), Is.EqualTo("114")); + Assert.Equal("114", _systemUnderTest.Part1("Events/2023/TestData/9.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/9.txt"), Is.EqualTo("2")); + Assert.Equal("2", _systemUnderTest.Part2("Events/2023/TestData/9.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day10Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day10Tests.cs index 119ee77..c8dbb5b 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day10Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day10Tests.cs @@ -2,21 +2,21 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day10Tests { private readonly Day10 _systemUnderTest = new(); - [TestCase("Events/2023/TestData/10a.txt", "4")] - [TestCase("Events/2023/TestData/10b.txt", "8")] + [Theory] + [InlineData("Events/2023/TestData/10a.txt", "4")] + [InlineData("Events/2023/TestData/10b.txt", "8")] public void Part1Test(string inputFilePath, string expectedSteps) { - Assert.That(_systemUnderTest.Part1(inputFilePath), Is.EqualTo(expectedSteps)); + Assert.Equal(expectedSteps, _systemUnderTest.Part1(inputFilePath)); } - // [Test] + // [Fact] // public void Part2Test() // { - // Assert.That(_systemUnderTest.Part2("TestData/8c.txt"), Is.EqualTo("6")); + // Assert.Equal("6", _systemUnderTest.Part2("TestData/8c.txt")); // } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day11Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day11Tests.cs index 4cad0bd..434d0b5 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day11Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day11Tests.cs @@ -2,16 +2,16 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day11Tests { - [TestCase(2, "374")] - [TestCase(10, "1030")] - [TestCase(100, "8410")] + [Theory] + [InlineData(2, "374")] + [InlineData(10, "1030")] + [InlineData(100, "8410")] public void DoPuzzleTest(int expansionFactor, string expectedResult) { var inputData = File.ReadLines("Events/2023/TestData/11.txt"); - - Assert.That(Day11.DoPuzzle(inputData, expansionFactor), Is.EqualTo(expectedResult)); + + Assert.Equal(expectedResult, Day11.DoPuzzle(inputData, expansionFactor)); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day13Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day13Tests.cs index ad8d3df..bb4d17f 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day13Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day13Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day13Tests { private readonly Day13 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/13.txt"), Is.EqualTo("405")); + Assert.Equal("405", _systemUnderTest.Part1("Events/2023/TestData/13.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/13.txt"), Is.EqualTo("400")); + Assert.Equal("400", _systemUnderTest.Part2("Events/2023/TestData/13.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day14Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day14Tests.cs index 84ac7d2..653e27a 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day14Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day14Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day14Tests { private readonly Day14 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/14.txt"), Is.EqualTo("136")); + Assert.Equal("136", _systemUnderTest.Part1("Events/2023/TestData/14.txt")); } - [Test] + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/14.txt"), Is.EqualTo("64")); + Assert.Equal("64", _systemUnderTest.Part2("Events/2023/TestData/14.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day15Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day15Tests.cs index 1c849cb..f4b8848 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day15Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day15Tests.cs @@ -2,28 +2,28 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day15Tests { private readonly Day15 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/15.txt"), Is.EqualTo("1320")); + Assert.Equal("1320", _systemUnderTest.Part1("Events/2023/TestData/15.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/15.txt"), Is.EqualTo("145")); + Assert.Equal("145", _systemUnderTest.Part2("Events/2023/TestData/15.txt")); } - [TestCase("rn=1", 30)] - [TestCase("cm-", 253)] - [TestCase("qp=3", 97)] + [Theory] + [InlineData("rn=1", 30)] + [InlineData("cm-", 253)] + [InlineData("qp=3", 97)] public void RunHashingAlgorithm(string step, int expectedResult) { - Assert.That(Day15.RunHashingAlgorithm(step), Is.EqualTo(expectedResult)); + Assert.Equal(expectedResult, Day15.RunHashingAlgorithm(step)); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day16Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day16Tests.cs index 2d912fb..9534549 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day16Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day16Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day16Tests { private readonly Day16 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/16.txt"), Is.EqualTo("46")); + Assert.Equal("46", _systemUnderTest.Part1("Events/2023/TestData/16.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2023/TestData/16.txt"), Is.EqualTo("51")); + Assert.Equal("51", _systemUnderTest.Part2("Events/2023/TestData/16.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day19Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day19Tests.cs index 92e4a8d..4a7cc9b 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day19Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day19Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day19Tests { private readonly Day19 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2023/TestData/19.txt"), Is.EqualTo("19114")); + Assert.Equal("19114", _systemUnderTest.Part1("Events/2023/TestData/19.txt")); } - - // [Test] + + // [Fact] // public void Part2Test() // { - // Assert.That(_systemUnderTest.Part2("TestData/19.txt"), Is.EqualTo("167409079868000")); + // Assert.Equal("167409079868000", _systemUnderTest.Part2("TestData/19.txt")); // } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2023/Days/Day24Tests.cs b/AdventOfCodeTests/Events/2023/Days/Day24Tests.cs index 6106bce..3e2761e 100644 --- a/AdventOfCodeTests/Events/2023/Days/Day24Tests.cs +++ b/AdventOfCodeTests/Events/2023/Days/Day24Tests.cs @@ -2,14 +2,13 @@ namespace AdventOfCodeTests.Events._2023.Days; -[TestFixture] public class Day24Tests { private readonly Day24 _systemUnderTest = new(); - // [Test] + // [Fact] // public void Part1Test() // { - // Assert.That(_systemUnderTest.Part1("TestData/24.txt"), Is.EqualTo("2")); + // Assert.Equal("2", _systemUnderTest.Part1("TestData/24.txt")); // } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day01Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day01Tests.cs index 813f866..d5fb6f6 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day01Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day01Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day01Tests { private readonly Day01 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/1.txt"), Is.EqualTo("11")); + Assert.Equal("11", _systemUnderTest.Part1("Events/2024/TestData/1.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/1.txt"), Is.EqualTo("31")); + Assert.Equal("31", _systemUnderTest.Part2("Events/2024/TestData/1.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day02Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day02Tests.cs index 04c5517..0749c6d 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day02Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day02Tests.cs @@ -2,109 +2,108 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day02Tests { private readonly Day02 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/2.txt"), Is.EqualTo("2")); + Assert.Equal("2", _systemUnderTest.Part1("Events/2024/TestData/2.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/2.txt"), Is.EqualTo("4")); + Assert.Equal("4", _systemUnderTest.Part2("Events/2024/TestData/2.txt")); } - [Test] + [Fact] public void Report_IsSafe_LevelsAreSteadilyIncreasing_Safe() { var sut = Day02.Report.Parse("1 3 6 7 9"); - - Assert.That(sut.IsSafe, Is.True); + + Assert.True(sut.IsSafe); } - - [Test] + + [Fact] public void Report_IsSafe_LevelsAreSteadilyDecreasing_Safe() { var sut = Day02.Report.Parse("7 6 4 2 1"); - - Assert.That(sut.IsSafe, Is.True); + + Assert.True(sut.IsSafe); } - [Test] + [Fact] public void Report_IsSafe_LevelsIncreaseByMoreThanThree_Unsafe() { var sut = Day02.Report.Parse("1 5 6 7 9"); - Assert.That(sut.IsSafe, Is.False); + Assert.False(sut.IsSafe); } - [Test] + [Fact] public void Report_IsSafe_LevelsDecreaseByMoreThanThree_Unsafe() { var sut = Day02.Report.Parse("9 7 6 5 1"); - - Assert.That(sut.IsSafe, Is.False); + + Assert.False(sut.IsSafe); } - [Test] + [Fact] public void Report_IsSafe_LevelsIncreaseAndDecrease_Unsafe() { var sut = Day02.Report.Parse("1 3 6 4 5"); - - Assert.That(sut.IsSafe, Is.False); + + Assert.False(sut.IsSafe); } - [Test] + [Fact] public void Report_IsSafe_LevelsRemainTheSame_Unsafe() { var sut = Day02.Report.Parse("1 3 3 4 5"); - - Assert.That(sut.IsSafe, Is.False); + + Assert.False(sut.IsSafe); } - [Test] + [Fact] public void Report_IsSafeWithDampener_WasSafe_Safe() { var sut = Day02.Report.Parse("7 6 4 2 1"); - - Assert.That(sut.IsSafeWithDampener, Is.True); + + Assert.True(sut.IsSafeWithDampener); } - - - [Test] + + + [Fact] public void Report_IsSafeWithDampener_LevelsIncreaseByMoreThanThree_Unsafe() { var sut = Day02.Report.Parse("1 2 7 8 9"); - - Assert.That(sut.IsSafeWithDampener, Is.False); + + Assert.False(sut.IsSafeWithDampener); } - - [Test] + + [Fact] public void Report_IsSafeWithDampener_LevelsDecreaseByMoreThanThree_Unsafe() { var sut = Day02.Report.Parse("9 7 6 2 1"); - - Assert.That(sut.IsSafeWithDampener, Is.False); + + Assert.False(sut.IsSafeWithDampener); } - [Test] + [Fact] public void Report_IsSafeWithDampener_OneDeltaOfZero_Safe() { var sut = Day02.Report.Parse("8 6 4 4 1"); - - Assert.That(sut.IsSafeWithDampener, Is.True); + + Assert.True(sut.IsSafeWithDampener); } - - [Test] + + [Fact] public void Report_IsSafeWithDampener_OneAnomalousDirection_Safe() { var sut = Day02.Report.Parse("1 3 4 2 5"); - - Assert.That(sut.IsSafeWithDampener, Is.True); + + Assert.True(sut.IsSafeWithDampener); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day03Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day03Tests.cs index a19a7b1..b7ea8bf 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day03Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day03Tests.cs @@ -2,22 +2,21 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day03Tests { - [Test] + [Fact] public void Section_Parse_Part1ResultAsExpected() { var section = Day03.Memory.Parse(["xmul(2,4)%&mul[3,7]!@^do_not_mul(5,5)+mul(32,64]then(mul(11,8)mul(8,5))"]); - - Assert.That(section.Part1Result, Is.EqualTo(161)); + + Assert.Equal(161, section.Part1Result); } - - [Test] + + [Fact] public void Section_Parse_Part2ResultAsExpected() { var section = Day03.Memory.Parse(["xmul(2,4)&mul[3,7]!^don't()_mul(5,5)+mul(32,64](mul(11,8)undo()?mul(8,5))"]); - - Assert.That(section.Part2Result, Is.EqualTo(48)); + + Assert.Equal(48, section.Part2Result); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day04Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day04Tests.cs index c555001..7cb31e3 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day04Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day04Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day04Tests { private readonly Day04 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/4.txt"), Is.EqualTo("18")); + Assert.Equal("18", _systemUnderTest.Part1("Events/2024/TestData/4.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/4.txt"), Is.EqualTo("9")); + Assert.Equal("9", _systemUnderTest.Part2("Events/2024/TestData/4.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day05Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day05Tests.cs index e47d05a..fe6e09d 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day05Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day05Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day05Tests { private readonly Day05 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/5.txt"), Is.EqualTo("143")); - } - - [Test] + Assert.Equal("143", _systemUnderTest.Part1("Events/2024/TestData/5.txt")); + } + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/5.txt"), Is.EqualTo("123")); - } + Assert.Equal("123", _systemUnderTest.Part2("Events/2024/TestData/5.txt")); + } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day06Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day06Tests.cs index ffced1a..1b93296 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day06Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day06Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day06Tests { private readonly Day06 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/6.txt"), Is.EqualTo("41")); - } - - [Test] + Assert.Equal("41", _systemUnderTest.Part1("Events/2024/TestData/6.txt")); + } + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/6.txt"), Is.EqualTo("6")); - } + Assert.Equal("6", _systemUnderTest.Part2("Events/2024/TestData/6.txt")); + } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day07Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day07Tests.cs index 51f35e4..8036754 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day07Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day07Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day07Tests { private readonly Day07 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/7.txt"), Is.EqualTo("3749")); - } - - [Test] + Assert.Equal("3749", _systemUnderTest.Part1("Events/2024/TestData/7.txt")); + } + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/7.txt"), Is.EqualTo("11387")); - } + Assert.Equal("11387", _systemUnderTest.Part2("Events/2024/TestData/7.txt")); + } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day08Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day08Tests.cs index 0c00c40..483423d 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day08Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day08Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day08Tests { private readonly Day08 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/8.txt"), Is.EqualTo("14")); - } - - [Test] + Assert.Equal("14", _systemUnderTest.Part1("Events/2024/TestData/8.txt")); + } + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/8.txt"), Is.EqualTo("34")); - } + Assert.Equal("34", _systemUnderTest.Part2("Events/2024/TestData/8.txt")); + } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day09Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day09Tests.cs index 86b8ae9..63c3663 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day09Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day09Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day09Tests { private readonly Day09 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/9.txt"), Is.EqualTo("1928")); - } - - [Test] + Assert.Equal("1928", _systemUnderTest.Part1("Events/2024/TestData/9.txt")); + } + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/9.txt"), Is.EqualTo("2858")); - } + Assert.Equal("2858", _systemUnderTest.Part2("Events/2024/TestData/9.txt")); + } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day10Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day10Tests.cs index 0672dc4..f60f1dc 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day10Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day10Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day10Tests { private readonly Day10 _systemUnderTest = new(); - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/10.txt"), Is.EqualTo("36")); - } - - [Test] + Assert.Equal("36", _systemUnderTest.Part1("Events/2024/TestData/10.txt")); + } + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/10.txt"), Is.EqualTo("81")); - } + Assert.Equal("81", _systemUnderTest.Part2("Events/2024/TestData/10.txt")); + } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day11Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day11Tests.cs index 31a4b5a..b435fa0 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day11Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day11Tests.cs @@ -2,24 +2,24 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day11Tests { private readonly Day11 _systemUnderTest = new(); - - [TestCase("125 17",1, 3)] - [TestCase("125 17",2, 4)] - [TestCase("125 17",3, 5)] - [TestCase("125 17",4, 9)] - [TestCase("125 17",5, 13)] - [TestCase("125 17",6, 22)] - [TestCase("125 17",25, 55312)] + + [Theory] + [InlineData("125 17",1, 3)] + [InlineData("125 17",2, 4)] + [InlineData("125 17",3, 5)] + [InlineData("125 17",4, 9)] + [InlineData("125 17",5, 13)] + [InlineData("125 17",6, 22)] + [InlineData("125 17",25, 55312)] public void Stones_Blink(string input, int blinkCount, int expectedStonesCount) { var stones = new Day11.Stones(input); - + stones.Blink(blinkCount); - - Assert.That(stones.Count, Is.EqualTo(expectedStonesCount)); - } + + Assert.Equal(expectedStonesCount, stones.Count); + } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day12Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day12Tests.cs index 4eb708a..4d83bf4 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day12Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day12Tests.cs @@ -2,26 +2,27 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day12Tests { private readonly Day12 _systemUnderTest = new(); - [TestCase("12a.txt", "140")] - [TestCase("12b.txt", "772")] - [TestCase("12c.txt", "1930")] + [Theory] + [InlineData("12a.txt", "140")] + [InlineData("12b.txt", "772")] + [InlineData("12c.txt", "1930")] public void Part1Test(string filename, string expected) { - Assert.That(_systemUnderTest.Part1($"Events/2024/TestData/{filename}"), Is.EqualTo(expected)); + Assert.Equal(expected, _systemUnderTest.Part1($"Events/2024/TestData/{filename}")); } - - [TestCase("12a.txt", "80")] - [TestCase("12b.txt", "436")] - [TestCase("12c.txt", "1206")] - [TestCase("12d.txt", "236")] - [TestCase("12e.txt", "368")] + + [Theory] + [InlineData("12a.txt", "80")] + [InlineData("12b.txt", "436")] + [InlineData("12c.txt", "1206")] + [InlineData("12d.txt", "236")] + [InlineData("12e.txt", "368")] public void Part2Test(string filename, string expected) { - Assert.That(_systemUnderTest.Part2($"Events/2024/TestData/{filename}"), Is.EqualTo(expected)); + Assert.Equal(expected, _systemUnderTest.Part2($"Events/2024/TestData/{filename}")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day13Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day13Tests.cs index 20bfa48..ebb9263 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day13Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day13Tests.cs @@ -2,14 +2,13 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day13Tests { private readonly Day13 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/13.txt"), Is.EqualTo("480")); + Assert.Equal("480", _systemUnderTest.Part1("Events/2024/TestData/13.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day14Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day14Tests.cs index d0f017a..93aa873 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day14Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day14Tests.cs @@ -2,18 +2,17 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day14Tests { - [Test] + [Fact] public void Part1Test() { var inputData = File.ReadLines("Events/2024/TestData/14.txt"); var map = new Day14.Map(inputData, 7, 11); - + map.Wait(100); - - Assert.That(map.SafetyFactor, Is.EqualTo(12)); + + Assert.Equal(12, map.SafetyFactor); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day15Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day15Tests.cs index cb849e2..2e99a24 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day15Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day15Tests.cs @@ -2,23 +2,24 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day15Tests { private readonly Day15 _systemUnderTest = new(); - [TestCase("15a.txt", "2028")] - [TestCase("15b.txt", "10092")] + [Theory] + [InlineData("15a.txt", "2028")] + [InlineData("15b.txt", "10092")] public void Part1Test(string filename, string expected) { - Assert.That(_systemUnderTest.Part1($"Events/2024/TestData/{filename}"), Is.EqualTo(expected)); + Assert.Equal(expected, _systemUnderTest.Part1($"Events/2024/TestData/{filename}")); } - - [TestCase("15c.txt", "618")] - [TestCase("15b.txt", "9021")] - [TestCase("15d.txt", "1430")] + + [Theory] + [InlineData("15c.txt", "618")] + [InlineData("15b.txt", "9021")] + [InlineData("15d.txt", "1430")] public void Part2Test(string filename, string expected) { - Assert.That(_systemUnderTest.Part2($"Events/2024/TestData/{filename}"), Is.EqualTo(expected)); + Assert.Equal(expected, _systemUnderTest.Part2($"Events/2024/TestData/{filename}")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day16Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day16Tests.cs index c9c0772..18d3a2e 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day16Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day16Tests.cs @@ -2,15 +2,15 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day16Tests { private readonly Day16 _systemUnderTest = new(); - [TestCase("16a.txt", "7036")] - [TestCase("16b.txt", "11048")] + [Theory] + [InlineData("16a.txt", "7036")] + [InlineData("16b.txt", "11048")] public void Part1Test(string filename, string expected) { - Assert.That(_systemUnderTest.Part1($"Events/2024/TestData/{filename}"), Is.EqualTo(expected)); + Assert.Equal(expected, _systemUnderTest.Part1($"Events/2024/TestData/{filename}")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day17Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day17Tests.cs index be5a631..0621780 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day17Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day17Tests.cs @@ -2,73 +2,72 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day17Tests { - [Test] + [Fact] public void Test1() { var computer = new Day17.Computer(0, 0, 9); - + computer.Run("2,6"); - - Assert.That(computer.Register.B, Is.EqualTo(1)); + + Assert.Equal(1, computer.Register.B); } - - [Test] + + [Fact] public void Test2() { var computer = new Day17.Computer(10, 0, 0); - + computer.Run("5,0,5,1,5,4"); - Assert.That(computer.Output, Is.EqualTo("0,1,2")); + Assert.Equal("0,1,2", computer.Output); } - - [Test] + + [Fact] public void Test3() { var computer = new Day17.Computer(2024, 0, 0); - + computer.Run("0,1,5,4,3,0"); - Assert.That(computer.Output, Is.EqualTo("4,2,5,6,7,7,7,7,3,1,0")); - Assert.That(computer.Register.A, Is.EqualTo(0)); + Assert.Equal("4,2,5,6,7,7,7,7,3,1,0", computer.Output); + Assert.Equal(0, computer.Register.A); } - - [Test] + + [Fact] public void Test4() { var computer = new Day17.Computer(0, 29, 0); - + computer.Run("1,7"); - Assert.That(computer.Register.B, Is.EqualTo(26)); + Assert.Equal(26, computer.Register.B); } - - [Test] + + [Fact] public void Test5() { var computer = new Day17.Computer(0, 2024, 43690); - + computer.Run("4,0"); - Assert.That(computer.Register.B, Is.EqualTo(44354)); + Assert.Equal(44354, computer.Register.B); } - [Test] + [Fact] public void Part1Test() { var sut = new Day17(); - - Assert.That(sut.Part1("Events/2024/TestData/17a.txt"), Is.EqualTo("4,6,3,5,6,3,5,2,1,0")); + + Assert.Equal("4,6,3,5,6,3,5,2,1,0", sut.Part1("Events/2024/TestData/17a.txt")); } - - [Test] + + [Fact] public void Part2Test() { var sut = new Day17(); - Assert.That(sut.Part2("Events/2024/TestData/17b.txt"), Is.EqualTo("117440")); + Assert.Equal("117440", sut.Part2("Events/2024/TestData/17b.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day18Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day18Tests.cs index 6aa0f98..58b2644 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day18Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day18Tests.cs @@ -3,10 +3,9 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day18Tests { - [Test] + [Fact] public void Part1() { var inputData = File.ReadAllLines("Events/2024/TestData/18.txt"); @@ -14,10 +13,10 @@ public void Part1() var shortestPath = puzzle.ShortestPathAfter(12); - Assert.That(shortestPath, Is.EqualTo(22)); + Assert.Equal(22, shortestPath); } - - [Test] + + [Fact] public void Part2() { var inputData = File.ReadAllLines("Events/2024/TestData/18.txt"); @@ -25,6 +24,6 @@ public void Part2() var firstCutOff = puzzle.FirstCutOff(); - Assert.That(firstCutOff, Is.EqualTo(new Coordinate(6,1))); + Assert.Equal(new Coordinate(6,1), firstCutOff); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day19Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day19Tests.cs index 90c48d2..b0e0bfe 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day19Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day19Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day19Tests { private readonly Day19 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/19.txt"), Is.EqualTo("6")); + Assert.Equal("6", _systemUnderTest.Part1("Events/2024/TestData/19.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/19.txt"), Is.EqualTo("16")); + Assert.Equal("16", _systemUnderTest.Part2("Events/2024/TestData/19.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day22Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day22Tests.cs index 4c79a0b..2b8d6c3 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day22Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day22Tests.cs @@ -2,46 +2,47 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day22Tests { private readonly Day22 _systemUnderTest = new(); - - [TestCase(123, 15887950)] - [TestCase(15887950, 16495136)] - [TestCase(16495136, 527345)] - [TestCase(527345, 704524)] - [TestCase(704524, 1553684)] - [TestCase(1553684, 12683156)] - [TestCase(12683156, 11100544)] - [TestCase(11100544, 12249484)] - [TestCase(12249484, 7753432)] - [TestCase(7753432, 5908254)] + + [Theory] + [InlineData(123, 15887950)] + [InlineData(15887950, 16495136)] + [InlineData(16495136, 527345)] + [InlineData(527345, 704524)] + [InlineData(704524, 1553684)] + [InlineData(1553684, 12683156)] + [InlineData(12683156, 11100544)] + [InlineData(11100544, 12249484)] + [InlineData(12249484, 7753432)] + [InlineData(7753432, 5908254)] public void SecretNumberGenerator_GenerateNext(long input, long expected) { var generator = new Day22.SecretNumberGenerator(); var next = Day22.SecretNumberGenerator.GenerateNext(input); - - Assert.That(next, Is.EqualTo(expected)); + + Assert.Equal(expected, next); } - - [TestCase(1, 8685429)] - [TestCase(10, 4700978)] - [TestCase(100, 15273692)] - [TestCase(2024, 8667524)] + + [Theory] + [InlineData(1, 8685429)] + [InlineData(10, 4700978)] + [InlineData(100, 15273692)] + [InlineData(2024, 8667524)] public void SecretNumberGenerator_GenerateNth(long input, long expected) { var generator = new Day22.SecretNumberGenerator(); var nth = Day22.SecretNumberGenerator.GenerateNth(input, 2000); - - Assert.That(nth, Is.EqualTo(expected)); + + Assert.Equal(expected, nth); } - - [Test] + + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/22.txt"), Is.EqualTo("37327623")); + Assert.Equal("37327623", _systemUnderTest.Part1("Events/2024/TestData/22.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day23Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day23Tests.cs index 93faf2d..1759716 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day23Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day23Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day23Tests { private readonly Day23 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2024/TestData/23.txt"), Is.EqualTo("7")); + Assert.Equal("7", _systemUnderTest.Part1("Events/2024/TestData/23.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2024/TestData/23.txt"), Is.EqualTo("co,de,ka,ta")); + Assert.Equal("co,de,ka,ta", _systemUnderTest.Part2("Events/2024/TestData/23.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2024/Days/Day24Tests.cs b/AdventOfCodeTests/Events/2024/Days/Day24Tests.cs index 8c55753..5b2e937 100644 --- a/AdventOfCodeTests/Events/2024/Days/Day24Tests.cs +++ b/AdventOfCodeTests/Events/2024/Days/Day24Tests.cs @@ -2,21 +2,21 @@ namespace AdventOfCodeTests.Events._2024.Days; -[TestFixture] public class Day24Tests { private readonly Day24 _systemUnderTest = new(); - [TestCase("24a.txt", "4")] - [TestCase("24b.txt", "2024")] + [Theory] + [InlineData("24a.txt", "4")] + [InlineData("24b.txt", "2024")] public void Part1Test(string filename, string expectedResult) { - Assert.That(_systemUnderTest.Part1($"Events/2024/TestData/{filename}"), Is.EqualTo(expectedResult)); + Assert.Equal(expectedResult, _systemUnderTest.Part1($"Events/2024/TestData/{filename}")); } - - // [Test] + + // [Fact] // public void Part2Test() // { - // Assert.That(_systemUnderTest.Part2("TestData/23.txt"), Is.EqualTo("co,de,ka,ta")); + // Assert.Equal("co,de,ka,ta", _systemUnderTest.Part2("TestData/23.txt")); // } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2025/Days/Day01Tests.cs b/AdventOfCodeTests/Events/2025/Days/Day01Tests.cs index c36d49c..e3aabd4 100644 --- a/AdventOfCodeTests/Events/2025/Days/Day01Tests.cs +++ b/AdventOfCodeTests/Events/2025/Days/Day01Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2025.Days; -[TestFixture] public class Day01Tests { private readonly Day01 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2025/TestData/1.txt"), Is.EqualTo("3")); + Assert.Equal("3", _systemUnderTest.Part1("Events/2025/TestData/1.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2025/TestData/1.txt"), Is.EqualTo("6")); + Assert.Equal("6", _systemUnderTest.Part2("Events/2025/TestData/1.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2025/Days/Day02Tests.cs b/AdventOfCodeTests/Events/2025/Days/Day02Tests.cs index 8242805..db5b3df 100644 --- a/AdventOfCodeTests/Events/2025/Days/Day02Tests.cs +++ b/AdventOfCodeTests/Events/2025/Days/Day02Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2025.Days; -[TestFixture] public class Day02Tests { private readonly Day02 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2025/TestData/2.txt"), Is.EqualTo("1227775554")); + Assert.Equal("1227775554", _systemUnderTest.Part1("Events/2025/TestData/2.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2025/TestData/2.txt"), Is.EqualTo("4174379265")); + Assert.Equal("4174379265", _systemUnderTest.Part2("Events/2025/TestData/2.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2025/Days/Day03Tests.cs b/AdventOfCodeTests/Events/2025/Days/Day03Tests.cs index 9baac53..35176ab 100644 --- a/AdventOfCodeTests/Events/2025/Days/Day03Tests.cs +++ b/AdventOfCodeTests/Events/2025/Days/Day03Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2025.Days; -[TestFixture] public class Day03Tests { private readonly Day03 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2025/TestData/3.txt"), Is.EqualTo("357")); + Assert.Equal("357", _systemUnderTest.Part1("Events/2025/TestData/3.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2025/TestData/3.txt"), Is.EqualTo("3121910778619")); + Assert.Equal("3121910778619", _systemUnderTest.Part2("Events/2025/TestData/3.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2025/Days/Day04Tests.cs b/AdventOfCodeTests/Events/2025/Days/Day04Tests.cs index 06037f8..6b9a537 100644 --- a/AdventOfCodeTests/Events/2025/Days/Day04Tests.cs +++ b/AdventOfCodeTests/Events/2025/Days/Day04Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2025.Days; -[TestFixture] public class Day04Tests { private readonly Day04 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2025/TestData/4.txt"), Is.EqualTo("13")); + Assert.Equal("13", _systemUnderTest.Part1("Events/2025/TestData/4.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2025/TestData/4.txt"), Is.EqualTo("43")); + Assert.Equal("43", _systemUnderTest.Part2("Events/2025/TestData/4.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2025/Days/Day05Tests.cs b/AdventOfCodeTests/Events/2025/Days/Day05Tests.cs index 2f53c10..2eb8e71 100644 --- a/AdventOfCodeTests/Events/2025/Days/Day05Tests.cs +++ b/AdventOfCodeTests/Events/2025/Days/Day05Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2025.Days; -[TestFixture] public class Day05Tests { private readonly Day05 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2025/TestData/5.txt"), Is.EqualTo("3")); + Assert.Equal("3", _systemUnderTest.Part1("Events/2025/TestData/5.txt")); } - - [Test] + + [Fact] public void Part2Test() { - Assert.That(_systemUnderTest.Part2("Events/2025/TestData/5.txt"), Is.EqualTo("14")); + Assert.Equal("14", _systemUnderTest.Part2("Events/2025/TestData/5.txt")); } } \ No newline at end of file diff --git a/AdventOfCodeTests/Events/2025/Days/Day06Tests.cs b/AdventOfCodeTests/Events/2025/Days/Day06Tests.cs index 8864fed..5058c5a 100644 --- a/AdventOfCodeTests/Events/2025/Days/Day06Tests.cs +++ b/AdventOfCodeTests/Events/2025/Days/Day06Tests.cs @@ -2,20 +2,19 @@ namespace AdventOfCodeTests.Events._2025.Days; -[TestFixture] public class Day06Tests { private readonly Day06 _systemUnderTest = new(); - [Test] + [Fact] public void Part1Test() { - Assert.That(_systemUnderTest.Part1("Events/2025/TestData/6.txt"), Is.EqualTo("4277556")); + Assert.Equal("4277556", _systemUnderTest.Part1("Events/2025/TestData/6.txt")); } - - // [Test] + + // [Fact] // public void Part2Test() // { - // Assert.That(_systemUnderTest.Part2("Events/2025/TestData/5.txt"), Is.EqualTo("14")); + // Assert.Equal("14", _systemUnderTest.Part2("Events/2025/TestData/5.txt")); // } } \ No newline at end of file diff --git a/AdventOfCodeTests/GlobalUsings.cs b/AdventOfCodeTests/GlobalUsings.cs index 4ea06d0..a611174 100644 --- a/AdventOfCodeTests/GlobalUsings.cs +++ b/AdventOfCodeTests/GlobalUsings.cs @@ -1 +1 @@ -global using NUnit.Framework; \ No newline at end of file +global using Xunit; \ No newline at end of file diff --git a/CLAUDE.md b/CLAUDE.md index 199553c..f046b00 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -3,7 +3,7 @@ ## Stack - .NET 9.0, C# latest, Autofac DI -- NUnit 4.5 (test framework), NUnit3TestAdapter, Microsoft.NET.Test.Sdk, coverlet.collector +- xUnit 2.x (test framework), xunit.runner.visualstudio, Microsoft.NET.Test.Sdk, coverlet.collector ## Build & Test @@ -36,8 +36,10 @@ dotnet run --project AdventOfCode 2024 15 # run specific day - Namespaces: `AdventOfCode.Events._{YEAR}.Days` (underscore prefix for numeric year) - Class names: `Day1`, `Day12` (no leading zeros) -- Test classes: `Day1Tests`, `Day12Tests` with `[TestFixture]` attribute +- Test classes: `Day1Tests`, `Day12Tests` (no attributes needed, xUnit auto-discovers) - Tests instantiate the day directly: `private readonly DayNN _systemUnderTest = new();` +- Test methods: `[Fact]` for simple tests, `[Theory]` with `[InlineData]` for parameterized tests +- Assertions: Use xUnit's `Assert.Equal(expected, actual)` pattern (note parameter order) - Test data files use letter suffixes for variants: `12a.txt`, `12b.txt` - Input/test data files must be added to `.csproj` with `CopyToOutputDirectory: PreserveNewest` - Both Part1 and Part2 return answers as `string`