Add target framework to project test items

Paves the way for multiple Target frameworks and provides context so users can figure out why the test count is different than the console or other test explorers See this discussion: ionide#1874 (comment)
farlee2121 · Jul 5, 2023 · bb13ef8 · bb13ef8
1 parent e4a26f8
commit bb13ef8
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/src/Components/TestExplorer.fs b/src/Components/TestExplorer.fs
@@ -546,11 +546,12 @@ module TestItem =
     let fromProject
         (testItemFactory: TestItemFactory)
         (projectPath: ProjectPath)
+        (targetFramework: string)
         (children: TestItem array)
         : TestItem =
         testItemFactory
             { id = constructId projectPath ""
-              label = Path.getNameOnly projectPath
+              label = $"{Path.getNameOnly projectPath} ({targetFramework})"
               uri = None
               range = None
               children = children }
@@ -566,7 +567,7 @@ module TestItem =
                 testsForFile.tests
                 |> Array.map (fromTestAdapter testItemFactory fileUri projectPath)
 
-            [| fromProject testItemFactory projectPath fileTests |])
+            [| fromProject testItemFactory projectPath project.Info.TargetFramework fileTests |])
 
     let getOrMakeHierarchyPath
         (rootCollection: TestItemCollection)
@@ -722,13 +723,18 @@ module TestDiscovery =
 
         recurse targetCollection previousCodeTests newCodeTests
 
-    let discoverFromTrx testItemFactory (tryGetLocation: TestId -> LocationRecord option) makeTrxPath projectPaths =
+    let discoverFromTrx
+        testItemFactory
+        (tryGetLocation: TestId -> LocationRecord option)
+        makeTrxPath
+        (projectPaths: Project list)
+        =
 
         let testProjects =
             projectPaths
             |> Array.ofList
             |> Array.choose (fun p ->
-                match p |> makeTrxPath |> Path.tryPath with
+                match p.Project |> makeTrxPath |> Path.tryPath with
                 | Some trxPath -> Some(p, trxPath)
                 | None -> None)
 
@@ -738,15 +744,15 @@ module TestDiscovery =
 
         let treeItems =
             trxTestsPerProject
-            |> Array.map (fun (projPath, trxDefs) ->
-                let projectPath = ProjectPath.ofString projPath
+            |> Array.map (fun (project, trxDefs) ->
+                let projectPath = ProjectPath.ofString project.Project
                 let heirarchy = TrxParser.inferHierarchy trxDefs
 
                 let projectTests =
                     heirarchy
                     |> Array.map (TestItem.fromNamedHierarchy testItemFactory tryGetLocation projectPath)
 
-                TestItem.fromProject testItemFactory projectPath projectTests)
+                TestItem.fromProject testItemFactory projectPath project.Info.TargetFramework projectTests)
 
 
         treeItems
@@ -1031,13 +1037,7 @@ module Interactions =
 
 
 
-                let testProjects =
-                    Project.getInWorkspace ()
-                    |> List.choose (fun projectLoadState ->
-                        match projectLoadState with
-                        | Project.ProjectLoadingState.Loaded proj ->
-                            if ProjectExt.isTestProject proj then Some proj else None
-                        | _ -> None)
+                let testProjects = Project.getLoaded () |> List.filter ProjectExt.isTestProject
 
                 let testProjectCount = List.length testProjects
                 let testProjectPaths = testProjects |> List.map (fun p -> p.Project)
@@ -1074,7 +1074,12 @@ module Interactions =
                             |> TestName.inferHierarchy
                             |> Array.map (TestItem.fromNamedHierarchy testItemFactory tryGetLocation project.Project)
 
-                        return TestItem.fromProject testItemFactory project.Project testHierarchy
+                        return
+                            TestItem.fromProject
+                                testItemFactory
+                                project.Project
+                                project.Info.TargetFramework
+                                testHierarchy
                     }
 
                 let! listDiscoveredTests = listDiscoveryProjects |> List.map discoverTestsByListOnly |> Promise.all
@@ -1087,10 +1092,8 @@ module Interactions =
                         let trxPath = makeTrxPath projectPath |> Some
                         DotnetCli.test projectPath project.Info.TargetFramework trxPath None)
 
-                let trxDiscoveryProjectPaths = trxDiscoveryProjects |> List.map (fun p -> p.Project)
-
                 let trxDiscoveredTests =
-                    TestDiscovery.discoverFromTrx testItemFactory tryGetLocation makeTrxPath trxDiscoveryProjectPaths
+                    TestDiscovery.discoverFromTrx testItemFactory tryGetLocation makeTrxPath trxDiscoveryProjects
 
                 let newTests = Array.concat [ listDiscoveredTests; trxDiscoveredTests ]
 
@@ -1205,7 +1208,7 @@ let activate (context: ExtensionContext) =
             let trxTests =
                 TestDiscovery.discoverFromTrx testItemFactory locationCache.GetById makeTrxPath
 
-            let workspaceProjects = ProjectExt.getAllWorkspaceProjects ()
+            let workspaceProjects = Project.getLoaded ()
             let initialTests = trxTests workspaceProjects
             initialTests |> Array.iter testController.items.add