Merge pull request #107 from CodebreakerApp/106-update-analyzer-library

christiannagel · web-flow · commit 65e743e08419 · 2023-12-21T19:38:43.000+01:00
106 update analyzer library
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ColorGame6x4AnalyzerTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ColorGame6x4AnalyzerTests.cs
@@ -1,8 +1,9 @@
 using System.Collections;
+using System.Reflection.Emit;
 
 using static Codebreaker.GameAPIs.Models.Colors;
 
-namespace Codebreaker.GameAPIs.Algorithms.Tests;
+namespace Codebreaker.GameAPIs.Analyzer.Tests;
 
 public class ColorGame6x4AnalyzerTests
 {
@@ -66,6 +67,16 @@ public void ShouldThrowOnInvalidMoveNumber()
                 [Yellow, Green, Black, Blue], moveNumber: 2));
     }
 
+    [Fact]
+    public void ShouldNotIncrementMoveNumberOnInvalidMove()
+    {
+        IGame game = TestSkeletonWithGame(
+            [Green, Yellow, Green, Black],
+            [Yellow, Green, Black, Blue], moveNumber: 2);
+
+        Assert.Equal(0, game?.LastMoveNumber);
+    }
+
     private static ColorResult TestSkeleton(string[] codes, string[] guesses, int moveNumber = 1)
     {
         MockColorGame game = new()
@@ -84,6 +95,33 @@ private static ColorResult TestSkeleton(string[] codes, string[] guesses, int mo
         ColorGameGuessAnalyzer analyzer = new(game,guesses.ToPegs<ColorField>().ToArray(), moveNumber);
         return analyzer.GetResult();
     }
+
+    private static IGame TestSkeletonWithGame(string[] codes, string[] guesses, int moveNumber = 1)
+    {
+        MockColorGame game = new()
+        {
+            GameType = GameTypes.Game6x4,
+            NumberCodes = 4,
+            MaxMoves = 12,
+            IsVictory = false,
+            FieldValues = new Dictionary<string, IEnumerable<string>>()
+            {
+                [FieldCategories.Colors] = TestData6x4.Colors6.ToList()
+            },
+            Codes = codes
+        };
+
+        ColorGameGuessAnalyzer analyzer = new(game, guesses.ToPegs<ColorField>().ToArray(), moveNumber);
+        try
+        {
+            analyzer.GetResult();
+        }
+        catch (ArgumentException)
+        {
+
+        }
+        return game;
+    }
 }
 
 public class TestData6x4 : IEnumerable<object[]>
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ColorGame8x5AnalyzerTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ColorGame8x5AnalyzerTests.cs
@@ -1,10 +1,8 @@
 using System.Collections;
 
-using Codebreaker.GameAPIs.Analyzers;
-
 using static Codebreaker.GameAPIs.Models.Colors;
 
