Merge branch 'master' of ssh://github.com/java2script/java2script

Author: Andrew Lee

tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/AllBasicTests.java

@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2017 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Udo Borkowski - initial implementation
+ *******************************************************************************/
+
+package net.sf.j2s.test.junit.basic;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class AllBasicTests extends TestCase {
+	
+	public static Test suite() {
+		TestSuite suite = new TestSuite("All Basic Tests");
+
+		suite.addTestSuite(FieldInitTest.class);
+		suite.addTestSuite(OverloadTest.class);
+		suite.addTestSuite(SubclassTest.class);
+		suite.addTestSuite(ThisTest.class);
+
+		return suite;
+	}
+}

tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/FieldInitTest.java

@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2017 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Udo Borkowski - initial implementation
+ *******************************************************************************/
+
+package net.sf.j2s.test.junit.basic;
+
+import junit.framework.TestCase;
+import net.sf.j2s.test.junit.sample.CF;
+import net.sf.j2s.test.junit.sample.CF1;
+import net.sf.j2s.test.junit.util.Output;
+
+public class FieldInitTest extends TestCase {
+
+	/**
+	 * The field is initialized before the constructor is called.
+	 */
+	public void testFieldFirst() {
+		Output.clear();
+
+		new CF();
+		
+		assertEquals("F(\"CF.f\")\nCF()\n", Output.text());
+	}
+
+	/**
+	 * The field and constructor of the superclass are handled before
+	 * the field and constructor of a subclass.
+	 */
+	public void testSuperClassFirst() {
+		Output.clear();
+
+		new CF1();
+		
+		assertEquals("F(\"CF.f\")\nCF()\nF(\"CF1.f\")\nCF1()\n", Output.text());
+	}
+}

tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/OverloadTest.java

@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2017 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Udo Borkowski - initial implementation
+ *******************************************************************************/
+
+package net.sf.j2s.test.junit.basic;
+
+import junit.framework.TestCase;
+import net.sf.j2s.test.junit.sample.C;
+import net.sf.j2s.test.junit.sample.CF;
+import net.sf.j2s.test.junit.sample.CF1;
+import net.sf.j2s.test.junit.util.Output;
+
+public class OverloadTest extends TestCase {
+
+	/**
+	 * The correct constructor is called when overloaded, here "String".
+	 */
+	public void testOverloadedConstructorString() {
+		Output.clear();
+
+		new C("A");
+
+		assertEquals("C(\"A\")\n", Output.text());
+	}
+	
+	/**
+	 * The correct constructor is called when overloaded, here "int".
+	 */
+	public void testOverloadedConstructorInt() {
+		Output.clear();
+
+		new C(1);
+
+		assertEquals("C(1)\n", Output.text());
+	}
+	
+	/**
+	 * The correct constructor is called when overloaded, here "long".
+	 */
+	public void testOverloadedConstructorLong() {
+		Output.clear();
+
+		new C(2L);
+
+		assertEquals("C((long)2)\n", Output.text());
+	}
+	
+	/**
+	 * The correct constructor is called when overloaded, here "float".
+	 */
+	public void testOverloadedConstructorFloat() {
+		Output.clear();
+
+		new C(1.2f);
+
+		assertEquals("C((float)1.2)\n", Output.text());
+	}
+	
+	/**
+	 * The correct constructor is called when overloaded, here "double".
+	 */
+	public void testOverloadedConstructorDouble() {
+		Output.clear();
+
+		new C(1.3);
+
+		assertEquals("C((double)1.3)\n", Output.text());
+	}
+	
+	/**
+	 * The correct constructor is called when overloaded, here "boolean".
+	 */
+	public void testOverloadedConstructorBoolean() {
+		Output.clear();
+
+		new C(true);
+
+		assertEquals("C(true)\nC.baz()\n", Output.text());
+	}
+	
+	
+}

tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/SubclassTest.java

