[java2python] r180 committed - All tests passing.

[java2...@googlecode.com]

Revision: 180
Author: troy.melhase
Date: Sun Oct 16 16:26:06 2011
Log: All tests passing.
http://code.google.com/p/java2python/source/detail?r=180

Added:
/trunk/test/Class11.java
/trunk/test/configs/GenericPairs.py
Modified:
/trunk/test/Class7.java
/trunk/test/Makefile
/trunk/test/configs/__init__.py

=======================================
--- /dev/null
+++ /trunk/test/Class11.java Sun Oct 16 16:26:06 2011
@@ -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() );
+ }
+
+
+}
=======================================
--- /dev/null
+++ /trunk/test/configs/GenericPairs.py Sun Oct 16 16:26:06 2011
@@ -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'),
+]
=======================================
--- /trunk/test/Class7.java Mon Jul 5 12:10:57 2010
+++ /trunk/test/Class7.java Sun Oct 16 16:26:06 2011
@@ -21,9 +21,9 @@
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);
}
}
=======================================
--- /trunk/test/Makefile Thu Aug 12 11:20:01 2010
+++ /trunk/test/Makefile Sun Oct 16 16:26:06 2011
@@ -5,7 +5,7 @@

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 @@

%.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] $@"
=======================================
--- /trunk/test/configs/__init__.py Wed Jul 28 01:49:35 2010
+++ /trunk/test/configs/__init__.py Sun Oct 16 16:26:06 2011
@@ -5,6 +5,7 @@

modulePrologueHandlers = default.modulePrologueHandlers + [
'from configs.overloading import overloaded',
+ 'from abc import ABCMeta, abstractmethod',
]