Testing now supports testing for JAPL exceptions... kinda

.gitignore

@@ -18,8 +18,9 @@ src/lexer
 src/vm
 tests/runtests
 testresults.txt
-testoutput.txt
+.testoutput.txt
 .tempcode.jpl
+.tempcode_drEHdZuwNYLqsQaMDMqeNRtmqoqXBXfnCfeqEcmcUYJToBVQkF.jpl
 .tempoutput.txt
 
 # MacOS

tests/japl/hello.jpl

@@ -0,0 +1,4 @@
+print("Hello, world.");
+//output:Hello, world.
+
+//output:

tests/japl/hellojapl.jpl

@@ -0,0 +1,4 @@
+print("Hello, JAPL.");
+//output:Hello, JAPL.
+
+//output:

tests/japl/nan.jpl

@@ -0,0 +1,5 @@
+print((5/0)*0);
+
+//output:nan
+
+//output:

tests/japl/read_in_own_init.jpl

@@ -0,0 +1,4 @@
+var a = 1; { var a = a; }
+//output:A fatal error occurred while compiling '', line 1, at ';' -> cannot read local variable in its own initializer
+
+//output:

tests/japl/undefname.jpl

@@ -0,0 +1,8 @@
+var a = b;
+//output:Traceback (most recent call last):
+
+//output:  File '', line 1, in '<module>':
+
+//output:ReferenceError: undefined name 'b'
+
+//output:

tests/japl/unsup_binary_intstr.jpl

@@ -0,0 +1,8 @@
+var a = 2 + "hey";
+//output:Traceback (most recent call last):
+
+//output:  File '', line 1, in '<module>':
+
+//output:TypeError: unsupported binary operator '+' for objects of type 'integer' and 'string'
+
+//output:

tests/maketest.nim

@@ -20,7 +20,7 @@
 # Imports nim tests as well
 import multibyte, os, strformat, times, re, terminal, strutils
 
-const tempCodeFile = ".tempcode.jpl"
+const tempCodeFile = ".tempcode_drEHdZuwNYLqsQaMDMqeNRtmqoqXBXfnCfeqEcmcUYJToBVQkF.jpl"
 const tempOutputFile = ".tempoutput.txt"
 
 proc autoremove(path: string) =
@@ -45,41 +45,47 @@ when isMainModule:
     echo "Please enter the JAPL code or specify a file containing it with file:<path>"
 
     let response = stdin.readLine()
-    var codepath: string
     if response =~ re"^file:(.*)$":
-        codepath = matches[0]
+        let codepath = matches[0]
+        writeFile(tempCodeFile, readFile(codepath))
     else:
         writeFile(tempCodeFile, response)
-        codepath = tempCodeFile
 
-    let japlCode = readFile(codepath)
-    discard execShellCmd(&"{japlExec} {codepath} > testoutput.txt")
-    let output = readFile(tempOutputFile)
+    let japlCode = readFile(tempCodeFile)
+    discard execShellCmd(&"{japlExec} {tempCodeFile} > {tempOutputFile} 2>&1")
+    var output: string
+    if fileExists(tempOutputFile):
+        output = readFile(tempOutputFile)
+    else:
+        echo "Temporary output file not detected, aborting"
+        quit(1)
     autoremove(tempCodeFile) 
     autoremove(tempOutputFile)
         
     echo "Got the following output:"
     echo output                
     echo "Do you want to keep it as a test? [y/N]"
-    let keep = ($stdin.readChar()).toLower() == "y"
+    let keepResponse = ($stdin.readLine()).toLower()
+    let keep = keepResponse[0] == 'y'
     if keep:
         block saving:
             while true:
-                echo "Please name the test"
+                echo "Please name the test (without the .jpl extension)"
                 let testname = stdin.readLine()
                 if testname == "":
                     echo "aborted"
                     break saving # I like to be explicit
                 let testpath = testsDir / testname & ".jpl"
