fix tests

Author: majocha

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

@@ -12,8 +12,8 @@ type Method =
 
 let methodOptions (method: Method) =
     match method with
-    | Method.Sequential -> []
-    | Method.Graph -> [ "--test:GraphBasedChecking"; "--test:DumpCheckingGraph" ]
+    | Method.Sequential -> ["--parallelcompilation-"]
+    | Method.Graph -> ["--test:DumpCheckingGraph"]
 
 let withMethod (method: Method) (cu: CompilationUnit) : CompilationUnit =
     match cu with
@@ -24,7 +24,7 @@ let withMethod (method: Method) (cu: CompilationUnit) : CompilationUnit =
             }
     | cu -> cu
 
-let compileAValidScenario (scenario: Scenario) (method: Method) =
+let compileScenario (scenario: Scenario) (method: Method) =
     let cUnit =
         let files =
             scenario.Files
@@ -36,21 +36,44 @@ let compileAValidScenario (scenario: Scenario) (method: Method) =
             let f = fsFromString first |> FS
             f |> withAdditionalSourceFiles rest
 
+    let dir = TestFramework.createTemporaryDirectory()
+
+    printfn "Compiling scenario '%s' \nin directory %s" scenario.Name dir.FullName
+
     cUnit
+    |> withName scenario.Name
+    |> withOutputDirectory (Some dir)
+    |> ignoreWarnings
     |> withOutputType CompileOutput.Library
     |> withMethod method
     |> compile
-    |> shouldSucceed
-    |> ignore
 
 let scenarios = scenarios |> List.map (fun c -> [| box c |])
 
 [<Theory>]
 [<MemberData(nameof scenarios)>]
 let ``Compile a valid scenario using graph-based type-checking`` (scenario) =
-    compileAValidScenario scenario Method.Graph
+    compileScenario scenario Method.Graph
+    |> shouldSucceed
+    |> ignore
 
 [<Theory>]
 [<MemberData(nameof scenarios)>]
 let ``Compile a valid scenario using sequential type-checking`` (scenario) =
-    compileAValidScenario scenario Method.Sequential
+    compileScenario scenario Method.Sequential
+    |> shouldSucceed
+    |> ignore
+
+[<Fact>]
+let ``Compile misordered scenario using graph-based type-checking fails`` () =
+    compileScenario misorderedScenario Method.Graph
+    |> shouldFail
+    |> withErrorCodes [238; 248]
+    |> ignore
+
+[<Fact>]
+let ``Compile misordered scenario using sequential type-checking fails`` () =
+    compileScenario misorderedScenario Method.Sequential
+    |> shouldFail
+    |> withErrorCodes [238; 248]
+    |> ignore

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

@@ -1085,148 +1085,38 @@ module Y = global.Z.N
                     """
                     (set [| 0 |])
             ]
-        // New scenario: signature file erroneously follows implementation
-        // We add a backward link from implementation to signature, to correctly trigger
-        // FS0238 (implementation already given).
 
-        scenario
-            "Signature file follows implementation"
-            [
-                sourceFile
-                    "A.fs"
-                    """
-module A
-
-let a x = x + 1
-"""
-                    Set.empty
-                sourceFile
-                    "B.fs"
-                    """
-module B
-
-let b = A.a 42
-"""
-                    (set [| 0 |])
-                sourceFile
-                    "A.fsi"
-                    """
-module A
-
-val a: int -> int
-"""
-                    (set [| 0 |])
-            ]
-
-        // The .fsx script is placed in-between files to enforce a linear graph up to the script.
-        // After the script, normal dependency resolution resumes.
-
-        scenario
-    "Script file uses modules across signatures (script in-between)"
-    [
-        // 0
-        sourceFile
-            "A.fsi"
-            """
-module A
-
-type AType = class end
-"""
-            Set.empty
-
-        // 1
-        sourceFile
-            "A.fs"
-            """
-module A
-
-type AType = class end
-"""
-            (set [| 0 |]) // sequential: depends on previous file due to script later
-
-        // 2
-        sourceFile
-            "B.fsi"
-            """
-module B
-
-open A
-
-val b: AType -> unit
-"""
-            (set [| 1 |]) // sequential
-
-        // 3
-        sourceFile
-            "B.fs"
-            """
-module B
-
-open A
-
-let b (a: AType) = ()
-"""
-            (set [| 2 |]) // sequential
-
-        // 4 (script in-between)
-        sourceFile
-            "Script.fsx"
-            """
-open A
-open B
-
-let run (a: A.AType) =
-    B.b a
-"""
-            (set [| 3 |]) // sequential
-
-        // 5
-        sourceFile
-            "C.fsi"
-            """
-module C
-
-type CType = class end
-"""
-            Set.empty
-
-        // 6
-        sourceFile
-            "C.fs"
-            """
-module C
-
-type CType = class end
-"""
-            (set [| 5 |]) // normal deps: impl to own signature
-
-        // 7
-        sourceFile
-            "D.fsi"
-            """
-module D
-
-open A
-open C
-
-val d: CType -> unit
-"""
-            (set [| 0; 5 |]) // normal deps: opens A (A.fsi=0) and C (C.fsi=5)
-
-        // 8
-        sourceFile
-            "D.fs"
-            """
-module D
-
-open A
-open B
-open C
-
-let d (c: CType) =
-    let a: AType = failwith "todo"
-    b a
-"""
-            (set [| 0; 2; 5; 7 |]) // normal deps: A.fsi=0, B.fsi=2, C.fsi=5, plus own D.fsi=7
-        ]
-    ]
+    ]
+
+let internal misorderedScenario =
+    // New scenario: signature file erroneously follows implementation
+    // We add a backward link from implementation to signature, to correctly trigger
+    // FS0238 (implementation already given).
+    scenario
+        "Signature file follows implementation"
+        [
+            sourceFile
+                "A.fs"
+                """
+    module A
+
+    let a x = x + 1
+    """
+                Set.empty
+            sourceFile
+                "B.fs"
+                """
+    module B
+
+    let b = A.a 42
+    """
+                (set [| 0 |])
+            sourceFile
+                "A.fsi"
+                """
+    module A
+
+    val a: int -> int
+    """
+                (set [| 0 |])
+        ]