Merge branch 'master' of github.com:Araq/Nimrod

3 files changed, 37 insertions, 0 deletions

diff --git a/tests/specials.nim b/tests/specials.nim
index a1aa1bc5a..ea3e58fbf 100644
--- a/tests/specials.nim
+++ b/tests/specials.nim
@@ -128,12 +128,19 @@ proc rejectThreadTests(r: var TResults, options: string) =
   rejectSingleTest(r, "tests/threads/tthreadanalysis3", options)
   rejectSingleTest(r, "tests/threads/tthreadheapviolation1", options)
 
+# ------------------------- IO tests -----------------------------------
+
+proc runIOTests(r: var TResults, options: string) =
+  compileSingleTest(r, "tests/system/helpers/readall_echo.nim", options)
+  runSingleTest(r, "tests/system/io", options)
+
 # ------------------------- register special tests here -----------------------
 proc runSpecialTests(r: var TResults, options: string) =
   runRodFiles(r, options)
   runDLLTests(r, options)
   runGCTests(r, options)
   runThreadTests(r, options & " --threads:on")
+  runIOTests(r, options)
 
 proc rejectSpecialTests(r: var TResults, options: string) =
   rejectThreadTests(r, options)
diff --git a/tests/system/helpers/readall_echo.nim b/tests/system/helpers/readall_echo.nim
new file mode 100644
index 000000000..2890217ef
--- /dev/null
+++ b/tests/system/helpers/readall_echo.nim
@@ -0,0 +1 @@
+echo(stdin.readAll)
diff --git a/tests/system/io.nim b/tests/system/io.nim
new file mode 100644
index 000000000..4837f7093
--- /dev/null
+++ b/tests/system/io.nim
@@ -0,0 +1,29 @@
+discard """output: '''[OK] stdin
+
+[OK] file'''"""
+
+import
+  unittest, osproc, streams, os, readall_echo
+const STRING_DATA = """Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."""
+const TEST_FILE = "tests/testdata/string"
+
+proc echoLoop(str: string): string =
+  result = ""
+  var process = startProcess(os.addFileExt("tests/system/helpers/readall_echo", ExeExt))
+  var input = process.inputStream
+  input.write(str)
+  input.close()
+  var output = process.outputStream
+  discard process.waitForExit
+  while not output.atEnd:
+    result.add(output.readLine)
+    
+suite "io":
+  suite "readAll":
+    test "stdin":
+      check:
+        echoLoop(STRING_DATA) == STRING_DATA
+        echoLoop(STRING_DATA[0..3999]) == STRING_DATA[0..3999]
+    test "file":
+      check:
+        readFile(TEST_FILE) == STRING_DATA