more testing

Author: dsyme

tests/service/FscTests.fs

@@ -125,7 +125,7 @@ let ensureDefaultFSharpCoreAvailable tmpDir  =
         File.Copy(fsCoreDefaultReference(), Path.Combine(tmpDir, Path.GetFileName(fsCoreDefaultReference())), overwrite = true)
 #endif
 
-let compile isDll debugMode (assemblyName : string) (ext: string) (code : string) (dependencies : string list) =
+let compile isDll debugMode (assemblyName : string) (ext: string) (code : string) (dependencies : string list) (extraArgs: string list) =
     let tmp = Path.Combine(Path.GetTempPath(),"test"+string(hash (isDll,debugMode,assemblyName,code,dependencies)))
     try Directory.CreateDirectory(tmp) |> ignore with _ -> ()
     let sourceFile = Path.Combine(tmp, assemblyName + "." + ext)
@@ -156,7 +156,10 @@ let compile isDll debugMode (assemblyName : string) (ext: string) (code : string
 
             yield sprintf "--out:%s" outFile
 
+            yield! extraArgs
+
             yield sourceFile
+
         |]
 
     ensureDefaultFSharpCoreAvailable tmp
@@ -172,7 +175,7 @@ let compile isDll debugMode (assemblyName : string) (ext: string) (code : string
 //sizeof<nativeint>
 let compileAndVerify isDll debugMode assemblyName ext code dependencies =
     let verifier = new PEVerifier ()
-    let outFile = compile isDll debugMode assemblyName ext code dependencies 
+    let outFile = compile isDll debugMode assemblyName ext code dependencies  []
     verifier.Verify outFile
     outFile
 
@@ -293,7 +296,8 @@ module Bar
 
 """    
     try
-        compile false PdbOnly "Bar" "fs" code [] |> ignore
+        let outFile : string = compile false PdbOnly "Bar" "fs" code [] [] 
+        ()
     with
     | :? CompilationError as exn  ->
             Assert.AreEqual(6,exn.Data2.[0].StartLineAlternate)
@@ -305,7 +309,8 @@ let ``Check cols are indexed by 1`` () =
     let code = "let x = 1 + a"
 
     try
-        compile false PdbOnly "Foo" "fs" code [] |> ignore
+        let outFile : string = compile false PdbOnly "Foo" "fs" code [] []
+        ()
     with
     | :? CompilationError as exn  ->
             Assert.True(exn.Data2.[0].ToString().Contains("Foo.fs (1,13)-(1,14)"))
@@ -320,7 +325,8 @@ let ``Check compile of bad fsx`` () =
     """
 
     try
-        compile false PdbOnly "Foo" "fsx" code [] |> ignore
+        let outFile : string = compile false PdbOnly "Foo" "fsx" code [] []
+        ()
     with
     | :? CompilationError as exn  ->
             Assert.True(exn.Data2.[0].ToString().Contains("Could not load file '"))
@@ -329,6 +335,21 @@ let ``Check compile of bad fsx`` () =
     | _  -> failwith "No compilation error"
 
 
+[<Test>]
+let ``Check compile of good fsx with bad option`` () =
+    let code = """
+let x = 1
+    """
+
+    try
+        let outFile : string = compile false PdbOnly "Foo" "fsx" code []  ["-r:missing.dll"]
+        ()
+    with
+    | :? CompilationError as exn  ->
+            Assert.True(exn.Data2.[0].ToString().Contains("startup (1,1)-(1,81) parameter error Could not resolve this reference"))
+    | _  -> failwith "No compilation error"
+
+
 #if STRESS
 // For this stress test the aim is to check if we have a memory leak
 
@@ -348,7 +369,8 @@ type C() =
 let x = 3 + 4
 """
 
-        compile true PdbOnly "Foo" code [] |> ignore
+        let outFile : string = compile true PdbOnly "Foo" "fs" code [] []
+        ()
 
 #endif
 

tests/service/ProjectOptionsTests.fs

@@ -439,24 +439,40 @@ let ``Project file parsing -- report files``() =
     for f in Directory.EnumerateFiles(dir41,"*",SearchOption.AllDirectories) do 
      printfn "File: %s" f
 
+[<Test>]
+let ``Test OtherOptions order for GetProjectOptionsFromScript`` () = 
+    let test scriptName expected2 =
+        let scriptPath = __SOURCE_DIRECTORY__ + @"/data/ScriptProject/" + scriptName + ".fsx"
+        let scriptSource = File.ReadAllText scriptPath
+        let projOpts = checker.GetProjectOptionsFromScript(scriptPath, scriptSource) |> Async.RunSynchronously
+
+        projOpts.OtherOptions
+        |> Array.map Path.GetFileNameWithoutExtension
+        |> shouldEqual  expected2
+    let otherArgs = [|"--noframework"; "3"; "System.Numerics"; "mscorlib"; "System"; "System.Xml"; "System.Runtime.Remoting"; "System.Runtime.Serialization.Formatters.Soap"; "System.Data"; "System.Drawing"; "System.Core"; "System.Runtime"; "System.Linq"; "System.Reflection"; "System.Linq.Expressions"; "System.Threading.Tasks"; "System.IO"; "System.Net.Requests"; "System.Collections"; "System.Runtime.Numerics"; "System.Threading"; "System.Web"; "System.Web.Services"; "System.Windows.Forms"; "FSharp.Compiler.Interactive.Settings"|]
+    test "Main1" otherArgs
+    test "Main2" otherArgs
+    test "Main3" otherArgs
+    test "Main4" otherArgs
+    test "MainBad" otherArgs
+
+
 #endif
 
 [<Test>]
 let ``Test ProjectFileNames order for GetProjectOptionsFromScript`` () = // See #594
     let test scriptName expected =
         let scriptPath = __SOURCE_DIRECTORY__ + @"/data/ScriptProject/" + scriptName + ".fsx"
         let scriptSource = File.ReadAllText scriptPath
-        let projOpts =
-            checker.GetProjectOptionsFromScript(scriptPath, scriptSource)
-            |> Async.RunSynchronously
+        let projOpts = checker.GetProjectOptionsFromScript(scriptPath, scriptSource) |> Async.RunSynchronously
         projOpts.ProjectFileNames
         |> Array.map Path.GetFileNameWithoutExtension
-        |> (=) expected
-        |> shouldEqual true
-    test "Main1" [|"BaseLib1"; "Lib1"; "Lib2"; "Main1"|]
-    test "Main2" [|"BaseLib1"; "Lib1"; "Lib2"; "Lib3"; "Main2"|]
-    test "Main3" [|"Lib3"; "Lib4"; "Main3"|]
-    test "Main4" [|"BaseLib2"; "Lib5"; "BaseLib1"; "Lib1"; "Lib2"; "Main4"|]
+        |> shouldEqual  expected
+    test "Main1" [|"BaseLib1"; "Lib1"; "Lib2"; "Main1"|] 
+    test "Main2" [|"BaseLib1"; "Lib1"; "Lib2"; "Lib3"; "Main2"|] 
+    test "Main3" [|"Lib3"; "Lib4"; "Main3"|] 
+    test "Main4" [|"BaseLib2"; "Lib5"; "BaseLib1"; "Lib1"; "Lib2"; "Main4"|] 
+    test "MainBad" [|"MainBad"|] 
 
 #endif
 

tests/service/data/ScriptProject/MainBad.fsx

@@ -0,0 +1,2 @@
+#load "NotExist1.fsx"
+#r "NotExist.dll"