Merge commit 'cfd67166162b7c28a6e044e5904cac53da2a194d' into generic-edge-cases

This commit is contained in:
Smaug123
2025-08-23 22:50:11 +01:00
7 changed files with 88 additions and 153 deletions

View File

@@ -23,7 +23,7 @@ module LoggerFactory =
let makeTest () : (unit -> LogLine list) * ILoggerFactory =
// Shared sink for all loggers created by the factory.
let sink = ResizeArray ()
let isEnabled (logLevel : LogLevel) : bool = logLevel >= LogLevel.Information
let isEnabled (logLevel : LogLevel) : bool = logLevel >= LogLevel.Debug
let createLogger (category : string) : ILogger =
{ new ILogger with

View File

@@ -25,7 +25,7 @@ module MockEnv =
System_Threading_Monitor = System_Threading_MonitorMock.Empty
}
type TestCase =
type EndToEndTestCase =
{
FileName : string
ExpectedReturnCode : int

View File

@@ -3,11 +3,14 @@ namespace WoofWare.Pawprint.Test
open System.Collections.Immutable
open System.IO
open FsUnitTyped
open NUnit.Framework
open WoofWare.DotnetRuntimeLocator
open WoofWare.PawPrint
open WoofWare.PawPrint.ExternImplementations
open WoofWare.PawPrint.Test
[<TestFixture>]
[<Parallelizable(ParallelScope.All)>]
module TestImpureCases =
let assy = typeof<RunResult>.Assembly
@@ -20,7 +23,7 @@ module TestImpureCases =
}
]
let cases : TestCase list =
let cases : EndToEndTestCase list =
[
{
FileName = "InstaQuit.cs"
@@ -46,7 +49,7 @@ module TestImpureCases =
}
]
let runTest (case : TestCase) : unit =
let runTest (case : EndToEndTestCase) : unit =
let source = Assembly.getEmbeddedResourceAsString case.FileName assy
let image = Roslyn.compile [ source ]
let messages, loggerFactory = LoggerFactory.makeTest ()
@@ -75,23 +78,9 @@ module TestImpureCases =
reraise ()
open Expecto
[<TestCaseSource(nameof unimplemented)>]
[<Explicit>]
let ``Can evaluate C# files, unimplemented`` (case : EndToEndTestCase) = runTest case
[<Tests>]
let tests =
testList
"Impure cases"
[
testList
"Can evaluate C# files"
[
for case in cases do
testCase case.FileName (fun () -> runTest case)
]
ptestList
"Can evaluate C# files (unimplemented)"
[
for case in unimplemented do
testCase case.FileName (fun () -> runTest case)
]
]
[<TestCaseSource(nameof cases)>]
let ``Can evaluate C# files`` (case : EndToEndTestCase) = runTest case

View File

@@ -3,11 +3,14 @@ namespace WoofWare.Pawprint.Test
open System.Collections.Immutable
open System.IO
open FsUnitTyped
open NUnit.Framework
open WoofWare.DotnetRuntimeLocator
open WoofWare.PawPrint
open WoofWare.PawPrint.ExternImplementations
open WoofWare.PawPrint.Test
[<TestFixture>]
[<Parallelizable(ParallelScope.All)>]
module TestPureCases =
let assy = typeof<RunResult>.Assembly
@@ -60,7 +63,7 @@ module TestPureCases =
}
]
let cases : TestCase list =
let cases : EndToEndTestCase list =
[
{
FileName = "NoOp.cs"
@@ -164,7 +167,7 @@ module TestPureCases =
}
]
let runTest (case : TestCase) : unit =
let runTest (case : EndToEndTestCase) : unit =
let source = Assembly.getEmbeddedResourceAsString case.FileName assy
let image = Roslyn.compile [ source ]
let messages, loggerFactory = LoggerFactory.makeTest ()
@@ -197,23 +200,9 @@ module TestPureCases =
reraise ()
open Expecto
[<TestCaseSource(nameof unimplemented)>]
[<Explicit>]
let ``Can evaluate C# files, unimplemented`` (case : EndToEndTestCase) = runTest case
[<Tests>]
let tests =
testList
"Pure cases"
[
testList
"Can evaluate C# files"
[
for case in cases do
testCase case.FileName (fun () -> runTest case)
]
ptestList
"Can evaluate C# files (unimplemented)"
[
for case in unimplemented do
testCase case.FileName (fun () -> runTest case)
]
]
[<TestCaseSource(nameof cases)>]
let ``Can evaluate C# files`` (case : EndToEndTestCase) = runTest case

