Merge pull request #94 from Stillpoint-Software/develop

varndellwagglebee · web-flow · commit 0128c1487595 · 2025-08-18T09:10:03.000-04:00
Develop
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,7 +10,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
   </ItemGroup>
 
   <!-- SourceLink / build hygiene -->
diff --git a/Hyperbee.Expressions.sln b/Hyperbee.Expressions.sln
@@ -22,7 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 		.github\workflows\create_release.yml = .github\workflows\create_release.yml
 		.github\workflows\create_test_report.yml = .github\workflows\create_test_report.yml
 		.github\workflows\deploy-gh-pages.yml = .github\workflows\deploy-gh-pages.yml
-		.github\workflows\format.yml = .github\workflows\format.yml
 		.github\workflows\issue_branch.yml = .github\workflows\issue_branch.yml
 		.github\workflows\pack_publish.yml = .github\workflows\pack_publish.yml
 		.github\workflows\run_tests.yml = .github\workflows\run_tests.yml
diff --git a/src/Hyperbee.Expressions.Lab/Hyperbee.Expressions.Lab.csproj b/src/Hyperbee.Expressions.Lab/Hyperbee.Expressions.Lab.csproj
@@ -47,9 +47,9 @@
     <PackageReference Include="Hyperbee.Json" Version="3.0.6" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
     <ProjectReference Include="..\Hyperbee.Expressions\Hyperbee.Expressions.csproj" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/test/Hyperbee.Expressions.Benchmark/Hyperbee.Expressions.Benchmark.csproj b/test/Hyperbee.Expressions.Benchmark/Hyperbee.Expressions.Benchmark.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
     <PackageReference Include="DotNext.Metaprogramming" Version="5.23.0" />
-    <PackageReference Include="FastExpressionCompiler" Version="5.3.0" />
+    <PackageReference Include="FastExpressionCompiler" Version="5.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Hyperbee.Expressions.Tests/BlockAsyncBasicTests.cs b/test/Hyperbee.Expressions.Tests/BlockAsyncBasicTests.cs
@@ -121,6 +121,7 @@ public async Task BlockAsync_ShouldAwaitMultipleTasks_WithDifferentResults( Comp
     [DataRow( CompilerType.Fast )]
     [DataRow( CompilerType.System )]
     [DataRow( CompilerType.Interpret )]
+    [ExpectedException( typeof( InvalidOperationException ) )]
     public async Task BlockAsync_ShouldThrowException_WithFaultedTask( CompilerType compiler )
     {
         // Arrange
@@ -132,13 +133,14 @@ public async Task BlockAsync_ShouldThrowException_WithFaultedTask( CompilerType
         var compiledLambda = lambda.Compile( compiler );
 
         // Act & Assert
-        await Assert.ThrowsExactlyAsync<InvalidOperationException>( async () => await compiledLambda() );
+        await compiledLambda();
     }
 
     [TestMethod]
     [DataRow( CompilerType.Fast )]
     [DataRow( CompilerType.System )]
     [DataRow( CompilerType.Interpret )]
+    [ExpectedException( typeof( TaskCanceledException ) )]
     public async Task BlockAsync_ShouldHandleCanceledTask_WithCancellation( CompilerType compiler )
     {
         // Arrange
@@ -151,7 +153,7 @@ public async Task BlockAsync_ShouldHandleCanceledTask_WithCancellation( Compiler
         var compiledLambda = lambda.Compile( compiler );
 
         // Act & Assert
-        await Assert.ThrowsExactlyAsync<TaskCanceledException>( async () => await compiledLambda() );
+        await compiledLambda();
     }
 
     [TestMethod]
diff --git a/test/Hyperbee.Expressions.Tests/BlockAsyncConditionalTests.cs b/test/Hyperbee.Expressions.Tests/BlockAsyncConditionalTests.cs
@@ -370,6 +370,7 @@ public async Task AsyncBlock_ShouldAwaitSuccessfully_WithConditionalReturningTas
     }
 
     [TestMethod]
+    [ExpectedException( typeof( NullReferenceException ) )]
     public async Task AsyncBlock_ShouldThrowException_WithNullTaskInConditional()
     {
         // Arrange: One of the branches returns a null task, leading to exception
@@ -384,6 +385,6 @@ public async Task AsyncBlock_ShouldThrowException_WithNullTaskInConditional()
         var compiledLambda = lambda.Compile();
 
         // Act & Assert
-        await Assert.ThrowsExactlyAsync<NullReferenceException>( async () => await compiledLambda() );
+        await compiledLambda();
     }
 }
diff --git a/test/Hyperbee.Expressions.Tests/BlockAsyncSwitchTests.cs b/test/Hyperbee.Expressions.Tests/BlockAsyncSwitchTests.cs
@@ -189,6 +189,7 @@ public async Task AsyncBlock_ShouldAwaitSuccessfully_WithNestedSwitchesAndAwaits
     [DataRow( CompleterType.Deferred, CompilerType.Fast )]
     [DataRow( CompleterType.Deferred, CompilerType.System )]
     [DataRow( CompleterType.Deferred, CompilerType.Interpret )]
+    [ExpectedException( typeof( ArgumentException ) )]
     public async Task AsyncBlock_ShouldThrowException_WithAwaitInSwitchCaseTestValues( CompleterType completer, CompilerType compiler )
     {
         // Arrange: Switch case test values cannot contain awaited tasks
@@ -210,7 +211,7 @@ public async Task AsyncBlock_ShouldThrowException_WithAwaitInSwitchCaseTestValue
         var compiledLambda = lambda.Compile( compiler );
 
         // Act
-        await Assert.ThrowsExactlyAsync<ArgumentException>( async () => await compiledLambda() );
+        await compiledLambda();
     }
 
     [TestMethod]
diff --git a/test/Hyperbee.Expressions.Tests/BlockYieldBasicTests.cs b/test/Hyperbee.Expressions.Tests/BlockYieldBasicTests.cs
@@ -44,7 +44,7 @@ public void BlockYield_ShouldYieldSuccessfully( CompilerType compiler )
     https://github.com/dotnet/runtime/issues/114081
     ======================================================================
 
-    [DataTestMethod]
+    [TestMethod]
     [DataRow( false )]
     [DataRow( true )]
     public void TryFault_ShouldRunSuccessfully_WithReturnLabel( bool interpret )
@@ -75,7 +75,7 @@ public void TryFault_ShouldRunSuccessfully_WithReturnLabel( bool interpret )
         Assert.AreEqual( 1, result );
     }
 
