Merge pull request #10 from Zaneris/2.3.1

Zaneris · web-flow · commit fdc13a8f83bc · 2023-12-01T09:11:03.000-05:00
2.3.1
diff --git a/AdventOfCodeSupport/AdventBase.cs b/AdventOfCodeSupport/AdventBase.cs
@@ -12,7 +12,7 @@ namespace AdventOfCodeSupport;
 [MemoryDiagnoser]
 public abstract partial class AdventBase
 {
-    private AdventSolutions _adventSolutions = null!;
+    private AdventSolutions? _adventSolutions;
     private InputBlock? _input;
     private Dictionary<string, string>? _bag;
     private string? _part1;
@@ -38,7 +38,6 @@ public abstract partial class AdventBase
     /// Answer for part 1. Will run <see cref="Part1"/> to calculate the answer if not already done.
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if <see cref="Part1"/> method fails to set answer.</exception>
-
     public string Part1Answer
     {
         get
@@ -88,7 +87,7 @@ protected InputBlock Input
         get
         {
             if (_input is not null) return _input;
-            var inputPattern = _adventSolutions.InputPattern;
+            var inputPattern = _adventSolutions?.InputPattern ?? "yyyy/Inputs/dd.txt";
             inputPattern = inputPattern.Replace("yyyy", $"{Year}");
             inputPattern = inputPattern.Replace("dd", $"{Day:D2}");
             try
@@ -114,15 +113,7 @@ Please ensure input is saved to "Project Root/{inputPattern}"
     /// <summary>
     /// Registers self with AdventSolutions.
     /// </summary>
-    protected AdventBase()
-    {
-        // Do nothing, handled from AdventSolutions.
-    }
-
-    /// <summary>
-    /// Registers self with AdventSolutions.
-    /// </summary>
-    internal void LoadYearDay(AdventSolutions adventSolutions)
+    internal void LoadYearDay(AdventSolutions? adventSolutions)
     {
         _adventSolutions = adventSolutions;
         var type = GetType();
@@ -133,7 +124,7 @@ internal void LoadYearDay(AdventSolutions adventSolutions)
 
         var split = type!.FullName!.Split('.');
         ClassName = split[^1];
-        if (_adventSolutions.ClassNamePattern is null)
+        if (_adventSolutions?.ClassNamePattern is null)
         {
             var dayMatches = DayPattern().Matches(split[^1]);
             var yearMatches = YearPattern().Matches(split[^2]);
@@ -180,6 +171,7 @@ protected virtual void InternalOnLoad() { }
     [Benchmark]
     public void OnLoad()
     {
+        if (Year == 0) LoadYearDay(null);
         InternalOnLoad();
     }
 
@@ -190,6 +182,7 @@ public void OnLoad()
     [Benchmark]
     public AdventBase Part1()
     {
+        if (Year == 0) LoadYearDay(null);
         if (!_onLoad)
         {
             InternalOnLoad();
@@ -207,6 +200,7 @@ public AdventBase Part1()
     [Benchmark]
     public AdventBase Part2()
     {
+        if (Year == 0) LoadYearDay(null);
         if (!_onLoad)
         {
             InternalOnLoad();
@@ -243,7 +237,7 @@ public AdventBase Part2()
 
     private async Task DownloadAnswers()
     {
-        var client = new AdventClient(_adventSolutions, this);
+        var client = new AdventClient(_adventSolutions!, this);
         var answers = await client.DownloadAnswersAsync(this, _testHtmlLookup);
         _checkedPart1 = answers.Part1;
         _checkedPart2 = answers.Part2;
@@ -270,7 +264,7 @@ private async Task DownloadAnswers()
     /// </summary>
     public async Task DownloadInputAsync()
     {
-        var client = new AdventClient(_adventSolutions, this);
+        var client = new AdventClient(_adventSolutions!, this);
         await client.DownloadInputAsync(this);
     }
 
@@ -289,7 +283,7 @@ public async Task DownloadInputAsync()
         }
         if (_part1 is null) Part1();
         if (_part1 is null) throw new Exception("Cannot submit a null answer for Part 1");
-        var client = new AdventClient(_adventSolutions, this);
+        var client = new AdventClient(_adventSolutions!, this);
         return await client.SubmitAnswerAsync(this, 1, _part1, _testHtmlSubmit);
     }
 
@@ -308,7 +302,7 @@ public async Task DownloadInputAsync()
         }
         if (_part2 is null) Part2();
         if (_part2 is null) throw new Exception("Cannot submit a null answer for Part 2");
-        var client = new AdventClient(_adventSolutions, this);
+        var client = new AdventClient(_adventSolutions!, this);
         return await client.SubmitAnswerAsync(this, 2, _part2, _testHtmlSubmit);
     }
 
diff --git a/AdventOfCodeSupport/AdventClient.cs b/AdventOfCodeSupport/AdventClient.cs
@@ -73,7 +73,7 @@ public AdventClient(AdventSolutions adventSolutions, AdventBase adventBase)
         var handler = new HttpClientHandler { UseCookies = false };
         _adventClient = new HttpClient(handler) { BaseAddress = new Uri("https://adventofcode.com/") };
 
-        var version = new ProductInfoHeaderValue("AdventOfCodeSupport", "2.3.0");
+        var version = new ProductInfoHeaderValue("AdventOfCodeSupport", "2.3.1");
         var comment = new ProductInfoHeaderValue("(+nuget.org/packages/AdventOfCodeSupport by @Zaneris)");
         _adventClient.DefaultRequestHeaders.UserAgent.Add(version);
         _adventClient.DefaultRequestHeaders.UserAgent.Add(comment);
diff --git a/AdventOfCodeSupport/AdventOfCodeSupport.csproj b/AdventOfCodeSupport/AdventOfCodeSupport.csproj
@@ -13,8 +13,8 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageVersion>2.3.0</PackageVersion>
-        <PackageReleaseNotes>- Added Part1Answer and Part2Answer for testing (thanks Pobiega)</PackageReleaseNotes>
+        <PackageVersion>2.3.1</PackageVersion>
+        <PackageReleaseNotes>- Fixed benchmarking</PackageReleaseNotes>
         <PackageTags>aoc;adventofcode;advent;code;benchmark;benchmarkdotnet;chatgpt;gpt;</PackageTags>
     </PropertyGroup>
 
diff --git a/AdventOfCodeSupport/Testing/TestExtensions.cs b/AdventOfCodeSupport/Testing/TestExtensions.cs
@@ -11,9 +11,11 @@ public static class TestExtensions
     /// </summary>
     /// <param name="adventBase">Extending interface.</param>
     /// <param name="input">The custom input to test with.</param>
-    public static void SetTestInput(this AdventBase adventBase, string? input)
+    /// <returns><see cref="AdventBase"/> for chaining.</returns>
+    public static AdventBase SetTestInput(this AdventBase adventBase, string? input)
     {
         adventBase.SetTestInput(input);
+        return adventBase;
     }
 
     /// <summary>
@@ -32,8 +34,10 @@ public static Dictionary<string, string> GetBag(this AdventBase adventBase)
     /// <param name="adventBase">Extending interface.</param>
     /// <param name="htmlSubmitResult">The custom HTML submission result to test with.</param>
     /// <param name="htmlLookupResult">The custom HTML already submitted answer result to test with.</param>
-    public static void SetTestHtmlResults(this AdventBase adventBase, string htmlSubmitResult, string htmlLookupResult)
+    /// <returns><see cref="AdventBase"/> for chaining.</returns>
+    public static AdventBase SetTestHtmlResults(this AdventBase adventBase, string htmlSubmitResult, string htmlLookupResult)
     {
         adventBase.SetTestHtmlResults(htmlSubmitResult, htmlLookupResult);
+        return adventBase;
     }
 }
diff --git a/AltNamingTests/AltNamingTests.csproj b/AltNamingTests/AltNamingTests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.4.2"/>
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/PackageTests/PackageTests.cs b/PackageTests/PackageTests.cs
@@ -164,4 +164,6 @@ public async Task TestHtml_SubmitAnswer_FalseResult()
         var result = await day.SubmitPart1Async();
         Assert.False(result);
     }
+
+    // TODO: Add more web tests
 }
diff --git a/SampleProject/2019/Day18.cs b/SampleProject/2019/Day18.cs
@@ -6,11 +6,15 @@ public class Day18 : AdventBase
 {
     protected override object InternalPart1()
     {
+        Thread.Sleep(1);
+        var text = Input.Text;
         return 2077;
     }
 
     protected override object InternalPart2()
     {
+        Thread.Sleep(1);
+        var text = Input.Text;
         return 1922;
     }
 }
diff --git a/SampleProject/2019/Inputs/18.txt b/SampleProject/2019/Inputs/18.txt
@@ -0,0 +1 @@
+Hello
diff --git a/SampleProject/Program.cs b/SampleProject/Program.cs
@@ -3,9 +3,9 @@
 var solutions = new AdventSolutions();
 //await solutions.DownloadInputsAsync();
 var day = solutions.GetDay(2019, 18);
-day.Part1();
-await day.CheckPart1Async();
-await day.SubmitPart1Async();
+//day.Part1();
+//await day.CheckPart1Async();
+//await day.SubmitPart1Async();
+day.Benchmark(); // Benchmark parts 1 & 2.
 //solutions.GetMostRecentDay().Part1().Part2(); // Run parts 1 & 2 of day's solution.
-//solutions.GetMostRecentDay().Benchmark(); // Benchmark parts 1 & 2.
 //solutions.BenchmarkAll();
diff --git a/SampleProject/SampleProject.csproj b/SampleProject/SampleProject.csproj
@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AdventOfCodeSupport" Version="2.2.0" />
+      <ProjectReference Include="..\AdventOfCodeSupport\AdventOfCodeSupport.csproj" />
     </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,11 @@ public static class TestExtensions`
`11`	`11`	`/// </summary>`
`12`	`12`	`/// <param name="adventBase">Extending interface.</param>`
`13`	`13`	`/// <param name="input">The custom input to test with.</param>`
`14`		`- public static void SetTestInput(this AdventBase adventBase, string? input)`
	`14`	`+ /// <returns><see cref="AdventBase"/> for chaining.</returns>`
	`15`	`+ public static AdventBase SetTestInput(this AdventBase adventBase, string? input)`
`15`	`16`	`{`
`16`	`17`	`adventBase.SetTestInput(input);`
	`18`	`+ return adventBase;`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`/// <summary>`
`@@ -32,8 +34,10 @@ public static Dictionary<string, string> GetBag(this AdventBase adventBase)`
`32`	`34`	`/// <param name="adventBase">Extending interface.</param>`
`33`	`35`	`/// <param name="htmlSubmitResult">The custom HTML submission result to test with.</param>`
`34`	`36`	`/// <param name="htmlLookupResult">The custom HTML already submitted answer result to test with.</param>`
`35`		`- public static void SetTestHtmlResults(this AdventBase adventBase, string htmlSubmitResult, string htmlLookupResult)`
	`37`	`+ /// <returns><see cref="AdventBase"/> for chaining.</returns>`
	`38`	`+ public static AdventBase SetTestHtmlResults(this AdventBase adventBase, string htmlSubmitResult, string htmlLookupResult)`
`36`	`39`	`{`
`37`	`40`	`adventBase.SetTestHtmlResults(htmlSubmitResult, htmlLookupResult);`
	`41`	`+ return adventBase;`
`38`	`42`	`}`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,4 +164,6 @@ public async Task TestHtml_SubmitAnswer_FalseResult()`
`164`	`164`	`var result = await day.SubmitPart1Async();`
`165`	`165`	`Assert.False(result);`
`166`	`166`	`}`
	`167`	`+`
	`168`	`+ // TODO: Add more web tests`
`167`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,15 @@ public class Day18 : AdventBase`
`6`	`6`	`{`
`7`	`7`	`protected override object InternalPart1()`
`8`	`8`	`{`
	`9`	`+ Thread.Sleep(1);`
	`10`	`+ var text = Input.Text;`
`9`	`11`	`return 2077;`
`10`	`12`	`}`
`11`	`13`
`12`	`14`	`protected override object InternalPart2()`
`13`	`15`	`{`
	`16`	`+ Thread.Sleep(1);`
	`17`	`+ var text = Input.Text;`
`14`	`18`	`return 1922;`
`15`	`19`	`}`
`16`	`20`	`}`