@@ -0,0 +1,17 @@
+import junit.framework.*;
+
+class SimpleClassInit {
+    static int x = 1;
+
+    static {
+        x = 2;
+    }
+
+}
+
+public class ClassInit extends TestCase {
+
+    public void testClassInit() {
+        Assert.assertEquals(SimpleClassInit.x, 2);
+    }
+}
@@ -1,8 +1,10 @@
 import junit.framework.*;
 
 public class FloatFix extends TestCase {
-    public void runTest() {
+
+    public void testFloatFix() {
         float b = 1.2f;
         Assert.assertEquals(b, 1.2f);
     }
+
 }
@@ -1,9 +1,13 @@
 import junit.framework.*;
 
 public class Keywords extends TestCase {
-    public static void main(String[] args) {
+    public static String None = "this is None";
+    public static String and = "this is and";
+
+    public void testKeywords() {
         String and = "this is and";
         Assert.assertEquals(and, "this is and");        
+        Assert.assertEquals(Keywords.and, "this is and");        
 
         String del = "this is del";
         Assert.assertEquals(del, "this is del");
@@ -12,7 +16,7 @@ public static void main(String[] args) {
         Assert.assertEquals(elif, "this is elif");
 
         String from = "this is from";
-        Assert.assertEquals(elif, "this is from");
+        Assert.assertEquals(from, "this is from");
 
         String in = "this is in";
         Assert.assertEquals(in, "this is in");
@@ -34,6 +38,6 @@ public static void main(String[] args) {
 
         String None = "this is None";
         Assert.assertEquals(None, "this is None");
-
+        Assert.assertEquals(Keywords.None, "this is None");
     }
 }
@@ -3,12 +3,14 @@
 public class Loops extends TestCase {
 
     public void testFor() {
-        for(int a = 1; a < 10;){
+        int a, b;
+
+        for(a = 1; a < 10;){
             a+= 3;
         }
         Assert.assertEquals(a, 10);
 
-        for (int b = 0; b < 20; b+=2) {
+        for (b = 0; b < 20; b+=2) {
         }
         Assert.assertEquals(b, 20);
     }
 
@@ -2,8 +2,9 @@ PYTHONPATH=../../:.
 CLASSPATH:=.:/usr/share/junit/lib/junit.jar
 
 PYOBJS=Loops.py AssignInExpr.py EmptyArray.py Switches.py ClassMember.py \
-	FloatFix.py Keywords.py
-JAVAOBJS=AssignInExpr EmptyArray Switches ClassMember
+	FloatFix.py Keywords.py ClassInit.py SuperCtorTest.py
+JAVAOBJS=Loops AssignInExpr EmptyArray Switches ClassMember FloatFix Keywords \
+	ClassInit SuperCtorTest
 
 all: python-test
 
 
@@ -0,0 +1,62 @@
+import junit.framework.*;
+
+class SuperClass {
+    public int x = 0;
+    public String y = null;
+
+    public SuperClass() {
+        x = 1;
+    }
+
+    public SuperClass(String arg) {
+        y = arg;
+    }
+
+    public SuperClass(int arg) {
+        x = arg;
+    }
+}
+
+class SuperCtorTest1 extends SuperClass {
+	public SuperCtorTest1() {
+    }
+}
+
+
+class SuperCtorTest2 extends SuperClass {
+	public SuperCtorTest2() {
+		super();
+	}
+}
+
+
+class SuperCtorTest3 extends SuperClass {
+	public SuperCtorTest3() {
+		super("arg");
+	}
+}
+
+class SuperCtorTest4 extends SuperClass {
+	public SuperCtorTest4(int arg) {
+		super(arg);
+	}
+}
+
+public class SuperCtorTest extends TestCase {
+    
+    public void testSuperCtor() {
+        SuperCtorTest1 t1 = new SuperCtorTest1();
+        Assert.assertEquals(1, t1.x);
+
+        SuperCtorTest2 t2 = new SuperCtorTest2();
+        Assert.assertEquals(1, t2.x);
+
+        SuperCtorTest3 t3 = new SuperCtorTest3();
+        Assert.assertEquals("arg", t3.y);
+        Assert.assertEquals(0, t3.x);
+
+        SuperCtorTest4 t4 = new SuperCtorTest4(10);
+        Assert.assertEquals(10, t4.x);
+    }
+
+}
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`import junit.framework.*;`
`2`	`2`
`3`	`3`	`public class FloatFix extends TestCase {`
`4`		`- public void runTest() {`
	`4`	`+`
	`5`	`+ public void testFloatFix() {`
`5`	`6`	`float b = 1.2f;`
`6`	`7`	`Assert.assertEquals(b, 1.2f);`
`7`	`8`	`}`
	`9`	`+`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,14 @@`
`3`	`3`	`public class Loops extends TestCase {`
`4`	`4`
`5`	`5`	`public void testFor() {`
`6`		`- for(int a = 1; a < 10;){`
	`6`	`+ int a, b;`
	`7`	`+`
	`8`	`+ for(a = 1; a < 10;){`
`7`	`9`	`a+= 3;`
`8`	`10`	`}`
`9`	`11`	`Assert.assertEquals(a, 10);`
`10`	`12`
`11`		`- for (int b = 0; b < 20; b+=2) {`
	`13`	`+ for (b = 0; b < 20; b+=2) {`
`12`	`14`	`}`
`13`	`15`	`Assert.assertEquals(b, 20);`
`14`	`16`	`}`