Merge pull request #3 from chuckries/dev/chuckr/improvements

Dev/chuckr/improvements

Author: chuckries

.github/workflows/test.yml

@@ -0,0 +1,41 @@
+name: Tests
+
+on:
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: 'Reason for manual trigger'
+        required: false
+        default: 'Manual test run'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9.0.x'
+        
+    - name: Restore dependencies
+      run: dotnet restore
+      
+    - name: Build solution
+      run: dotnet build --no-restore --configuration Release
+      
+    - name: Run tests
+      run: dotnet test --no-build --configuration Release --verbosity normal --logger trx --results-directory "TestResults"
+      
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: success() || failure()    # run this step even if tests failed
+      with:
+        name: .NET Tests
+        path: TestResults/*.trx
+        reporter: dotnet-trx

Directory.Build.props

@@ -5,4 +5,10 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
+
+    <PropertyGroup>
+        <RepoRootPath>$(MSBuildThisFileDirectory)</RepoRootPath>
+        <BaseIntermediateOutputPath>$(RepoRootPath)obj\$([MSBuild]::MakeRelative($(RepoRootPath), $(MSBuildProjectDirectory)))\</BaseIntermediateOutputPath>
+        <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoRootPath)bin\$(MSBuildProjectName)\</BaseOutputPath>
+    </PropertyGroup>
 </Project>

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "9.0.0",
+    "rollForward": "latestFeature"
+  }
+}

test/AdventOfCode.2020/Day04.cs

@@ -73,10 +73,10 @@ public void Part2()
     }
 
     private static Regex s_Regex = new Regex(
-        @"(?'value'(?'key'byr|iyr|eyr|hgt|hcl|ecl|pid|cid):[#\w]+( |\r\n)?){7,8}",
+        @"(?'value'(?'key'byr|iyr|eyr|hgt|hcl|ecl|pid|cid):[#\w]+( |\r?\n)?){7,8}",
         RegexOptions.Compiled);
 
     private static Regex s_Regex2 = new Regex(
-        @"((?'x'(byr|iyr|eyr):\d{4}|hgt:\d{2,3}(cm|in)|hcl:#[a-f0-9]{6}|ecl:(amb|blu|brn|gry|grn|hzl|oth)|pid:\d{9}|cid:\w+)( |\r\n)?){7,8}",
+        @"((?'x'(byr|iyr|eyr):\d{4}|hgt:\d{2,3}(cm|in)|hcl:#[a-f0-9]{6}|ecl:(amb|blu|brn|gry|grn|hzl|oth)|pid:\d{9}|cid:\w+)( |\r?\n)?){7,8}",
         RegexOptions.Compiled);
 }

test/AdventOfCode.2022/Day01.cs

@@ -0,0 +1,39 @@
+namespace AdventOfCode._2022;
+
+public class Day01
+{
+
+    List<List<int>> input;
+
+    public Day01()
+    {
+        this.input = new();
+        List<int> current = new();
+        foreach (string line in File.ReadAllLines("Inputs/day01.txt"))
+        {
+            if (line == string.Empty)
+            {
+                this.input.Add(current);
+                current = new();
+            }
+            else
+            {
+                current.Add(int.Parse(line));
+            }
+        }
+    }
+
+    [Fact]
+    public void Part1()
+    {
+        int answer = this.input.Select(g => g.Sum()).Max();
+        Assert.Equal(66616, answer);
+    }
+
+    [Fact]
+    public void Part2()
+    {
+        int answer = this.input.Select(g => g.Sum()).OrderByDescending(i => i).Take(3).Sum();
+        Assert.Equal(199172, answer);
+    }
+}

test/AdventOfCode.2022/Day02.cs

@@ -0,0 +1,57 @@
+using System.Net;
+
+namespace AdventOfCode._2022;
+
+public class Day02
+{
+    List<(char, char)> input;
+
+    public Day02()
+    {
+        input = File.ReadAllLines("Inputs/Day02.txt")
+            .Select(line => line.Split(' '))
+            .Select(parts => (parts[0][0], parts[1][0]))
+            .ToList();
+    }
+
+    [Fact]
+    public void Part1()
+    {
+        static int Result(char a, char b) => (a, b) switch
+        {
+            ('A', 'X') => 4, // Rock vs Rock
+            ('A', 'Y') => 8, // Rock vs Paper
+            ('A', 'Z') => 3, // Rock vs Scissors
+            ('B', 'X') => 1, // Paper vs Rock
+            ('B', 'Y') => 5, // Paper vs Paper
+            ('B', 'Z') => 9, // Paper vs Scissors
+            ('C', 'X') => 7, // Scissors vs Rock
+            ('C', 'Y') => 2, // Scissors vs Paper
+            ('C', 'Z') => 6, // Scissors vs Scissors
+            _ => throw new ArgumentException("Invalid input")
+        };
+
+        int answer = input.Sum(pair => Result(pair.Item1, pair.Item2));
+        Assert.Equal(14297, answer);
+    }
+
+    [Fact]
+    public void Part2()
+    {
+        static int Result(char a, char b) => (a, b) switch
+        {
+            ('A', 'X') => 3, // Rock vs Scissors
+            ('A', 'Y') => 4, // Rock vs Rock
+            ('A', 'Z') => 8, // Rock vs Paper
+            ('B', 'X') => 1, // Paper vs Rock
+            ('B', 'Y') => 5, // Paper vs Paper
+            ('B', 'Z') => 9, // Paper vs Scissors
+            ('C', 'X') => 2, // Scissors vs Paper
+            ('C', 'Y') => 6, // Scissors vs Scissors
+            ('C', 'Z') => 7, // Scissors vs Rock
+            _ => throw new ArgumentException("Invalid input")
+        };
+        int answer = input.Sum(pair => Result(pair.Item1, pair.Item2));
+        Assert.Equal(10498, answer);
+    }
+}