add tests for array as return + little fixes

tito · tito · commit 61ff03cbe428 · 2012-08-12T21:23:56.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
 .PHONY: test
 
 tests:
-	$(MAKE) -C src/tests/javawrapper
+	$(MAKE) -C src/tests/javawrapper all
diff --git a/recipes/android/src/java.pyx b/recipes/android/src/java.pyx
@@ -101,7 +101,6 @@ cdef class JavaClass(object):
             raise JavaException('Invalid call, number of argument'
                     ' mismatch for constructor')
 
-        cdef jmethodID constructor
         try:
             # convert python arguments to java arguments
             if len(args):
diff --git a/src/tests/javawrapper/Makefile b/src/tests/javawrapper/Makefile
@@ -1,13 +1,18 @@
-.PHONY: all
+.PHONY: all build clean tests
 
-all:
-	-rm -rf ../../../dist/javawrapper
+clean:
+	-rm -rf ../../../dist/javawrapper;
+
+build:
 	cd ../../.. && ./distribute.sh -d 'javawrapper' -m 'kivy'
 	cp -a javawrapper ../../../dist/javawrapper/src/org/
+
+tests:
 	cd ../../../dist/javawrapper/ && ./build.py \
 		--package org.pythonandroid.test \
 		--name TestJavaWrapper --version 1 \
 		--private ../../src/tests/javawrapper/python \
 		--permission VIBRATE \
-		debug installd 
-	adb logcat
+		debug installd && adb logcat -c && adb logcat
+
+all: clean build tests
diff --git a/src/tests/javawrapper/javawrapper/Test.java b/src/tests/javawrapper/javawrapper/Test.java
@@ -46,4 +46,51 @@ public class Test {
 	public float fieldF = 1.23456789f;
 	public double fieldD = 1.23456789;
 	public String fieldString = new String("helloworld");
+
+	public boolean[] methodArrayZ() {
+		boolean[] x = new boolean[3];
+		x[0] = x[1] = x[2] = true;
+		return x;
+	};
+	public byte[] methodArrayB() {
+		byte[] x = new byte[3];
+		x[0] = x[1] = x[2] = 127;
+		return x;
+	};
+	public char[] methodArrayC() {
+		char[] x = new char[3];
+		x[0] = x[1] = x[2] = 'k';
+		return x;
+	};
+	public short[] methodArrayS() {
+		short[] x = new short[3];
+		x[0] = x[1] = x[2] = 32767;
+		return x;
+	};
+	public int[] methodArrayI() {
+		int[] x = new int[3];
+		x[0] = x[1] = x[2] = 2147483467;
+		return x;
+	};
+	public long[] methodArrayJ() {
+		long[] x = new long[3];
+		x[0] = x[1] = x[2] = 2147483467;
+		return x;
+	};
+	public float[] methodArrayF() {
+		float[] x = new float[3];
+		x[0] = x[1] = x[2] = 1.23456789f;
+		return x;
+	};
+	public double[] methodArrayD() {
+		double[] x = new double[3];
+		x[0] = x[1] = x[2] = 1.23456789;
+		return x;
+	};
+	public String[] methodArrayString() {
+		String[] x = new String[3];
+		x[0] = x[1] = x[2] = new String("helloworld");
+		return x;
+	};
+
 }
diff --git a/src/tests/javawrapper/python/main.py b/src/tests/javawrapper/python/main.py
@@ -14,6 +14,16 @@ class Test(JavaClass):
     methodD = JavaMethod('()D')
     methodString = JavaMethod('()Ljava/lang/String;')
 
+    methodArrayZ = JavaMethod('()[Z')
+    methodArrayB = JavaMethod('()[B')
+    methodArrayC = JavaMethod('()[C')
+    methodArrayS = JavaMethod('()[S')
+    methodArrayI = JavaMethod('()[I')
+    methodArrayJ = JavaMethod('()[J')
+    methodArrayF = JavaMethod('()[F')
+    methodArrayD = JavaMethod('()[D')
+    methodArrayString = JavaMethod('()[Ljava/lang/String;')
+
     methodStaticZ = JavaStaticMethod('()Z')
     methodStaticB = JavaStaticMethod('()B')
     methodStaticC = JavaStaticMethod('()C')
@@ -95,4 +105,15 @@ def do(msg, value, want):
 do('field double', test.fieldD, 1.23456789)
 do('field String', test.fieldString, 'helloworld')
 
+print '-- test methods with array return'
+do('method bool', test.methodArrayZ(), [True] * 3)
+do('method byte', test.methodArrayB(), [127] * 3)
+do('method char', test.methodArrayC(), ['k'] * 3)
+do('method short', test.methodArrayS(), [32767] * 3)
+do('method int', test.methodArrayI(), [2147483467] * 3)
+do('method long', test.methodArrayJ(), [2147483467] * 3)
+do('method float', test.methodArrayF(), [1.23456789] * 3)
+do('method double', test.methodArrayD(), [1.23456789] * 3)
+do('method String', test.methodArrayString(), ['helloworld'] * 3)
+
 print '--------------- ENDTESTS ----------------'
