updated test scripts to always include model.

Author: droptablestar

test/new_ast/Foreach.java

@@ -1,7 +1,7 @@
 import java.util.List;
 
 class Foreach {
-    harness void mn() {
+    public static void main(String[] args) {
     	// A[5] a = {1,2,3,4,5};
 	// assert s(a) == 15;
     }
@@ -10,17 +10,12 @@ void m(List<Object> t) {
 	    int j = 0;
 	}
     }
-    void m(List<Object> t) {
-	for (Object o : t) {
-	    int j = 0;
-	}
-    }
-    int s(A[] alist) {
-	// int sum = 0;
-	// for (A a : alist) {
-	//     sum += a.x;
-	// }
-	// return sum;
-	return 0;
-    }
+    // int s(A[] alist) {
+    // 	// int sum = 0;
+    // 	// for (A a : alist) {
+    // 	//     sum += a.x;
+    // 	// }
+    // 	// return sum;
+    // 	return 0;
+    // }
 }

test/new_ast/UninterpretedClass.java

@@ -1,6 +1,6 @@
 class UninterpretedClass {
     String s;
-    void main() {
+    harness void main() {
 
     }
 }

test/test_lib.py

@@ -10,21 +10,21 @@
 
 class TestJava(TestCommon):
     def __test(self, fs):
-        _fs = map(lambda f: os.path.join(tests, f), fs)
+        _fs = map(lambda f: os.path.join(tests, f), fs + ['../../model/'])
         ret = java_sk.main.main(_fs, '30')
         self.assertEqual(ret, 0)
 
     def test_ArrayList(self):
-        self.__test(["ArrayList_test.java", "../../model"])
+        self.__test(["ArrayList_test.java"])
 
     def test_HashMap(self):
-        self.__test(["HashMap_test.java", "../../model/"])
+        self.__test(["HashMap_test.java"])
 
     def test_String(self):
-        self.__test(["String_test.java", "../../model/"])
+        self.__test(["String_test.java"])
 
     def test_Integer(self):
-        self.__test(["Integer_test.java", "../../model/"])
+        self.__test(["Integer_test.java"])
 
     # something is wrong here i dont understand
     # def test_Float(self):

test/test_mini.py

@@ -10,8 +10,7 @@
 class TestMini(TestCommon):
 
   def __test(self, fs):
-    append_b = lambda f: os.path.join(benchmarks, f)
-    _fs = map(append_b, fs)
+    _fs = map(lambda f: os.path.join(benchmarks, f), fs + ['../../model/'])
     ret = java_sk.main.main(_fs, '30')
     self.assertEqual(ret, 0)
 

test/test_new_ast.py

@@ -10,7 +10,7 @@
 
 class TestJava(TestCommon):
     def __test(self, fs):
-        _fs = map(lambda f: os.path.join(tests, f), fs)
+        _fs = map(lambda f: os.path.join(tests, f), fs + ['../../model/'])
         ret = java_sk.main.main(_fs, '30')
         self.assertEqual(ret, 0)
 
@@ -57,7 +57,7 @@ def test_FieldFromImport(self):
         self.__test(["FieldFromImport.java"])
 
     def test_FieldGenericArg(self):
-        self.__test(["FieldGenericArg.java", "../../model/"])
+        self.__test(["FieldGenericArg.java"])
 
     def test_FieldMethod(self):
         self.__test(["FieldMethod.java"])
@@ -109,7 +109,7 @@ def test_NonLocalCalls(self):
     #     self.__test(["Override.java"])
 
     def test_PolymorphicFunctions(self):
-        self.__test(["PolymorphicFunctions.java", "../../model/"])
+        self.__test(["PolymorphicFunctions.java"])
 
     # not ready for this yet.
     # def test_PolyStuff(self):