Merge branch 'dev'

Author: OlegZee

.gitignore

@@ -6,6 +6,7 @@ build/
 testrunner/
 [Oo]bj/
 [Bb]in/
+[Bb]ackup/
 _ReSharper*/
 _UpgradeReport*
 

XakeLibTests/ActionTests.fs

@@ -0,0 +1,270 @@
+module ``action block allows``
+
+open NUnit.Framework
+open Xake
+
+
+let makeStringList() = new System.Collections.Generic.List<string>()
+let DebugOptions = {ExecOptions.Default with FailOnError = true; FileLog = ""}
+
+[<Test>]
+let ``executes the body``() =
+
+    let wasExecuted = ref false
+    
+    do xake DebugOptions {
+      phony "main" (action {
+        wasExecuted := true
+      })
+    }
+
+    Assert.IsTrue(!wasExecuted)
+
+[<Test>]
+let ``execution is ordered``() =
+
+    let wasExecuted = ref false
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+    
+    do xake DebugOptions {
+      phony "main" (action {
+        do note "1"
+        wasExecuted := true
+        do note "2"
+      })
+    }
+
+    do note "3"
+
+    Assert.IsTrue(!wasExecuted)
+    Assert.That(errorlist, Is.EquivalentTo(["1"; "2"; "3"]))
+
+[<Test>]
+let ``allows async operations``() =
+
+    let wasExecuted = ref false
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+
+    do xake DebugOptions {
+      phony "main" (action {
+        do! async {note "1"}
+        wasExecuted := true
+        do! async {note "2"}
+        do note "3"
+      })
+    }
+
+    do note "4"
+
+    Assert.IsTrue(!wasExecuted)
+    Assert.That(errorlist, Is.EqualTo(["1"; "2"; "3"; "4"]))
+
+[<Test>]
+let ``do! action``() =
+
+    let wasExecuted = ref false
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+
+    let noteAction t = action {do note t}
+    
+    do xake DebugOptions {
+      phony "main" (action {
+        do! noteAction "1"
+        wasExecuted := true
+        do! noteAction "2"
+        do note "3"
+      })
+    }
+
+    do note "4"
+
+    Assert.IsTrue(!wasExecuted)
+    Assert.That(errorlist, Is.EqualTo(["1"; "2"; "3"; "4"]))
+
+
+[<Test>]
+let ``do! action with result ignored``() =
+
+    let wasExecuted = ref false
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+
+    let testee t =
+        action {
+            do note t
+            return t
+        }
+    
+    do xake DebugOptions {
+      phony "main" (action {
+        do! (testee "1") |> Action.Ignore
+        wasExecuted := true
+        do! testee "2" |> Action.Ignore
+        do note "3"
+      })
+    }
+
+    do note "4"
+
+    Assert.IsTrue(!wasExecuted)
+    Assert.That(errorlist, Is.EqualTo(["1"; "2"; "3"; "4"] |> List.toArray))
+
+
+[<Test>]
+let ``let! returning value``() =
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+
+    let testee t =
+        action {
+            return t
+        }
+    
+    do xake DebugOptions {
+      phony "main" (action {
+        let! s1 = testee "1"
+        do note s1
+        let! s2 = testee ("2+" + s1)
+        do note s2
+        do note "3"
+      })
+    }
+
+    Assert.That(errorlist, Is.EqualTo(["1"; "2+1"; "3"] |> List.toArray))
+
+[<Test>]
+let ``if of various kinds``() =
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+
+    let iif f a b =
+        action {
+            return if f then a else b
+        }
+    
+    do xake DebugOptions {
+      phony "main" (action {
+        if true then
+            do note "i1-t"
+        else
+            do note "i1-f"
+
+        if false then
+            ()
+        else
+            do note "i2-f"
+
+        let! s1 = iif true "2" "2f"
+        let! s1 = if s1 = "2" then iif true "2" "2f" else action {return "2"}
+        do note s1
+        do note "3"
+      })
+    }
+
+    Assert.That(errorlist, Is.EqualTo(["i1-t"; "i2-f"; "2"; "3"] |> List.toArray))
+
+[<Test>]
+let ``if without else``() =
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+
+    let iif f a b =
+        action {
+            return if f then a else b
+        }
+    
+    do xake DebugOptions {
+
+      phony "main" (action {
+        if true then
+            do note "i1-t"
+
+        let! s1 = iif true "2" "2f"
+        if s1 = "2" then
+            do note "3"
+
+        for _ in [1..5] do
+            ()
+        
+        do note "4"
+      })
+    }
+
+    Assert.That(errorlist, Is.EqualTo(["i1-t"; "3"; "4"] |> List.toArray))
+
+[<Test>]
+let ``for and while``() =
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+
+    do xake DebugOptions {
+
+      phony "main" (action {
+
+        let! s1 = action {return "122"}
+        let s2 = s1
+        do note "1"
+
+        for i in [1..3] do
+            do! trace Info "%A" i
+            do note (sprintf "i=%i" i)
+
+        let j = ref 3
+        while !j < 5 do
+            do note (sprintf "j=%i" !j)
+            j := !j + 1
+        
+        do note "4"
+      })
+    }
+
+    Assert.That(errorlist, Is.EqualTo(["1"; "i=1"; "i=2"; "i=3"; "j=3"; "j=4"; "4"] |> List.toArray))
+
+[<Test; Explicit>]
+let ``try catch finally``() =
+
+    let errorlist = makeStringList()
+    let note = errorlist.Add
+
+    do xake DebugOptions {
+
+      phony "main" (action {
+
+        let! s1 = action {return "122"}
+        do note s1
+
+        note "before try"
+
+//        try
+//           printfn "Body executed"
+//           do note "try"
+//        finally
+//           printfn "Finally executed"
+//           do note "finally"
+
+//        try
+//            failwith "ee"
+//        with e ->
+//            do note e.Message
+        
+        do note "4"
+      })
+    }
+
+    // "2222"; "ee"; 
+    printfn "%A" errorlist
+    Assert.That(errorlist, Is.EqualTo(["122"; "try"; "finally"; "4"] |> List.toArray))
+
+// TODO use!, try with exception within action
+

