Try and type check scenarios.

Author: nojaf

tests/ParallelTypeCheckingTests/ParallelTypeCheckingTests.fsproj

@@ -40,7 +40,6 @@
     <Compile Include="Code\ParallelTypeChecking.fs" />
     <Compile Include="Tests\Utils.fs" />
     <Compile Include="Tests\AssemblySetUp.fs" />
-    <Compile Include="Tests\TestCompilation.fs" />
     <Compile Include="Tests\TestCompilationFromCmdlineArgs.fs" />
     <Content Include="Tests\FCS.args.txt" />
     <Content Include="Tests\FCS.prepare.ps1" />
@@ -53,6 +52,7 @@
     <Compile Include="Tests\FileContentMappingTests.fs" />
     <Compile Include="Tests\Scenarios.fs" />
     <Compile Include="Tests\DependencyResolutionTests.fs" />
+    <Compile Include="Tests\TestCompilation.fs" />
     <Compile Include="Program.fs" />
   <Content Include="Docs.md" />
   </ItemGroup>

tests/ParallelTypeCheckingTests/Tests/DependencyResolutionTests.fs

@@ -10,11 +10,12 @@ let scenarios = codebases
 
 [<TestCaseSource(nameof scenarios)>]
 let ``Supported scenario`` (scenario: Scenario) =
-    let graph = mkGraph (Array.map fst scenario.Files)
+    let graph = mkGraph (Array.map (fun f -> f.FileWithAST) scenario.Files)
 
-    for file, expectedDeps in scenario.Files do
-        let actualDeps = graph.[file.Idx]
-        Assert.AreEqual(expectedDeps, actualDeps, $"Dependencies don't match for {System.IO.Path.GetFileName file.File}")
+    for file in scenario.Files do
+        let expectedDeps = file.ExpectedDependencies
+        let actualDeps = graph.[file.FileWithAST.Idx]
+        Assert.AreEqual(expectedDeps, actualDeps, $"Dependencies don't match for {System.IO.Path.GetFileName file.FileWithAST.File}")
 
 // =============================================================================================================
 // =============================================================================================================

tests/ParallelTypeCheckingTests/Tests/Scenarios.fs

@@ -6,23 +6,36 @@ open ParallelTypeCheckingTests
 type Scenario =
     {
         Name: string
-        Files: (FileWithAST * Set<int>) array
+        Files: FileInScenario array
     }
 
     override x.ToString() = x.Name
 
+and FileInScenario =
+    {
+        FileWithAST: FileWithAST
+        ExpectedDependencies: Set<int>
+        Content: string
+    }
+
 let scenario name files =
     let files = files |> List.toArray |> Array.mapi (fun idx f -> f idx)
     { Name = name; Files = files }
 
 let sourceFile fileName content (dependencies: Set<int>) =
     fun idx ->
+        let fileWithAST =
+            {
+                Idx = idx
+                AST = parseSourceCode (fileName, content)
+                File = fileName
+            }
+
         {
-            Idx = idx
-            AST = parseSourceCode (fileName, content)
-            File = fileName
-        },
-        dependencies
+            FileWithAST = fileWithAST
+            ExpectedDependencies = dependencies
+            Content = content
+        }
 
 let codebases =
     [

tests/ParallelTypeCheckingTests/Tests/TestCompilation.fs

@@ -4,6 +4,7 @@ open FSharp.Test
 open FSharp.Test.Compiler
 open NUnit.Framework
 open ParallelTypeCheckingTests.TestUtils
+open ParallelTypeCheckingTests.Tests.Scenarios
 
 type FProject =
     {
@@ -257,3 +258,20 @@ let ``Compile a valid project using sequential type-checking`` (project: FProjec
             Method = Method.Sequential
             Project = project
         }
+
+//...
+let scenarios = ParallelTypeCheckingTests.Tests.Scenarios.codebases
+
+[<TestCaseSource(nameof scenarios)>]
+let ``Compile a valid scenario using graph-based type-checking`` (scenario: Scenario) =
+    let project =
+        scenario.Files
+        |> Array.map (fun (f: FileInScenario) -> f.FileWithAST.File, f.Content)
+        |> List.ofArray
+        |> FProject.Make CompileOutput.Library
+
+    compileAValidProject
+        {
+            Method = Method.Graph
+            Project = project
+        }