v1.5.6 continuing test project restucturing

smabuk · Dec 25, 2023 · ce7ff81 · ce7ff81
1 parent b2adddc
commit ce7ff81
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 71 deletions.
diff --git a/src/Smab.Helpers/GridHelpers/DoesNotContain.cs b/src/Smab.Helpers/GridHelpers/DoesNotContain.cs
@@ -1,5 +1,7 @@
 namespace Smab.Helpers;
-
+//
+// Modified from https://source.dot.net/#System.Linq/System/Linq/Contains.cs
+//
 public static partial class ArrayHelpers {
 
 	public static bool DoesNotContain<TSource>(this IEnumerable<TSource> source, TSource value) =>

diff --git a/src/Smab.Helpers/GridHelpers/Point.cs b/src/Smab.Helpers/GridHelpers/Point.cs
@@ -90,5 +90,5 @@ public static Point Parse(string s, IFormatProvider? provider) {
 	public static bool TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, [MaybeNullWhen(false)] out Point result)
 		=> ISimpleParsable<Point>.TryParse(s, provider, out result);
 
-	private string DebugDisplay => $$"""{{nameof(Point)}} ({{X}}, {{Y}})""";
+	private readonly string DebugDisplay => $$"""{{nameof(Point)}} ({{X}}, {{Y}})""";
 }
diff --git a/src/Smab.Helpers/GridHelpers/Point3d.cs b/src/Smab.Helpers/GridHelpers/Point3d.cs
@@ -86,5 +86,5 @@ public static Point3d Parse(string s, IFormatProvider? provider) {
 	public static bool TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, [MaybeNullWhen(false)] out Point3d result)
 		=> ISimpleParsable<Point3d>.TryParse(s, provider, out result);
 
-	private string DebugDisplay => $$"""{{nameof(Point3d)}} ({{X}}, {{Y}}, {{Z}})""";
+	private readonly string DebugDisplay => $$"""{{nameof(Point3d)}} ({{X}}, {{Y}}, {{Z}})""";
 }
diff --git a/...Smab.Helpers/MathsHelpers/ArrayHelpers.cs → ...ab.Helpers/MathsHelpers/AverageHelpers.cs b/...Smab.Helpers/MathsHelpers/ArrayHelpers.cs → ...ab.Helpers/MathsHelpers/AverageHelpers.cs
diff --git a/src/Smab.Helpers/MathsHelpers/RangeHelpers.cs b/src/Smab.Helpers/MathsHelpers/RangeHelpers.cs
@@ -97,7 +97,7 @@ public static implicit operator (long start, long end)(LongRange range) {
 		return (start, end);
 	}
 