XakeLibTests/CommandLineTests.fs

@@ -5,13 +5,14 @@ open NUnit.Framework
 
 open Xake
 
-[<TestFixture (Description = "Command line tests")>]
-type CommandLineTests() =
+[<TestFixture>]
+type ``Command line interface``() =
 
     let currentDir = Path.Combine (__SOURCE_DIRECTORY__, "../bin")
+    let XakeOptions = ExecOptions.Default
 
-    [<Test (Description = "Verifies reading common switches")>]
-    member test.AcceptKnownSwitches() =
+    [<Test>]
+    member test.``accepts various switches``() =
 
         let scriptOptions = ref XakeOptions
         let args =
@@ -37,8 +38,8 @@ type CommandLineTests() =
         Assert.AreEqual(Verbosity.Loud, finalOptions.ConLogLevel)
         Assert.AreEqual([("AA", "BBB"); ("AA1", "CCC")], finalOptions.Vars)
 
-    [<Test (Description = "Verifies reading target list")>]
-    member test.ReadsTargets() =
+    [<Test>]
+    member test.``reads target lists``() =
 
         let scriptOptions = ref XakeOptions
         let executed2 = ref false
@@ -63,17 +64,17 @@ type CommandLineTests() =
         Assert.IsTrue !executed2
 
 
-    [<Test (Description = "Verifies reading incorrect"); Ignore>]
-    member test.WarnsOnIncorrectSwitch() =
+    [<Test; Ignore>]
+    member test.``warns on incorrect switch``() =
 
         do xakeArgs ["/xxx"] XakeOptions {
             want ["ss"]
         }
 
         //raise <| new System.NotImplementedException()
 
-    [<Test (Description = "Verifies that command line is ignored when Ignore option is set")>]
-    member test.IgnoresCommandLine() =
+    [<Test>]
+    member test.``supports ignoring command line``() =
 
         let scriptOptions = ref XakeOptions
         let args =

XakeLibTests/FileTasksTests.fs

@@ -10,12 +10,12 @@ open Xake.FileTasks
 open Xake.Storage
 
 [<TestFixture>]
-type FileTasksTests() = 
+type ``File tasks module``() = 
 
-    let TestOptions = {XakeOptions with Threads = 1; Targets = ["main"]; ConLogLevel = Chatty; FileLogLevel = Silent}
+    let TestOptions = {ExecOptions.Default with Threads = 1; Targets = ["main"]; ConLogLevel = Chatty; FileLogLevel = Silent}
 
     [<Test>]
-    member this.DeleteSimple() =
+    member this.``allows delete file``() =
         "." </> ".xake" |> File.Delete
 
         let execCount = ref 0
@@ -38,7 +38,7 @@ type FileTasksTests() =
         Assert.IsFalse <| File.Exists ("samplefile")
 
     [<Test>]
-    member this.DeleteByMask() =
+    member this.``allows delete file by mask``() =
         "." </> ".xake" |> File.Delete
         let execCount = ref 0
 
@@ -61,7 +61,7 @@ type FileTasksTests() =
         ["$$1"; "$$2"] |> List.iter (Assert.IsFalse << File.Exists)
 
     [<Test>]
-    member this.DeleteMany() =
+    member this.``allows to delete by several masks``() =
         "." </> ".xake" |> File.Delete
         do xake TestOptions {
             rules [
@@ -80,14 +80,14 @@ type FileTasksTests() =
         ["$aa"; "$bb"] |> List.iter (Assert.IsFalse << File.Exists)
 
     [<Test>]
-    member this.CopySimple() =
+    member this.``supports simple file copy``() =
         "." </> ".xake" |> File.Delete
         do xake TestOptions {
             rules [
               "main" => action {
-                  do! writeLog Error "Running inside 'main' rule"
+                  do! trace Error "Running inside 'main' rule"
                   do! need ["aaa"; "clean"]
-                  do! cp "aaa" "aaa-copy"
+                  do! copyFile "aaa" "aaa-copy"
               }
 
               "clean" => action {