Make some testcases use python unittest

liling · liling · commit 4a8f2860e33b · 2007-09-28T17:19:15.000Z
diff --git a/java2python/tests/ArrayValues.java b/java2python/tests/ArrayValues.java
@@ -1,9 +1,16 @@
-	    
-class ArrayValues {
+import junit.framework.*;
+
+public class ArrayValues extends TestCase {
+
     int a[] = {1, 2, 3};
 
-    public static void main(String[] args) {
-	int b[] = {4, 5, 6};
-        System.out.println(b[0]);
+    public void testArrayValues() {
+        int b[] = {4, 5, 6};
+        Assert.assertEquals(a[0], 1);
+        Assert.assertEquals(a[1], 2);
+        Assert.assertEquals(a[2], 3);
+        Assert.assertEquals(b[0], 4);
+        Assert.assertEquals(b[1], 5);
+        Assert.assertEquals(b[2], 6);
     }
 }
diff --git a/java2python/tests/ClassMember.java b/java2python/tests/ClassMember.java
@@ -3,6 +3,12 @@
 class Simple {
     public int a = 1;
     public int [] b = new int[10];
+    public static int c = 0;
+
+    public void add() {
+        c++;
+        a++;
+    }
 }
 
 public class ClassMember extends TestCase {
@@ -13,4 +19,12 @@ public void testNonStaticMember() {
         x.b[0] = 1;
         Assert.assertEquals(y.b[0], 0);
     }
+
+    public void testStaticMember() {
+        Simple x = new Simple();
+        x.add();
+        x.add();
+        Assert.assertEquals(Simple.c, 2);
+        Assert.assertEquals(x.c, 2);
+    }
 }
diff --git a/java2python/tests/FloatFix.java b/java2python/tests/FloatFix.java
@@ -1,6 +1,8 @@
-class FloatFix {
-    public static void main(String[] args) {
-	float b = 1.2f;
-        System.out.println(b);
+import junit.framework.*;
+
+public class FloatFix extends TestCase {
+    public void runTest() {
+        float b = 1.2f;
+        Assert.assertEquals(b, 1.2f);
     }
 }
diff --git a/java2python/tests/Keywords.java b/java2python/tests/Keywords.java
@@ -1,31 +1,32 @@
-class Keywords {
-    public static void main(String[] args) {
-	String and = "this is and";
-        System.out.println(and);	
+import junit.framework.*;
 
-	String del = "this is del";
-        System.out.println(del);
+public class Keywords extends TestCase {
+    public static void main(String[] args) {
+        String and = "this is and";
+        Assert.assertEquals(and, "this is and");        
 
-	String elif = "this is elif";
-        System.out.println(elif);
+        String del = "this is del";
+        Assert.assertEquals(del, "this is del");
 
-	String in = "this is in";
-        System.out.println(in);
+        String elif = "this is elif";
+        Assert.assertEquals(elif, "this is elif");
 
-	String is = "this is is";
-        System.out.println(is);
+        String in = "this is in";
+        Assert.assertEquals(in, "this is in");
 
-	String not = "this is not";
-        System.out.println(not);
+        String is = "this is is";
+        Assert.assertEquals(is, "this is is");
 
-	String or = "this is or";
-        System.out.println(or);
+        String not = "this is not";
+        Assert.assertEquals(not, "this is not");
 
-	String print = "this is print";
-        System.out.println(print);
+        String or = "this is or";
+        Assert.assertEquals(or, "this is or");
 
-	String str = "this is str";
-        System.out.println(str);
+        String print = "this is print";
+        Assert.assertEquals(print, "this is print");
 
+        String str = "this is str";
+        Assert.assertEquals(str, "this is str");
     }
 }
diff --git a/java2python/tests/Loops.java b/java2python/tests/Loops.java
@@ -1,23 +1,25 @@
-class Loops {
-    public static void main(String[] args) {
-	for(int a = 1; a < 10;){
-	    a+= 3;
-	    System.out.println(a);
-	}
+import junit.framework.*;
 
-	for (int b = 0; b < 20; b+=2) {
-	}
+public class Loops extends TestCase {
 
-	doWhile();
+    public void testFor() {
+        for(int a = 1; a < 10;){
+            a+= 3;
+        }
+        Assert.assertEquals(a, 10);
+
+        for (int b = 0; b < 20; b+=2) {
+        }
+        Assert.assertEquals(b, 20);
     }
 
-    public static int doWhile() {
-	int x = 0;
-	do {
-	    System.out.println(x);
-	    x += 1;
-	} while (x <= 10);
-        return x;
+    public void testDoWhile() {
+        int x = 0;
+        do {
+            x += 1;
+        } while (x <= 10);
+        Assert.assertEquals(x, 11);
     }
+
 }
 
diff --git a/java2python/tests/Makefile b/java2python/tests/Makefile
@@ -1,8 +1,9 @@
 PYTHONPATH=../../:.
 CLASSPATH:=.:/usr/share/junit/lib/junit.jar
 
-PYOBJS=AssignInExpr.py EmptyArray.py Switches.py
-JAVAOBJS=AssignInExpr EmptyArray Switches
+PYOBJS=Loops.py AssignInExpr.py EmptyArray.py Switches.py ClassMember.py \
+	FloatFix.py Keywords.py
+JAVAOBJS=AssignInExpr EmptyArray Switches ClassMember
 
 all: python-test
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`		`-class FloatFix {`
`2`		`- public static void main(String[] args) {`
`3`		`- float b = 1.2f;`
`4`		`- System.out.println(b);`
	`1`	`+import junit.framework.*;`
	`2`	`+`
	`3`	`+public class FloatFix extends TestCase {`
	`4`	`+ public void runTest() {`
	`5`	`+ float b = 1.2f;`
	`6`	`+ Assert.assertEquals(b, 1.2f);`
`5`	`7`	`}`
`6`	`8`	`}`