-namespace Codebreaker.GameAPIs.Algorithms.Tests;
+namespace Codebreaker.GameAPIs.Analyzer.Tests;
 
 public class ColorGame8x5AnalyzerTests
 {
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ShapeGame5x5x4AnalyzerTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Analyzers/ShapeGame5x5x4AnalyzerTests.cs
@@ -1,11 +1,9 @@
 using System.Collections;
 
-using Codebreaker.GameAPIs.Analyzers;
-
 using static Codebreaker.GameAPIs.Models.Colors;
 using static Codebreaker.GameAPIs.Models.Shapes;
 
-namespace Codebreaker.GameAPIs.Algorithms.Tests;
+namespace Codebreaker.GameAPIs.Analyzer.Tests;
 
 // TODO: add more unit tests
 public class ShapeGame5x5x4AnalyzerTests
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Codebreaker.GameAPIs.Analyzers.Tests.csproj b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Codebreaker.GameAPIs.Analyzers.Tests.csproj
@@ -12,9 +12,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="xunit" Version="2.6.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/MockColorGame.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/MockColorGame.cs
@@ -1,4 +1,4 @@
-﻿namespace Codebreaker.GameAPIs.Algorithms.Tests;
+﻿namespace Codebreaker.GameAPIs.Analyzer.Tests;
 
 public class MockColorGame : IGame
 {
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/MockShapeGame.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/MockShapeGame.cs
@@ -1,4 +1,4 @@
-﻿namespace Codebreaker.GameAPIs.Algorithms.Tests;
+﻿namespace Codebreaker.GameAPIs.Analyzer.Tests;
 
 public class MockShapeGame : IGame
 {
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Results/ColorResultTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Results/ColorResultTests.cs
@@ -1,6 +1,4 @@
-using Codebreaker.GameAPIs.Models;
-
-namespace Codebreaker.GameAPIs.Algorithms.Tests;
+namespace Codebreaker.GameAPIs.Analyzer.Tests;
 
 public class ColorResultTests
 {
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Results/ShapeAndColorResultTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Results/ShapeAndColorResultTests.cs
@@ -1,6 +1,4 @@
-using Codebreaker.GameAPIs.Models;
-
-namespace Codebreaker.GameAPIs.Algorithms.Tests;
+namespace Codebreaker.GameAPIs.Analyzer.Tests;
 
 public class ShapeAndColorResultTests
 { 
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Results/SimpleColorResultTests.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers.Tests/Results/SimpleColorResultTests.cs
@@ -1,4 +1,4 @@
-namespace Codebreaker.GameAPIs.Algorithms.Tests;
+namespace Codebreaker.GameAPIs.Analyzer.Tests;
 
 public class SimpleColorResultTests
 {
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers/Analyzers/GameGuessAnalyzer.cs b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers/Analyzers/GameGuessAnalyzer.cs
@@ -43,12 +43,12 @@ private void ValidateGuess()
 
         ValidateGuessValues();
 
-        _game.LastMoveNumber++;
-
-        if (_game.LastMoveNumber != _moveNumber)
+        if ((_game.LastMoveNumber + 1) != _moveNumber)
         {
             throw new ArgumentException($"Incorrect move number received {_moveNumber}") { HResult = 4300 };
         }
+
+        _game.LastMoveNumber++;
     }
 
     /// <summary>
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Analyzers/Codebreaker.Analyzers.csproj b/src/services/gameapi/Codebreaker.GameAPIs.Analyzers/Codebreaker.Analyzers.csproj
@@ -5,7 +5,7 @@
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <PackageTags>
       Codebreaker;CNinnovation;GameAnalyzers;
     </PackageTags>
@@ -17,6 +17,10 @@
     <PackageIcon>codebreaker.jpeg</PackageIcon>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Include="docs/readme.md" Pack="true" PackagePath="\" />
     <None Include="Images/codebreaker.jpeg" Pack="true" PackagePath="\" />
diff --git a/src/services/gameapi/Codebreaker.GameAPIs.Tests/GamesApiApplication.cs b/src/services/gameapi/Codebreaker.GameAPIs.Tests/GamesApiApplication.cs
@@ -3,9 +3,9 @@
 
 namespace Codebreaker.GameAPIs.Tests;
 
-internal class GamesApiApplication(string envrionment = "Development") : WebApplicationFactory<Program>
+internal class GamesApiApplication(string environment = "Development") : WebApplicationFactory<Program>
 {
-    private readonly string _environment = envrionment;
+    private readonly string _environment = environment;
 
     protected override IHost CreateHost(IHostBuilder builder)
     {

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`using System.Collections;`
`2`	`2`
`3`		`-using Codebreaker.GameAPIs.Analyzers;`
`4`		`-`
`5`	`3`	`using static Codebreaker.GameAPIs.Models.Colors;`
`6`	`4`
`7`		`-namespace Codebreaker.GameAPIs.Algorithms.Tests;`
	`5`	`+namespace Codebreaker.GameAPIs.Analyzer.Tests;`
`8`	`6`
`9`	`7`	`public class ColorGame8x5AnalyzerTests`
`10`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Codebreaker.GameAPIs.Algorithms.Tests;`
	`1`	`+namespace Codebreaker.GameAPIs.Analyzer.Tests;`
`2`	`2`
`3`	`3`	`public class MockColorGame : IGame`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using Codebreaker.GameAPIs.Models;`
`2`		`-`
`3`		`-namespace Codebreaker.GameAPIs.Algorithms.Tests;`
	`1`	`+namespace Codebreaker.GameAPIs.Analyzer.Tests;`
`4`	`2`
`5`	`3`	`public class ColorResultTests`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ private void ValidateGuess()`
`43`	`43`
`44`	`44`	`ValidateGuessValues();`
`45`	`45`
`46`		`- _game.LastMoveNumber++;`
`47`		`-`
`48`		`- if (_game.LastMoveNumber != _moveNumber)`
	`46`	`+ if ((_game.LastMoveNumber + 1) != _moveNumber)`
`49`	`47`	`{`
`50`	`48`	`throw new ArgumentException($"Incorrect move number received {_moveNumber}") { HResult = 4300 };`
`51`	`49`	`}`
	`50`	`+`
	`51`	`+ _game.LastMoveNumber++;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/// <summary>`