Added six new test cases

executeTests.py

@@ -51,6 +51,12 @@
 TEST_CASE_4 = "Test Case 4: Inbuilt Command in Batch Mode -> cd"
 TEST_CASE_5 = "Test Case 5: Inbuilt Command in Interactive Mode -> exit"
 TEST_CASE_6 = "Test Case 6: Inbuilt Command in Batch Mode -> exit"
+TEST_CASE_7 = "Test Case 7: Valid ls command in Interactive Mode"
+TEST_CASE_8 = "Test Case 8: Invalid ls commmand in Interactive Mode"
+TEST_CASE_9 = "Test Case 9: Start Batch Mode with a file that does not exist"
+TEST_CASE_10 = "Test Case 10: Start Batch Mode with two valid files"
+TEST_CASE_11 = "Test Case 11: Test echo command with variable whitespaces in Interactive Mode"
+TEST_CASE_12 = "Test Case 12: Test echo command with variable whitespaces in Batch Mode"
 
 # Global variables
 totalScore = 0
@@ -292,6 +298,174 @@ def testCase6():
         print(f"{GREEN}"+TEST_CASE_6+f" - PASSED{RESET}")
         testResults[TEST_CASE_6] = PASSED_STRING
         return TEST_CASE_POINTS
+
+# TEST_CASE_7
+def testCase7():
+    global testResults
+    print(f"\n\n{PURPLE}"+TEST_CASE_7+f" ({TEST_CASE_POINTS} points){RESET}")
+    command = f"./tash < {TEST_CASES_PATH+'case'+'7.in'}"
+    returnCode, output, error = runCommandWithTimeout(command, timeout=10)
+
+    if returnCode == -1:
+        print(f"{RED}"+TEST_CASE_7+f" - FAILED (Time exceeded){RESET}")
+        testResults[TEST_CASE_7] = FAILED_TLE_STRING
+        return FAILURE_POINTS
+
+    result, expectedOutput = compareOutput(output, TEST_CASES_PATH+'case'+'7.out')
+
+    if result == 0:
+        print(f"{RED}"+TEST_CASE_7+f" - FAILED{RESET}")
+        print("Your Output:")
+        print(output)
+        print("Expected Output:")
+        print(expectedOutput)
+        testResults[TEST_CASE_7] = FAILED_STRING
+        return FAILURE_POINTS
+
+    else:
+        print(f"{GREEN}"+TEST_CASE_7+f" - PASSED{RESET}")
+        testResults[TEST_CASE_7] = PASSED_STRING
+        return TEST_CASE_POINTS
+
+# TEST_CASE_8
+def testCase8():
+    global testResults
+    print(f"\n\n{PURPLE}"+TEST_CASE_8+f" ({TEST_CASE_POINTS} points){RESET}")
+    command = f"./tash < {TEST_CASES_PATH+'case'+'8.in'}"
+    returnCode, output, error = runCommandWithTimeout(command, timeout=10)
+
+    if returnCode == -1:
+        print(f"{RED}"+TEST_CASE_8+f" - FAILED (Time exceeded){RESET}")
+        testResults[TEST_CASE_8] = FAILED_TLE_STRING
+        return FAILURE_POINTS
+
+    result, expectedOutput = compareOutput(error, TEST_CASES_PATH+'case'+'8.out')
+
+    if result == 0:
+        print(f"{RED}"+TEST_CASE_8+f" - FAILED{RESET}")
+        print("Your Output:")
+        print(output)
+        print("Expected Output:")
+        print(expectedOutput)
+        testResults[TEST_CASE_8] = FAILED_STRING
+        return FAILURE_POINTS
+
+    else:
+        print(f"{GREEN}"+TEST_CASE_8+f" - PASSED{RESET}")
+        testResults[TEST_CASE_8] = PASSED_STRING
+        return TEST_CASE_POINTS
+
+# TEST_CASE_9
+def testCase9():
+    global testResults
+    print(f"\n\n{PURPLE}"+TEST_CASE_9+f" ({TEST_CASE_POINTS} points){RESET}")
+    command = f"./tash {TEST_CASES_PATH+'case'+'does_not_exist.in'}"
+    returnCode, output, error = runCommandWithTimeout(command, timeout=10)
+
+    if returnCode == -1:
+        print(f"{RED}"+TEST_CASE_9+f" - FAILED (Time exceeded){RESET}")
+        testResults[TEST_CASE_9] = FAILED_TLE_STRING
+        return FAILURE_POINTS
+
+    result, expectedOutput = compareOutput(error, TEST_CASES_PATH+'case'+'9.out')
+
+    if result == 0:
+        print(f"{RED}"+TEST_CASE_9+f" - FAILED{RESET}")
+        print("Your Output:")
+        print(output)
+        print("Expected Output:")
+        print(expectedOutput)
+        testResults[TEST_CASE_9] = FAILED_STRING
+        return FAILURE_POINTS
+
+    else:
+        print(f"{GREEN}"+TEST_CASE_9+f" - PASSED{RESET}")
+        testResults[TEST_CASE_9] = PASSED_STRING
+        return TEST_CASE_POINTS
+
+# TEST_CASE_10
+def testCase10():
+    global testResults
+    print(f"\n\n{PURPLE}"+TEST_CASE_10+f" ({TEST_CASE_POINTS} points){RESET}")
+    command = f"./tash {TEST_CASES_PATH+'case'+'10.in'} {TEST_CASES_PATH+'case'+'10.in'}"
+    returnCode, output, error = runCommandWithTimeout(command, timeout=10)
+
+    if returnCode == -1:
+        print(f"{RED}"+TEST_CASE_10+f" - FAILED (Time exceeded){RESET}")
+        testResults[TEST_CASE_10] = FAILED_TLE_STRING
+        return FAILURE_POINTS
+
+    result, expectedOutput = compareOutput(error, TEST_CASES_PATH+'case'+'10.out')
+
+    if result == 0:
+        print(f"{RED}"+TEST_CASE_10+f" - FAILED{RESET}")
+        print("Your Output:")
+        print(output)
+        print("Expected Output:")
+        print(expectedOutput)
+        testResults[TEST_CASE_10] = FAILED_STRING
+        return FAILURE_POINTS
+
+    else:
+        print(f"{GREEN}"+TEST_CASE_10+f" - PASSED{RESET}")
+        testResults[TEST_CASE_10] = PASSED_STRING
+        return TEST_CASE_POINTS
+
+# TEST_CASE_11
+def testCase11():
+    global testResults
+    print(f"\n\n{PURPLE}"+TEST_CASE_11+f" ({TEST_CASE_POINTS} points){RESET}")
+    command = f"./tash < {TEST_CASES_PATH+'case'+'11.in'}"
+    returnCode, output, error = runCommandWithTimeout(command, timeout=10)
+
+    if returnCode == -1:
+        print(f"{RED}"+TEST_CASE_11+f" - FAILED (Time exceeded){RESET}")
+        testResults[TEST_CASE_11] = FAILED_TLE_STRING
+        return FAILURE_POINTS
+
+    result, expectedOutput = compareOutput(output, TEST_CASES_PATH+'case'+'11.out')
+
+    if result == 0:
+        print(f"{RED}"+TEST_CASE_11+f" - FAILED{RESET}")
+        print("Your Output:")
+        print(output)
+        print("Expected Output:")
+        print(expectedOutput)
+        testResults[TEST_CASE_11] = FAILED_STRING
+        return FAILURE_POINTS
+
+    else:
+        print(f"{GREEN}"+TEST_CASE_11+f" - PASSED{RESET}")
+        testResults[TEST_CASE_11] = PASSED_STRING
+        return TEST_CASE_POINTS
+
+# TEST_CASE_12
+def testCase12():
+    global testResults
+    print(f"\n\n{PURPLE}"+TEST_CASE_12+f" ({TEST_CASE_POINTS} points){RESET}")
+    command = f"./tash {TEST_CASES_PATH+'case'+'12.in'}"
+    returnCode, output, error = runCommandWithTimeout(command, timeout=10)
+
+    if returnCode == -1:
+        print(f"{RED}"+TEST_CASE_12+f" - FAILED (Time exceeded){RESET}")
+        testResults[TEST_CASE_12] = FAILED_TLE_STRING
+        return FAILURE_POINTS
+
+    result, expectedOutput = compareOutput(output, TEST_CASES_PATH+'case'+'12.out')
+
+    if result == 0:
+        print(f"{RED}"+TEST_CASE_12+f" - FAILED{RESET}")
+        print("Your Output:")
+        print(output)
+        print("Expected Output:")
+        print(expectedOutput)
+        testResults[TEST_CASE_12] = FAILED_STRING
+        return FAILURE_POINTS
+
+    else:
+        print(f"{GREEN}"+TEST_CASE_12+f" - PASSED{RESET}")
+        testResults[TEST_CASE_12] = PASSED_STRING
+        return TEST_CASE_POINTS
 
 # Main program
 # Create support folder and files
