From 3c42d6f898c2c178dd5008600f1577733befc85e Mon Sep 17 00:00:00 2001
From: Nicholas Robinson <nwrobins@edu.uwaterloo.ca>
Date: Fri, 28 Feb 2020 13:40:26 -0500
Subject: [PATCH] Test.py only output errors
---
Test.py | 44 +++++++++++++++++++++++++++++---------------
TypeNodes.py | 2 +-
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/Test.py b/Test.py
index 351b0a1..0ce269b 100644
--- a/Test.py
+++ b/Test.py
@@ -40,16 +40,27 @@ def a2Multiple():
testCases = [f.path for f in scandir(testDirectory) if f.is_dir()]
for c in testCases:
- print("**********************************************************")
- print("DIRECTORY")
- print(c)
- print("**********************************************************")
+ # print("**********************************************************")
+ # print("DIRECTORY")
+ # print(c)
+ # print("**********************************************************")
# get all files from stdlib folder
testFiles = [join(dp, f) for dp, dn, filenames in walk('stdlib/2.0/java/') for f in filenames]
# get all files in the folder recursively
testFiles += [join(dp, f) for dp, dn, filenames in walk(c) for f in filenames]
- run(testFiles)
- print("\n \n\n ")
+ ret = run(testFiles)
+ if ret == "":
+ # print(c)
+ if 'Je_' in c:
+ print(c)
+ print("JE Passed without error")
+ print("**********************************************************")
+ else:
+ if not 'Je_' in c:
+ print(c)
+ print(ret)
+ print("**********************************************************")
+ # print("\n \n\n ")
@@ -57,7 +68,7 @@ def run(testFiles):
parseTrees = []
for f in testFiles:
- print(f)
+ # print(f)
content = open(f, "r").read()
# Scanning
@@ -65,6 +76,7 @@ def run(testFiles):
# Error in Scanning
if tokens is None:
+ print(f)
print("ERROR in Scanning: " + error)
print("**********************************************************")
continue
@@ -79,6 +91,7 @@ def run(testFiles):
# No weeds if everything is good (weeds = None)
weeds = Weeding.fileNameCheck(tokens, f)
if weeds:
+ print(f)
print("ERROR in Weeding after Scanning:")
print(weeds)
print("**********************************************************")
@@ -94,7 +107,7 @@ def run(testFiles):
# Error in Parsing
if tree is None:
- # print(f)
+ print(f)
print("ERROR in Parsing: " + error.args[0])
# for n in error.args[1]: # the parse tree
# print(n)
@@ -103,8 +116,8 @@ def run(testFiles):
parseTrees.append((f, tree))
- print("Scan and Parse Succeeded")
- print("**********************************************************")
+ # print("Scan and Parse Succeeded")
+ # print("**********************************************************")
ASTs = astBuild(parseTrees)
@@ -119,9 +132,9 @@ def run(testFiles):
buildEnvAndLink(ASTs)
except Exception as e:
# print(testFiles)
- print("error at environment building and linking")
- print(e)
- return
+ # print("error at environment building and linking")
+ # print(e)
+ return "buildEnvAndLink: " + e.args[0]
# print("<<<<------- after buildEnvAndLink -------->>>>>>")
# for (n, t) in ASTs:
@@ -130,7 +143,8 @@ def run(testFiles):
# t.printTree()
# print("\n \n\n \n")
- print("Succeeded")
- print("**********************************************************")
+ # print("Succeeded")
+ # print("**********************************************************")
+ return ""
main()
diff --git a/TypeNodes.py b/TypeNodes.py
index 2e6ab12..744c1e2 100644
--- a/TypeNodes.py
+++ b/TypeNodes.py
@@ -126,7 +126,7 @@ class ClassNode(ASTNode):
# check if not acyclic
if self.name in hierarchy:
- raise Exception("ERROR: The hierarchy is not acyclic '{}'".format(hierarchy))
+ raise Exception("ERROR: The hierarchy is not acyclic '{}', saw '{}'".format(hierarchy, self.name))
hierarchy.append(self.name)
# get contains
contains = self.methods
--
GitLab