Test: additional tests for assembler.

Author: ForNeVeR

Naggum.Test/AssemblerTests.fs

@@ -1,25 +1,38 @@
 module Naggum.Test.AssemblerTests
 
-open System
 open System.IO
-open System.Reflection
 open System.Text
 
 open Xunit
 
 open Naggum.Assembler
-open Naggum.Assembler.Representation
 
 let assemble (source : string) =
     use stream = new MemoryStream(Encoding.UTF8.GetBytes source)
     let repr = Processor.prepare "file.ngi" stream
     let assemblies = Assembler.assemble repr
-    Array.ofSeq assemblies
+    List.ofSeq assemblies
+
+let execute source =
+    let fileName = "file.exe"
+    let assembly = (Seq.exactlyOne << assemble) source
+    assembly.Save fileName
+
+    Process.run fileName
 
 [<Fact>]
 let ``Empty assembly should be assembled`` () =
     let source = "(.assembly Empty)"
     let result = assemble source
     Assert.Equal (1, result.Length)
 
-// TODO: Additional integration tests
+[<Fact>]
+let ``Hello world should be executed`` () =
+    let source = "(.assembly Hello
+  (.method Main () System.Void (.entrypoint)
+    (ldstr \"Hello, world!\")
+    (call (mscorlib System.Console WriteLine (System.String) System.Void))
+    (ret)))
+"
+    let output = execute source
+    Assert.Equal ("Hello, world!", output)

Naggum.Test/CompilerTest.fs

@@ -26,10 +26,7 @@ type CompilerTest() =
         use stream = File.Open(testPath, FileMode.Open)
         Generator.compile stream testName executablePath []
 
-        let startInfo = new ProcessStartInfo(executablePath, UseShellExecute = false, RedirectStandardOutput = true)
-        let ``process`` = Process.Start startInfo
-        ``process``.WaitForExit()
-        let result = ``process``.StandardOutput.ReadToEnd().Replace("\r\n", "\n")
+        let result = Process.run executablePath
 
         let reference = (File.ReadAllText resultPath).Replace("\r\n", "\n")
         Assert.Equal(reference, result)

Naggum.Test/Naggum.Test.fsproj

@@ -52,6 +52,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="packages.config" />
+    <Compile Include="Process.fs" />
     <Compile Include="CompilerTest.fs" />
     <Compile Include="AssemblerTests.fs" />
     <Compile Include="ProcessorTests.fs" />

Naggum.Test/Process.fs

@@ -0,0 +1,12 @@
+module Naggum.Test.Process
+
+open System.Diagnostics
+
+let run fileName =
+    // TODO: Mono check
+    let startInfo = ProcessStartInfo (fileName,
+                                      UseShellExecute = false,
+                                      RedirectStandardOutput = true)
+    use p = Process.Start startInfo
+    p.WaitForExit ()
+    p.StandardOutput.ReadToEnd().Replace ("\r\n", "\n")