All tests passing.

Troy Melhase · Troy Melhase · commit ee76cf75d98d · 2011-10-16T23:26:06.000Z
diff --git a/test/Class11.java b/test/Class11.java
@@ -0,0 +1,14 @@
+class Class11 {
+    Integer x = 0;
+
+    String any() {
+	return x.toString();
+    }
+
+    public static void main(String[] args) {
+	Class11 c = new Class11();
+        System.out.println( c.any() );
+    }
+
+
+}
diff --git a/test/Class7.java b/test/Class7.java
@@ -21,9 +21,9 @@ public static void main(String[] args) {
 	System.out.println(a);
 	System.out.println(b);
 
-	Class7 c = new Class7();
-	c.x();
-	c.y();
-	c.z(3);
+	Class7 d = new Class7();
+	d.x();
+	d.y();
+	d.z(3);
     }
 }
diff --git a/test/Makefile b/test/Makefile
@@ -5,7 +5,7 @@ j2py = ../bin/j2py
 
 
 python_files := $(addsuffix .py, $(notdir $(basename $(wildcard *.java))))
-test_targets := $(notdir $(basename $(wildcard *.java)))
+test_targets := $(sort $(notdir $(basename $(wildcard *.java))))
 
 
 .PHONY: all clean
@@ -34,7 +34,7 @@ parsers:
 
 
 %.py: %.class
-	@$(j2py) -i $(addsuffix .java, $(basename $@)) -o $@ -d configs
+	@$(j2py) -i $(addsuffix .java, $(basename $@)) -o $@ -c configs/__init__.py -d configs
 
 %: %.py
 	@bash -c "diff -q <($(python) $(addsuffix .py, $@)) <(java -ea $@)" && echo "[PASS] $@"
diff --git a/test/configs/GenericPairs.py b/test/configs/GenericPairs.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from java2python.config import default
+
+
+moduleOutputSubs = default.moduleOutputSubs + [
+    (r'import java\.util', r''),
+    (r'first\ \=\ T\(\)', 'first = None'),
+    (r'second\ \=\ S\(\)', 'second = None'),
+]
diff --git a/test/configs/__init__.py b/test/configs/__init__.py
@@ -5,6 +5,7 @@
 
 modulePrologueHandlers = default.modulePrologueHandlers + [
     'from configs.overloading import overloaded',
+    'from abc import ABCMeta, abstractmethod',
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ public static void main(String[] args) {`
`21`	`21`	`System.out.println(a);`
`22`	`22`	`System.out.println(b);`
`23`	`23`
`24`		`- Class7 c = new Class7();`
`25`		`- c.x();`
`26`		`- c.y();`
`27`		`- c.z(3);`
	`24`	`+ Class7 d = new Class7();`
	`25`	`+ d.x();`
	`26`	`+ d.y();`
	`27`	`+ d.z(3);`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`modulePrologueHandlers = default.modulePrologueHandlers + [`
`7`	`7`	`'from configs.overloading import overloaded',`
	`8`	`+ 'from abc import ABCMeta, abstractmethod',`
`8`	`9`	`]`
`9`	`10`
`10`	`11`