@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2017 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Udo Borkowski - initial implementation
+ *******************************************************************************/
+
+package net.sf.j2s.test.junit.basic;
+
+import junit.framework.TestCase;
+import net.sf.j2s.test.junit.sample.C1;
+import net.sf.j2s.test.junit.util.Output;
+
+public class SubclassTest extends TestCase {
+
+	/**
+	 * A call in a superclass constructor to an overridden method ("foo")
+	 * runs the method in the subclass.
+	 */
+	public void testSuperClassConstructorCallsOverridingMethod() {
+		Output.clear();
+
+		new C1();
+		assertEquals("C()\nC1.foo()\nC.bar()\nC1()\n", Output.text());
+	}
+	
+	/**
+	 * A call in a superclass constructor to a private method ("baz") does 
+	 * not run a (public) subclass method with the same signature but the
+	 * method in the superclass.
+	 *  
+	 */
+	public void testSuperClassConstructorCallsPrivatePseudoOverriddenMethod() {
+		Output.clear();
+
+		new C1(true);
+		assertEquals("C(true)\nC.baz()\nC1(true)\nC1.baz()\n", Output.text());
+	}
+}
+
+

tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/ThisTest.java

@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2017 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Udo Borkowski - initial implementation
+ *******************************************************************************/
+
+package net.sf.j2s.test.junit.basic;
+
+import junit.framework.TestCase;
+import net.sf.j2s.test.junit.sample.C;
+import net.sf.j2s.test.junit.sample.C2;
+import net.sf.j2s.test.junit.sample.CF;
+import net.sf.j2s.test.junit.sample.CF1;
+import net.sf.j2s.test.junit.util.Output;
+
+public class ThisTest extends TestCase {
+
+	/**
+	 * The correct overload is called when using "this(...)" in a constructor, here "float".
+	 */
+	public void testThisCallWithFloat() {
+		Output.clear();
+
+		new C2(); // calls "this(1.3f)"
+
+		assertEquals("C()\nC.foo()\nC.bar()\nC2((float)1.3)\nC2()-end\n", Output.text());
+	}
+}

tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/sample/C.java

@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2017 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Udo Borkowski - initial implementation
+ *******************************************************************************/
+
+package net.sf.j2s.test.junit.sample;
+
+import net.sf.j2s.test.junit.util.Output;
+
+public class C {
+
+	public C() {
+		Output.add("C()\n");
+		foo();
+		bar();
+	}
+	
+	public C(String string) {
+		Output.add("C(\""+string+"\")\n");
+	}
+	
+	public C(int n) {
+		Output.add("C("+n+")\n");
+	}
+
+	public C(long n) {
+		Output.add("C((long)"+n+")\n");
+	}
+
+	public C(float n) {
+		Output.add("C((float)"+n+")\n");
+	}
+
+	public C(double n) {
+		Output.add("C((double)"+n+")\n");
+	}
+
+	public C(boolean b) {
+		Output.add("C("+b+")\n");
+		baz();
+	}
+
+	public void foo() {
+		Output.add("C.foo()\n");
+	}
+
+	public void bar() {
+		Output.add("C.bar()\n");
+	}
+	
+	private void baz() {
+		Output.add("C.baz()\n");
+	}
+}

tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/sample/C1.java

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2017 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Udo Borkowski - initial implementation
+ *******************************************************************************/
+
+package net.sf.j2s.test.junit.sample;
+
+import net.sf.j2s.test.junit.util.Output;
+
+public class C1 extends C {
+	
+	public C1() {
+		Output.add("C1()\n");
+	}
+
+	public C1(boolean b) {
+		super(b);
+		Output.add("C1("+b+")\n");
+		baz();
+	}
+
+	public void foo() {
+		Output.add("C1.foo()\n");
+	}
+
+	public void baz() {
+		Output.add("C1.baz()\n");
+	}
+
+}

tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/sample/C2.java

@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2017 java2script.org and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Udo Borkowski - initial implementation
+ *******************************************************************************/
+
+package net.sf.j2s.test.junit.sample;
+
+import net.sf.j2s.test.junit.util.Output;
+
+public class C2 extends C {
+	
+	public C2() {
+		this(1.3f);
+		Output.add("C2()-end\n");
+	}
+
+	public C2(float n) {
+		Output.add("C2((float)"+n+")\n");
+	}
+
+	public C2(double n) {
+		Output.add("C2((double)"+n+")\n");
+	}
+
+
+}