Move test delaying startup code to the test it belongs to

tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/CompilationTests.fs

@@ -28,8 +28,7 @@ let compileAValidScenario (scenario: Scenario) (method: Method) =
     let cUnit =
         let files =
             scenario.Files
-            |> Array.map (fun (f: FileInScenario) -> SourceCodeFileKind.Create(f.FileWithAST.File, f.Content))
-            |> Array.toList
+            |> List.map (fun (f: FileInScenario) -> SourceCodeFileKind.Create(f.FileName, f.Content))
 
         match files with
         | [] -> failwith "empty files"
@@ -44,7 +43,7 @@ let compileAValidScenario (scenario: Scenario) (method: Method) =
     |> shouldSucceed
     |> ignore
 
-let scenarios = codebases |> List.map (fun c -> [| box c |]) |> Array.ofList
+let scenarios = scenarios |> List.map (fun c -> [| box c |])
 
 [<Theory>]
 [<MemberData(nameof scenarios)>]

tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/DependencyResolutionTests.fs

@@ -5,15 +5,17 @@ open NUnit.Framework
 open FSharp.Compiler.GraphChecking
 open Scenarios
 
-let scenarios = codebases
-
 [<TestCaseSource(nameof scenarios)>]
 let ``Supported scenario`` (scenario: Scenario) =
-    let files = scenario.Files |> Array.map (fun f -> TestFileWithAST.Map f.FileWithAST) 
+    let files =
+        scenario.Files
+        |> List.map (fun f ->
+            {Idx = f.Index; FileName = f.FileName; ParsedInput = parseSourceCode(f.FileName, f.Content)}) 
+        |> List.toArray
     let filePairs = FilePairMap(files)
     let graph, _trie = DependencyResolution.mkGraph filePairs files
 
     for file in scenario.Files do
         let expectedDeps = file.ExpectedDependencies
-        let actualDeps = set graph.[file.FileWithAST.Idx]
-        Assert.AreEqual(expectedDeps, actualDeps, $"Dependencies don't match for {System.IO.Path.GetFileName file.FileWithAST.File}")
+        let actualDeps = set graph.[file.Index]
+        Assert.AreEqual(expectedDeps, actualDeps, $"Dependencies don't match for {System.IO.Path.GetFileName file.FileName}")

tests/FSharp.Compiler.ComponentTests/TypeChecks/Graph/Scenarios.fs

@@ -2,41 +2,36 @@
 
 open TestUtils
 
+type FileInScenario =
+    {
+        Index: int
+        FileName: string
+        ExpectedDependencies: Set<int>
+        Content: string
+    }
+
 type Scenario =
     {
         Name: string
-        Files: FileInScenario array
+        Files: FileInScenario list
     }
 
     override x.ToString() = x.Name
 
-and FileInScenario =
-    {
-        FileWithAST: TestFileWithAST
-        ExpectedDependencies: Set<int>
-        Content: string
-    }
-
 let private scenario name files =
-    let files = files |> List.toArray |> Array.mapi (fun idx f -> f idx)
+    let files = files |> List.mapi (fun idx f -> f idx)
     { Name = name; Files = files }
 
 let private sourceFile fileName content (dependencies: Set<int>) =
     fun idx ->
-        let fileWithAST =
-            {
-                Idx = idx
-                AST = parseSourceCode (fileName, content)
-                File = fileName
-            }
-
         {
-            FileWithAST = fileWithAST
+            Index = idx
+            FileName = fileName
             ExpectedDependencies = dependencies
             Content = content
         }
 
-let internal codebases =
+let internal scenarios =
     [
         scenario
             "Link via full open statement"