Fix filter (#50)

.github/workflows/dotnet.yaml

@@ -74,6 +74,7 @@ jobs:
       run: 'nix develop --command dotnet exec ./TestRunner/bin/Release/net8.0/TestRunner.dll ./Consumer/bin/Release/net8.0/Consumer.dll --trx TrxOut/out.trx'
     - name: Parse Trx files
       uses: NasAmin/trx-parser@v0.6.0
+      if: always()
       id: trx-parser
       with:
         TRX_PATH: ${{ github.workspace }}/TrxOut

Consumer/TestCaseData.fs

@@ -25,10 +25,15 @@ module TestCaseData =
     let ``Consume test data from multiple sources`` (i : int, s : string, arr : float[]) =
         lock multipleSources (fun () -> multipleSources.Add (i, s, arr))
 
-    let optional = [ Some "hi" ; None ] |> List.map TestCaseData
+    let optionalData = [ Some "hi" ; None ] |> List.map TestCaseData
 
-    [<TestCaseSource(nameof optional)>]
-    let ``Consume options`` (s : string option) : unit = s |> shouldEqual s
+    [<TestCaseSource(nameof optionalData)>]
+    let ``Consume options, TestCaseData`` (s : string option) : unit = s |> shouldEqual s
+
+    let optionalRaw = [ Some "hi" ; None ]
+
+    [<TestCaseSource(nameof optionalRaw)>]
+    let ``Consume options, raw`` (s : string option) : unit = s |> shouldEqual s
 
     [<OneTimeTearDown>]
     let tearDown () =

Directory.Build.props

@@ -12,4 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" PrivateAssets="all"/>
   </ItemGroup>
+  <PropertyGroup Condition="'$(GITHUB_ACTION)' != ''">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
 </Project>

TestRunner.Lib/Filter.fs

@@ -291,9 +291,10 @@ module Filter =
             fun a b -> inner1 a b || inner2 a b
         | Filter.Name (Match.Exact m) -> fun _fixture method -> method.Method.Name = m
         | Filter.Name (Match.Contains m) -> fun _fixture method -> method.Method.Name.Contains m
-        | Filter.FullyQualifiedName (Match.Exact m) -> fun fixture method -> (fixture.Name + method.Method.Name) = m
+        | Filter.FullyQualifiedName (Match.Exact m) ->
+            fun _fixture method -> (method.Method.DeclaringType.FullName + "." + method.Method.Name) = m
         | Filter.FullyQualifiedName (Match.Contains m) ->
-            fun fixture method -> (fixture.Name + method.Method.Name).Contains m
+            fun _fixture method -> (method.Method.DeclaringType.FullName + "." + method.Method.Name).Contains m
         | Filter.TestCategory (Match.Contains m) ->
             fun _fixture method -> method.Categories |> List.exists (fun cat -> cat.Contains m)
         | Filter.TestCategory (Match.Exact m) -> fun _fixture method -> method.Categories |> List.contains m

TestRunner.Lib/TestFixture.fs

@@ -332,6 +332,7 @@ module TestFixture =
                                 yield
                                     Guid.NewGuid (),
                                     match arg with
+                                    | null -> [| (null : obj) |]
                                     | :? Tuple<obj, obj> as (a, b) -> [| a ; b |]
                                     | :? Tuple<obj, obj, obj> as (a, b, c) -> [| a ; b ; c |]
                                     | :? Tuple<obj, obj, obj, obj> as (a, b, c, d) -> [| a ; b ; c ; d |]

TestRunner/Program.fs

@@ -54,23 +54,57 @@ module Program =
                 |> Option.defaultValue RollForward.Minor
             | s -> RollForward.Parse s
 
-        let desired = Version config.Framework.Version
+        let desiredVersions =
+            match config.Framework with
+            | Some f -> [ Version f.Version, f.Name ]
+            | None ->
+
+            match config.Frameworks with
+            | Some f -> f |> List.map (fun f -> Version f.Version, f.Name)
+            | None ->
+                failwith
+                    "Could not deduce a framework version due to lack of either Framework or Frameworks in runtimeconfig"
+
+        let compatiblyNamedRuntimes =
+            f.Frameworks
+            |> Seq.collect (fun availableFramework ->
+                desiredVersions
+                |> List.choose (fun (desiredVersion, desiredName) ->
+                    if desiredName = availableFramework.Name then
+                        Some
+                            {|
+                                Desired = desiredVersion
+                                Name = desiredName
+                                Installed = availableFramework
+                                InstalledVersion = Version availableFramework.Version
+                            |}
+                    else
+                        None
+                )
+            )
+            |> Seq.toList
 
         match rollForward with
         | RollForward.Minor ->
             let available =
-                f.Frameworks
-                |> Seq.choose (fun fi ->
-                    if fi.Name = config.Framework.Name then
-                        Some (fi, Version fi.Version)
-                    else
-                        None
+                compatiblyNamedRuntimes
+                |> Seq.filter (fun data ->
+                    data.InstalledVersion.Major = data.Desired.Major
+                    && data.InstalledVersion.Minor >= data.Desired.Minor
                 )
-                |> Seq.filter (fun (_, version) -> version.Major = desired.Major && version.Minor >= desired.Minor)
-                |> Seq.tryMinBy (fun (_, version) -> version.Minor, version.Build)
+                |> Seq.groupBy (fun data -> data.Name)
+                |> Seq.map (fun (name, data) ->
+                    let data =
+                        data
+                        |> Seq.minBy (fun data -> data.InstalledVersion.Minor, data.InstalledVersion.Build)
+
+                    name, data.Installed
+                )
+                // TODO: how do we select between many available frameworks?
+                |> Seq.tryHead
 
             match available with
-            | Some (f, _) -> Some (Choice1Of2 f)
+            | Some (_, f) -> Some (Choice1Of2 f)
             | None ->
                 // TODO: maybe we can ask the SDK. But we keep on trucking: maybe we're self-contained,
                 // and we'll actually find all the runtime next to the DLL.
@@ -99,7 +133,7 @@ module Program =
         | None ->
             // Keep on trucking: let's be optimistic and hope that we're self-contained.
             [ dll.Directory ]
-        | Some (Choice1Of2 runtime) -> [ dll.Directory ; DirectoryInfo runtime.Path ]
+        | Some (Choice1Of2 runtime) -> [ dll.Directory ; DirectoryInfo $"%s{runtime.Path}/%s{runtime.Version}" ]
         | Some (Choice2Of2 sdk) -> [ dll.Directory ; DirectoryInfo sdk.Path ]
 
     let main argv =

TestRunner/RuntimeConfig.fs

@@ -14,7 +14,8 @@ type FrameworkDescription =
 type RuntimeOptions =
     {
         Tfm : string
-        Framework : FrameworkDescription
+        Framework : FrameworkDescription option
+        Frameworks : FrameworkDescription list option
         RollForward : string option
     }
 

TestRunner/TestRunner.fsproj

@@ -39,7 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="Spectre.Console" Version="0.49.1" />
-    <PackageReference Include="WoofWare.DotnetRuntimeLocator" Version="0.1.2" />
+    <PackageReference Include="WoofWare.DotnetRuntimeLocator" Version="0.1.3" />
     <PackageReference Include="WoofWare.Myriad.Plugins.Attributes" Version="3.1.4" />
     <PackageReference Include="Myriad.SDK" Version="0.8.3" />
     <PackageReference Include="WoofWare.Myriad.Plugins" Version="$(WoofWareMyriadPluginVersion)" PrivateAssets="all" />

nix/deps.nix

@@ -183,8 +183,8 @@
   })
   (fetchNuGet {
     pname = "WoofWare.DotnetRuntimeLocator";
-    version = "0.1.2";
-    sha256 = "0kwkq28ddzc0bpr22jmgcl8dhnhg776gf6l054rsxw8lrvpwhmv9";
+    version = "0.1.3";
+    sha256 = "0qw41mcvx4qy012pj1dlpdfwsz036qrx7xnzsirk5fz715f1a45m";
   })
   (fetchNuGet {
     pname = "WoofWare.Myriad.Plugins";