@@ -307,12 +481,18 @@ def testCase6():
 totalScore = totalScore + testCase4() # TEST_CASE_4
 totalScore = totalScore + testCase5() # TEST_CASE_5
 totalScore = totalScore + testCase6() # TEST_CASE_6
+totalScore = totalScore + testCase7() # TEST_CASE_7
+totalScore = totalScore + testCase8() # TEST_CASE_8
+totalScore = totalScore + testCase9() # TEST_CASE_9
+totalScore = totalScore + testCase10() # TEST_CASE_10
+totalScore = totalScore + testCase11() # TEST_CASE_11
+totalScore = totalScore + testCase12() # TEST_CASE_12
 
 # Print test results
 printResults(totalScore)
 
 # Cleaning
-cleanUpTestFolder()
+# cleanUpTestFolder()
 
 # Close the log file when you're done
 # logFile.close()

testcases/case10.desc

@@ -0,0 +1 @@
+Trying to execute Batch Mode with two files. This should not be allowed as per project requirements. case10.in is to be disregarded since it is not in use. Program should give an error.

testcases/case10.out

@@ -0,0 +1 @@
+An error has occurred

testcases/case11.desc

@@ -0,0 +1 @@
+Tests command with variable whitespace.

testcases/case11.in

@@ -0,0 +1,3 @@
+
+                              echo test variable whitespace!           
+exit

testcases/case11.out

@@ -0,0 +1 @@
+test variable whitespace!

testcases/case12.desc

@@ -0,0 +1 @@
+Tests command with variable whitespace.

testcases/case12.in

@@ -0,0 +1,3 @@
+
+                              echo test variable whitespace!           
+exit

testcases/case12.out

@@ -0,0 +1 @@
+test variable whitespace!

testcases/case7.desc

@@ -0,0 +1 @@
+Valid ls command. Program should give no errors.

testcases/case7.in

@@ -0,0 +1,2 @@
+ls test
+exit

testcases/case7.out

@@ -0,0 +1,4 @@
+test1
+test2
+test3
+test4

testcases/case8.desc

@@ -0,0 +1 @@
+Invalid ls command. Program should an error.

testcases/case8.in

@@ -0,0 +1,2 @@
+ls does/not/exist/bad
+exit

testcases/case8.out

@@ -0,0 +1 @@
+ls: does/not/exist/bad: No such file or directory

testcases/case9.desc

@@ -0,0 +1 @@
+Trying to execute Batch Mode with a file that does not exist. case9.in is to be disregarded since it is not in use. Program should give an error.

testcases/case9.out

@@ -0,0 +1 @@
+An error has occurred