-	public void Deconstruct(out long start, out long end) {
+	public readonly void Deconstruct(out long start, out long end) {
 		start = Start;
 		end = End;
 	}

diff --git a/src/Smab.Helpers/Smab.Helpers.csproj b/src/Smab.Helpers/Smab.Helpers.csproj
@@ -8,7 +8,7 @@
 
 	<PropertyGroup>
 		<PackageReleaseNotes>.NET 8.0</PackageReleaseNotes>
-		<VersionPrefix>1.5.5</VersionPrefix>
+		<VersionPrefix>1.5.6</VersionPrefix>
 		<Preview></Preview>
 		<VersionSuffix Condition="'$(Preview)' != '' And '$(BUILD_BUILDNUMBER)' == ''">$(Preview).$([System.DateTime]::get_Now().get_Year())$([System.DateTime]::get_Now().get_Month().ToString("D2"))$([System.DateTime]::get_Now().get_Day().ToString("D2"))-$([System.DateTime]::get_Now().get_Hour().ToString("D2"))$([System.DateTime]::get_Now().get_Minute().ToString("D2"))</VersionSuffix>
 		<VersionSuffix Condition="'$(Preview)' != '' And '$(BUILD_BUILDNUMBER)' != ''">$(Preview).$(BUILD_BUILDNUMBER)</VersionSuffix>

diff --git a/test/Smab.Helpers.Test/ArrayHelperTests/GetAdjacent.cs b/test/Smab.Helpers.Test/ArrayHelperTests/GetAdjacent.cs
@@ -0,0 +1,33 @@
+namespace Smab.Helpers.Test.ArrayHelperTests;
+public partial class GetAdjacent {
+
+	[Theory]
+	[InlineData(0, 0, false, 2)]
+	[InlineData(0, 0, true, 3)]
+	[InlineData(1, 1, false, 4)]
+	[InlineData(1, 1, true, 8)]
+	public void GetAdjacentCells_Should_Have(int X, int Y, bool includeDiagonals, int expected) {
+		(char, int)[] input = new (char, int)[26];
+		for (int i = 0; i < input.GetUpperBound(0); i++) {
+			input[i] = new((char)(65 + i), i + 1);
+		}
+		(char, int)[,] array = input.To2dArray<(char, int)>(5);
+		var points = array.GetAdjacentCells((X, Y), includeDiagonals: includeDiagonals);
+		points.Count().ShouldBe(expected);
+	}
+
+	[Theory]
+	[InlineData(0, 0, false, 1)]
+	[InlineData(1, 1, false, 3)]
+	[InlineData(1, 1, true, 6)]
+	public void GetAdjacentCells_Should_Not_Have(int X, int Y, bool includeDiagonals, int expected) {
+		(char, int)[] input = new (char, int)[26];
+		for (int i = 0; i < input.GetUpperBound(0); i++) {
+			input[i] = new((char)(65 + i), i + 1);
+		}
+		(char, int)[,] array = input.To2dArray(5);
+		var points = array.GetAdjacentCells((X, Y), includeDiagonals: includeDiagonals, exclude: [ArrayHelpers.RIGHT, ArrayHelpers.NORTH_EAST]);
+		points.Count().ShouldBe(expected);
+	}
+
+}
diff --git a/test/Smab.Helpers.Test/HelperMethodTests/ArrayHelperTests.cs b/test/Smab.Helpers.Test/HelperMethodTests/ArrayHelperTests.cs
@@ -139,35 +139,6 @@ public void Walk2dArray_Should_Walk_Across_Then_Down() {
 		Assert.Equal(8, value.Item2);
 	}
 
-	[Theory]
-	[InlineData(0, 0, false, 2)]
-	[InlineData(0, 0, true, 3)]
-	[InlineData(1, 1, false, 4)]
-	[InlineData(1, 1, true, 8)]
-	public void GetAdjacentCells_Should_Have(int X, int Y, bool includeDiagonals, int expected) {
-		(char, int)[] input = new (char, int)[26];
-		for (int i = 0; i < input.GetUpperBound(0); i++) {
-			input[i] = new((char)(65 + i), i + 1);
-		}
-		(char, int)[,] array = input.To2dArray<(char, int)>(5);
-		var points = array.GetAdjacentCells((X, Y), includeDiagonals: includeDiagonals);
-		points.Count().ShouldBe(expected);
-	}
-
-	[Theory]
-	[InlineData(0, 0, false, 1)]
-	[InlineData(1, 1, false, 3)]
-	[InlineData(1, 1, true,  6)]
-	public void GetAdjacentCells_Should_Not_Have(int X, int Y, bool includeDiagonals, int expected) {
-		(char, int)[] input = new (char, int)[26];
-		for (int i = 0; i < input.GetUpperBound(0); i++) {
-			input[i] = new((char)(65 + i), i + 1);
-		}
-		(char, int)[,] array = input.To2dArray(5);
-		var points = array.GetAdjacentCells((X, Y), includeDiagonals: includeDiagonals, exclude: [ArrayHelpers.RIGHT, ArrayHelpers.NORTH_EAST]);
-		points.Count().ShouldBe(expected);
-	}
-
 	[Theory]
 	[InlineData(new int[] { 1, 2, 3, 4, 5, 6 }
 		, 3, 2, 2

diff --git a/.../ParsingHelperTests/ParsingHelperTests.cs → ...mab.Helpers.Test/ParsingHelperTests/As.cs b/.../ParsingHelperTests/ParsingHelperTests.cs → ...mab.Helpers.Test/ParsingHelperTests/As.cs
@@ -1,25 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
 
-namespace Smab.Helpers.Test.HelperMethodTests;
-
-public partial class ParsingHelperTests {
-	[Fact]
-	public void TrimmedSplit_ShouldBe() {
-
-		const string INPUT = """
-			  123, 4, 5 L : 123 , 
-			aaa, 4, ;  x : 123 , 
-			""";
-
-		INPUT.TrimmedSplit().Length.ShouldBe(1);
-		INPUT.TrimmedSplit(Environment.NewLine).Length.ShouldBe(2);
-		INPUT.TrimmedSplit(',').Length.ShouldBe(6);
-		INPUT.TrimmedSplit([";"]).Length.ShouldBe(2);
-		INPUT.TrimmedSplit([";"]).Last().ShouldBe("x : 123 ,");
-		INPUT.TrimmedSplit(",", 5)[^2].ShouldBe("aaa");
-	}
-
+namespace Smab.Helpers.Test.ParsingHelperTests;
+public partial class As {
 	[Theory]
 	[InlineData("1", 1)]
 	[InlineData("23", 23)]
@@ -31,22 +14,6 @@ public void AsInt_ShouldBe(string input, int expected) {
 		Assert.Equal(expected, actual);
 	}
 
-	[Theory]
-	[InlineData("#", 1)]
-	[InlineData("#..#", 9)]
-	public void AsIntFromBinary_ShouldBe(string input, int expected) {
-		int actual = input.FromBinaryAs<int>();
-		Assert.Equal(expected, actual);
-	}
-
-	[Theory]
-	[InlineData("█", 1)]
-	[InlineData("█  █", 9)]
-	public void AsIntFromBinary_WithReplacements_ShouldBe(string input, int expected) {
-		int actual = input.FromBinaryAs<int>(' ', '█');
-		Assert.Equal(expected, actual);
-	}
-
 	[Theory]
 	[InlineData("1", -99, 1)]
 	[InlineData("23", -99, 23)]
@@ -64,6 +31,7 @@ public void AsInts_ShouldBe(string[] input, int[] expected) {
 		int[] actual = ParsingHelpers.As<int>(input).ToArray();
 		Assert.Equal(expected, actual);
 	}
+
 	[Theory]
 	[InlineData((string[])["1", "2", "3"], (int[])[1, 2, 3,])]
 	[InlineData((string[])["3", "2", "1"], (int[])[3, 2, 1,])]
@@ -81,6 +49,7 @@ public void AsInts_FromString_ShouldBe_AsExtensionMethod(string input, int[] exp
 		int[] actual = [.. input.As<int>((char[]?)null)];
 		Assert.Equal(expected, actual);
 	}
+
 	[Theory]
 	[InlineData("1, 2, 3", (int[])[1, 2, 3])]
 	[InlineData("3, 2, 1", (int[])[3, 2, 1])]
@@ -129,6 +98,7 @@ public void AsLongs_ShouldBe(string[] input, long[] expected) {
 		long[] actual = ParsingHelpers.As<long>(input).ToArray();
 		Assert.Equal(expected, actual);
 	}
+
 	[Theory]
 	[InlineData((string[])["1", "2", "3"], (long[])[1, 2, 3,])]
 	[InlineData((string[])["3", "2", "1"], (long[])[3, 2, 1,])]
@@ -226,4 +196,5 @@ public static SomeThing Parse(string s, IFormatProvider? provider) {
 
 		public static bool TryParse([NotNullWhen(true)] string? s, IFormatProvider? provider, [MaybeNullWhen(false)] out SomeThing result) => ISimpleParsable<SomeThing>.TryParse(s, provider, out result);
 	}
+
 }
diff --git a/test/Smab.Helpers.Test/ParsingHelperTests/FromBinaryAs.cs b/test/Smab.Helpers.Test/ParsingHelperTests/FromBinaryAs.cs
@@ -0,0 +1,19 @@
+namespace Smab.Helpers.Test.ParsingHelperTests;
+public partial class FromBinaryAs {
+	[Theory]
+	[InlineData("#", 1)]
+	[InlineData("#..#", 9)]
+	public void FromBinaryAs_ShouldBe(string input, int expected) {
+		int actual = input.FromBinaryAs<int>();
+		Assert.Equal(expected, actual);
+	}
+
+	[Theory]
+	[InlineData("█", 1)]
+	[InlineData("█  █", 9)]
+	public void FromBinaryAs_WithReplacements_ShouldBe(string input, int expected) {
+		int actual = input.FromBinaryAs<int>(' ', '█');
+		Assert.Equal(expected, actual);
+	}
+
+}
diff --git a/test/Smab.Helpers.Test/ParsingHelperTests/TrimmedSplit.cs b/test/Smab.Helpers.Test/ParsingHelperTests/TrimmedSplit.cs
@@ -0,0 +1,18 @@
+namespace Smab.Helpers.Test.ParsingHelperTests;
+public partial class TrimmedSplit {
+	[Fact]
+	public void TrimmedSplit_ShouldBe() {
+
+		const string INPUT = """
+			  123, 4, 5 L : 123 , 
+			aaa, 4, ;  x : 123 , 
+			""";
+
+		INPUT.TrimmedSplit().Length.ShouldBe(1);
+		INPUT.TrimmedSplit(Environment.NewLine).Length.ShouldBe(2);
+		INPUT.TrimmedSplit(',').Length.ShouldBe(6);
+		INPUT.TrimmedSplit([";"]).Length.ShouldBe(2);
+		INPUT.TrimmedSplit([";"]).Last().ShouldBe("x : 123 ,");
+		INPUT.TrimmedSplit(",", 5)[^2].ShouldBe("aaa");
+	}
+}
diff --git a/test/Smab.Helpers.Test/Smab.Helpers.Test.csproj b/test/Smab.Helpers.Test/Smab.Helpers.Test.csproj
@@ -10,8 +10,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="xunit" Version="2.6.3" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
+		<PackageReference Include="xunit" Version="2.6.4" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>