Adding more exploration for execution paths.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 65c5cd75c40e302c044d005d1d7cc24d49af58ad..d54f1963b0b7086c924ff5f84eac3f698edb5961 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -368,7 +368,7 @@ extractorFile.close()
 Extractor.close()
 F1.close()
 #Run the file to extract the objects
-os.system("groovy Extractor/extractorFile.groovy")
+os.system("groovy -classpath lib/jpf.jar Extractor/extractorFile.groovy")
 
 
 #Save the extracted methods and app2 in a same file to extract information
@@ -389,7 +389,7 @@ for line in F2:
 extractorFile.close()
 Extractor.close()
 F2.close()
-os.system("groovy Extractor/extractorFile.groovy")
+os.system("groovy -classpath lib/jpf.jar Extractor/extractorFile.groovy")
 
 
 

diff --git a/Runner.py b/Runner.py
index 9c2da707ff75911e62a88c7ca8b9cfe3181190d2..e82d1c2f1534f7a60e4da261a0ac9404d7968fa8 100644 (file)
--- a/Runner.py
+++ b/Runner.py
@@ -229,11 +229,24 @@ for line in App2:
                Out.write("\t"+line)
 Out.write("}\n")
 Out.write("\n")
-Out.write("@Field def app1 = new App1(this)\n")
-Out.write("@Field def app2 = new App2(this)\n")
-Out.write("app1.installed()\n")
-Out.write("app2.installed()\n")
-Out.write("\n")
+Out.write("@Field def app1\n")
+Out.write("@Field def app2\n")
+Out.write("def initOrder = Verify.getBoolean()\n")
+Out.write("if (initOrder) {\n")
+Out.write("\tapp1 = new App1(this)\n")
+Out.write("\tapp2 = new App2(this)\n")
+Out.write("} else {\n")
+Out.write("\tapp2 = new App2(this)\n")
+Out.write("\tapp1 = new App1(this)\n")
+Out.write("}\n\n")
+Out.write("def installOrder = Verify.getBoolean()\n")
+Out.write("if (installOrder) {\n")
+Out.write("\tapp1.installed()\n")
+Out.write("\tapp2.installed()\n")
+Out.write("} else {\n")
+Out.write("\tapp1.installed()\n")
+Out.write("\tapp2.installed()\n")
+Out.write("}\n\n")
 for line in eventSimulator:
        Out.write(line)
 Out.close()