+                echo &"Generating test at {testpath}"
                 var testContent = japlCode
-                for line in output.lines:
-                    testContent = testContent & "\n" & "//output:" & line & "\n"
+                for line in output.split('\n'):
+                    var mline = line
+                    mline = mline.replace(tempCodeFile, "")
+                    testContent = testContent & "\n" & "//output:" & mline & "\n"
                 if fileExists(testpath):
                     echo "Test already exists"
                 else:
                     writeFile(testpath, testContent)
-                    echo &"Test generated at {testpath}"
-
-
-
-
+                    break saving
+    else:
+        echo "Aborting"

tests/runtests.nim

@@ -22,7 +22,10 @@
 
 
 # Imports nim tests as well
-import multibyte, os, strformat, times, re, terminal
+import multibyte, os, strformat, times, re, terminal, strutils
+
+const tempOutputFile = ".testoutput.txt"
+const testResultsPath = "testresults.txt"
 
 
 # Exceptions for tests that represent not-yet implemented behaviour
@@ -47,17 +50,25 @@ proc compileExpectedOutput(path: string): string =
             result &= matches[0] & "\n"
 
 
-proc deepComp(left, right: string): tuple[same: bool, place: int] =
+proc deepComp(left, right: string, path: string): tuple[same: bool, place: int] =
+    var mleft, mright: string
     result.same = true
     if left.high() != right.high():
-        result.same = false
-    for i in countup(0, left.high()):
+        if left.replace(path, "").high() == right.replace(path, "").high():
+            mleft = left.replace(path, "")
+            mright = right.replace(path, "")
+        else:
+            result.same = false
+    else:
+        mleft = left
+        mright = right
+    for i in countup(0, mleft.high()):
         result.place = i
-        if i > right.high():
+        if i > mright.high():
             # already false because of the len check at the beginning
             # already correct place because it's updated every i
             return
-        if left[i] != right[i]:
+        if mleft[i] != mright[i]:
             result.same = false
             return
 
@@ -106,20 +117,20 @@ proc main(testsDir: string, japlExec: string, testResultsFile: File): tuple[numO
                     skippedTests += subTestResult.skippedTests
                     break singleTest
                 detail(&"Running test '{file.path}'")
-                if fileExists("testoutput.txt"):
-                    removeFile("testoutput.txt") # in case this crashed
-                let retCode = execShellCmd(&"{japlExec} {file.path} >> testoutput.txt")
+                if fileExists(tempOutputFile):
+                    removeFile(tempOutputFile) # in case this crashed
+                let retCode = execShellCmd(&"{japlExec} {file.path} > {tempOutputFile} 2>&1")
                 numOfTests += 1
                 if retCode != 0:
                     failedTests += 1
                     error(&"Test '{file.path}' has crashed!")
                 else:
                     let expectedOutput = compileExpectedOutput(file.path).replace(re"(\n*)$", "")
-                    let realOutputFile = open("testoutput.txt", fmRead)
+                    let realOutputFile = open(tempOutputFile, fmRead)
                     let realOutput = realOutputFile.readAll().replace(re"([\n\r]*)$", "")
                     realOutputFile.close()
-                    removeFile("testoutput.txt")
-                    let comparison = deepComp(expectedOutput, realOutput)
+                    removeFile(tempOutputFile)
+                    let comparison = deepComp(expectedOutput, realOutput, file.path)
                     if comparison.same:
                         successTests += 1
                         log(&"Test '{file.path}' was successful")
@@ -139,7 +150,7 @@ proc main(testsDir: string, japlExec: string, testResultsFile: File): tuple[numO
 
 
 when isMainModule:
-    let testResultsFile = open("testresults.txt", fmWrite)
+    let testResultsFile = open(testResultsPath, fmWrite)
     template log (msg: string) =
         logWithLevel(LogLevel.Info, testResultsFile, msg)
     log("Running Nim tests")