View File

@@ -4,7 +4,6 @@
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
<OutputType>Exe</OutputType>
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>
<ItemGroup>
@@ -15,41 +14,10 @@
<Compile Include="TestHarness.fs"/>
<Compile Include="TestPureCases.fs" />
<Compile Include="TestImpureCases.fs" />
<Compile Include="Program.fs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="sourcesPure\BasicLock.cs" />
<EmbeddedResource Include="sourcesPure\Floats.cs" />
<EmbeddedResource Include="sourcesPure\NoOp.cs" />
<EmbeddedResource Include="sourcesPure\InitializeArray.cs" />
<EmbeddedResource Include="sourcesPure\LdtokenField.cs" />
<EmbeddedResource Include="sourcesPure\StaticVariables.cs" />
<EmbeddedResource Include="sourcesPure\Ldelema.cs" />
<EmbeddedResource Include="sourcesPure\ExceptionWithNoOpCatch.cs" />
<EmbeddedResource Include="sourcesPure\ExceptionWithNoOpFinally.cs" />
<EmbeddedResource Include="sourcesPure\TryCatchWithThrowInBody.cs" />
<EmbeddedResource Include="sourcesPure\ComplexTryCatch.cs" />
<EmbeddedResource Include="sourcesPure\TriangleNumber.cs" />
<EmbeddedResource Include="sourcesPure\Threads.cs" />
<EmbeddedResource Include="sourcesPure\ResizeArray.cs" />
<EmbeddedResource Include="sourcesPure\ArgumentOrdering.cs" />
<EmbeddedResource Include="sourcesPure\TestShl.cs" />
<EmbeddedResource Include="sourcesPure\TestShr.cs" />
<EmbeddedResource Include="sourcesPure\TestOr.cs" />
<EmbeddedResource Include="sourcesPure\CustomDelegate.cs" />
<EmbeddedResource Include="sourcesPure\Ldind.cs" />
<EmbeddedResource Include="sourcesPure\TypeConcretization.cs" />
<EmbeddedResource Include="sourcesPure\CrossAssemblyTypes.cs" />
<EmbeddedResource Include="sourcesPure\GenericEdgeCases.cs" />
<EmbeddedResource Include="sourcesPure\Sizeof.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="sourcesPure\UnsafeAs.cs" />
<EmbeddedResource Include="sourcesPure\OverlappingStructs.cs" />
<EmbeddedResource Include="sourcesPure\AdvancedStructLayout.cs" />
<EmbeddedResource Include="sourcesPure\Initobj.cs" />
<EmbeddedResource Include="sourcesImpure\WriteLine.cs" />
<EmbeddedResource Include="sourcesImpure\InstaQuit.cs" />
<EmbeddedResource Include="sourcesPure\*.cs" />
<EmbeddedResource Include="sourcesImpure\*.cs" />
</ItemGroup>
<ItemGroup>
@@ -57,14 +25,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Expecto" Version="10.2.3" />
<PackageReference Include="Expecto.Diff" Version="10.2.3" />
<PackageReference Include="NUnit" Version="4.4.0"/>
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0"/>
<PackageReference Include="FsUnit" Version="7.1.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
<PackageReference Include="WoofWare.DotnetRuntimeLocator" Version="0.3.2"/>
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.15.3" />
</ItemGroup>
</Project>