Merge pull request #317 from juergenhoetzel/test-code-cleanup

FSI tests: Code cleanup

Author: juergenhoetzel

test/expression.fsx

@@ -0,0 +1 @@
+1 + 1;;

test/fsi-tests.el

@@ -29,45 +29,36 @@
 (require 'fsharp-mode)
 
 (defun fsi-tests-wait-for-regex (timeout regexp)
-  (while (and (> timeout 0) (not (progn (goto-char (point-min)) (search-forward-regexp regexp nil t))))
-    (message "[FSI Interactive] Waiting a bit...")
-    (accept-process-output (get-buffer-process (current-buffer)) 0.2)
-    (setq timeout (1- timeout))))
+  (let ((start-time (float-time)))
+    (while (and (< (- (float-time) start-time) timeout)
+                (not (progn (goto-char (point-min)) (search-forward-regexp regexp nil t))))
+      (if (accept-process-output (get-buffer-process (current-buffer)) 0.2)
+          (message "[FSI Interactive] received output...")
+        (message "[FSI Interactive] waiting for output...")))))
 
 
 (describe "F# interactive"
-          :before-all (run-fsharp inferior-fsharp-program)
-          :before-each (with-current-buffer (get-buffer inferior-fsharp-buffer-name)
-                         (comint-clear-buffer))
-          (it "can eval expressions"
-              (let ((fsharp-autosave-on-file-load t)
-                    (fsx-file (make-temp-file "fsi" nil ".fsx" "
-1 + 1;;
-")))
-                (with-current-buffer (find-file-noselect fsx-file)
-                  (fsharp-eval-region (point-min) (point-max))
-                  (with-current-buffer (get-buffer inferior-fsharp-buffer-name)
-                    (fsi-tests-wait-for-regex 25 "it: int = 2$")
-                    (let ((result (match-string-no-properties 0)))
-                      (expect result :to-equal "it: int = 2"))))))
-          (it "can load nuget references"
-              (let ((fsharp-autosave-on-file-load t)
-                    (timeout 50)
-                    (fsx-file (make-temp-file "fsi" nil ".fsx" "
-#r \"nuget: Newtonsoft.Json\";;
-open Newtonsoft.Json;;
-
-let o = {| X = 2; Y = \"Hello\" |};;
-
-printfn \"xxx:%s:xxx\" (JsonConvert.SerializeObject o);;")))
-                (with-current-buffer (find-file-noselect fsx-file)
-                  (fsharp-load-buffer-file)
-                  (with-current-buffer (get-buffer inferior-fsharp-buffer-name)
-                    (fsi-tests-wait-for-regex 25 "xxx:\\(.*\\):xxx")
-                    (let ((json-str (match-string-no-properties 1)))
-                      (unless json-str
-                        (warn "FSI output doesn't contain marker: %s" (buffer-substring-no-properties (point-min) (point-max))))
-                      (expect json-str :to-equal "{\"X\":2,\"Y\":\"Hello\"}")))))))
+  :before-all (run-fsharp inferior-fsharp-program)
+  :before-each (with-current-buffer (get-buffer inferior-fsharp-buffer-name)
+                 (comint-clear-buffer))
+  (it "can eval expressions"
+    (with-current-buffer (find-file-noselect "test/expression.fsx")
+      (fsharp-eval-region (point-min) (point-max))
+      (with-current-buffer (get-buffer inferior-fsharp-buffer-name)
+        (fsi-tests-wait-for-regex 25 "it: int = 2$")
+        (let ((result (match-string-no-properties 0)))
+          (expect result :to-equal "it: int = 2")))))
+  (it "can load nuget references"
+    (let ((timeout 50)
+          (fsx-file "test/nuget.fsx"))
+      (with-current-buffer (find-file-noselect fsx-file)
+        (fsharp-load-buffer-file)
+        (with-current-buffer (get-buffer inferior-fsharp-buffer-name)
+          (fsi-tests-wait-for-regex 25 "xxx:\\(.*\\):xxx")
+          (let ((json-str (match-string-no-properties 1)))
+            (unless json-str
+              (warn "FSI output doesn't contain marker: %s" (buffer-substring-no-properties (point-min) (point-max))))
+            (expect json-str :to-equal "{\"X\":2,\"Y\":\"Hello\"}")))))))
 
 (provide 'fsi-tests)
 ;;; fsi-tests.el ends here

test/nuget.fsx

@@ -0,0 +1,6 @@
+#r "nuget: Newtonsoft.Json";;
+open Newtonsoft.Json;;
+
+let o = {| X = 2; Y = "Hello" |};;
+
+printfn "xxx:%s:xxx" (JsonConvert.SerializeObject o);;