-    [DataTestMethod]
+    [TestMethod]
     [DataRow( false )]
     [DataRow( true )]
     public void TryFault_ShouldRunSuccessfully_WithReturnLabel_Workaround( bool interpret )
diff --git a/test/Hyperbee.Expressions.Tests/DebugExpressionTests.cs b/test/Hyperbee.Expressions.Tests/DebugExpressionTests.cs
@@ -96,6 +96,7 @@ public void DebugExpression_Should_Not_Invoke_DebugDelegate_When_Condition_Is_Fa
     }
 
     [TestMethod]
+    [ExpectedException( typeof( ArgumentException ) )]
     public void DebugExpression_Should_Throw_If_Condition_Is_Not_Boolean()
     {
         // Arrange
@@ -106,7 +107,7 @@ static void DebugAction( int value )
         var invalidCondition = Constant( 42 );
 
         // Act
-        Assert.ThrowsExactly<ArgumentException>( () => _ = Debug( DebugAction, invalidCondition, Constant( 10 ) ) );
+        _ = Debug( DebugAction, invalidCondition, Constant( 10 ) );
 
         // Assert: Exception is expected
     }
diff --git a/test/Hyperbee.Expressions.Tests/Hyperbee.Expressions.Tests.csproj b/test/Hyperbee.Expressions.Tests/Hyperbee.Expressions.Tests.csproj
@@ -17,15 +17,15 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FastExpressionCompiler" Version="5.3.0" />
+    <PackageReference Include="FastExpressionCompiler" Version="5.1.1" />
     <PackageReference Include="Hyperbee.Json" Version="3.0.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.10.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.10.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.10.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.10.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Hyperbee.Expressions.Tests/InjectExpressionTests.cs b/test/Hyperbee.Expressions.Tests/InjectExpressionTests.cs
@@ -82,6 +82,7 @@ public void InjectExpression_ShouldInjectSuccessfully_WithKeyedFallback( Compile
     [DataRow( CompilerType.Fast )]
     [DataRow( CompilerType.System )]
     [DataRow( CompilerType.Interpret )]
+    [ExpectedException( typeof( InvalidOperationException ), "Service is not available." )]
     public void InjectExpression_ShouldInjectSuccessfully_WithBadKey( CompilerType compiler )
     {
         // Arrange
@@ -95,7 +96,7 @@ public void InjectExpression_ShouldInjectSuccessfully_WithBadKey( CompilerType c
         var lambda = Lambda<Func<string>>( block );
         var compiledLambda = lambda.Compile( compiler );
 
-        Assert.ThrowsExactly<InvalidOperationException>( () => compiledLambda() );
+        compiledLambda();
     }
 
     [TestMethod]
diff --git a/test/Hyperbee.Expressions.Tests/StringFormatExpressionTests.cs b/test/Hyperbee.Expressions.Tests/StringFormatExpressionTests.cs
@@ -48,13 +48,14 @@ public void StringFormatExpression_Should_Format_String_With_Arguments( Compiler
     }
 
     [TestMethod]
+    [ExpectedException( typeof( ArgumentException ) )]
     public void StringFormatExpression_Should_Throw_If_Format_Is_Not_String()
     {
         // Arrange
         var invalidFormat = Expression.Constant( 42 );
 
         // Act
-        Assert.ThrowsExactly<ArgumentException>( () => _ = ExpressionExtensions.StringFormat( invalidFormat, Expression.Constant( 10 ) ) );
+        _ = ExpressionExtensions.StringFormat( invalidFormat, Expression.Constant( 10 ) );
 
         // Assert: Exception is expected
     }
diff --git a/test/Hyperbee.Expressions.Tests/UsingExpressionTests.cs b/test/Hyperbee.Expressions.Tests/UsingExpressionTests.cs
@@ -145,13 +145,14 @@ public async Task UsingExpression_ShouldExecuteAsyncExpression_WithInnerUsing( C
     }
 
     [TestMethod]
+    [ExpectedException( typeof( ArgumentException ) )]
     public void UsingExpression_ShouldThrowArgumentException_WhenNonDisposableUsed()
     {
         // Arrange
         var nonDisposableExpression = Constant( "non-disposable string" );
 
         // Act
-        Assert.ThrowsExactly<ArgumentException>( () => Using( nonDisposableExpression, Empty() ) );
+        Using( nonDisposableExpression, Empty() );
 
         // Assert: Expect an ArgumentException due to non-disposable resource
         // The constructor should throw the exception, no need for further assertions

Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,7 @@ public async Task AsyncBlock_ShouldAwaitSuccessfully_WithConditionalReturningTas`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`[TestMethod]`
	`373`	`+ [ExpectedException( typeof( NullReferenceException ) )]`
`373`	`374`	`public async Task AsyncBlock_ShouldThrowException_WithNullTaskInConditional()`
`374`	`375`	`{`
`375`	`376`	`// Arrange: One of the branches returns a null task, leading to exception`
`@@ -384,6 +385,6 @@ public async Task AsyncBlock_ShouldThrowException_WithNullTaskInConditional()`
`384`	`385`	`var compiledLambda = lambda.Compile();`
`385`	`386`
`386`	`387`	`// Act & Assert`
`387`		`- await Assert.ThrowsExactlyAsync<NullReferenceException>( async () => await compiledLambda() );`
	`388`	`+ await compiledLambda();`
`388`	`389`	`}`
`389`	`390`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ public async Task AsyncBlock_ShouldAwaitSuccessfully_WithNestedSwitchesAndAwaits`
`189`	`189`	`[DataRow( CompleterType.Deferred, CompilerType.Fast )]`
`190`	`190`	`[DataRow( CompleterType.Deferred, CompilerType.System )]`
`191`	`191`	`[DataRow( CompleterType.Deferred, CompilerType.Interpret )]`
	`192`	`+ [ExpectedException( typeof( ArgumentException ) )]`
`192`	`193`	`public async Task AsyncBlock_ShouldThrowException_WithAwaitInSwitchCaseTestValues( CompleterType completer, CompilerType compiler )`
`193`	`194`	`{`
`194`	`195`	`// Arrange: Switch case test values cannot contain awaited tasks`
`@@ -210,7 +211,7 @@ public async Task AsyncBlock_ShouldThrowException_WithAwaitInSwitchCaseTestValue`
`210`	`211`	`var compiledLambda = lambda.Compile( compiler );`
`211`	`212`
`212`	`213`	`// Act`
`213`		`- await Assert.ThrowsExactlyAsync<ArgumentException>( async () => await compiledLambda() );`
	`214`	`+ await compiledLambda();`
`214`	`215`	`}`
`215`	`216`
`216`	`217`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ public void DebugExpression_Should_Not_Invoke_DebugDelegate_When_Condition_Is_Fa`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`[TestMethod]`
	`99`	`+ [ExpectedException( typeof( ArgumentException ) )]`
`99`	`100`	`public void DebugExpression_Should_Throw_If_Condition_Is_Not_Boolean()`
`100`	`101`	`{`
`101`	`102`	`// Arrange`
`@@ -106,7 +107,7 @@ static void DebugAction( int value )`
`106`	`107`	`var invalidCondition = Constant( 42 );`
`107`	`108`
`108`	`109`	`// Act`
`109`		`- Assert.ThrowsExactly<ArgumentException>( () => _ = Debug( DebugAction, invalidCondition, Constant( 10 ) ) );`
	`110`	`+ _ = Debug( DebugAction, invalidCondition, Constant( 10 ) );`
`110`	`111`
`111`	`112`	`// Assert: Exception is expected`
`112`	`113`	`}`