Merge branch 'master' into master

BobHanson · web-flow · commit d69135e60fe3 · 2018-02-17T06:50:48.000-06:00
diff --git a/tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/AllBasicTests.java b/tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/AllBasicTests.java
@@ -24,6 +24,7 @@ public static Test suite() {
 		suite.addTestSuite(OverloadTest.class);
 		suite.addTestSuite(SubclassTest.class);
 		suite.addTestSuite(ThisTest.class);
+		suite.addTestSuite(VarArgsTest.class);
 
 		return suite;
 	}
diff --git a/tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/VarArgsTest.java b/tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/basic/VarArgsTest.java
@@ -45,6 +45,15 @@ public void testVarArgsNotEmpty() {
 		assertEquals("ints: 4 7 9 ", s);
 	}
 	
+	/**
+	 * Call a varArgs method with some "float" arguments, to check if
+	 * the correct overload ("float ..." vs. "int ...") is selected.
+	 */
+	public void testVarArgsNotEmpty_WithFloat() {
+		String s = new CVarArgs().fVarArgsInt(4.0f,7,9);
+		assertEquals("floats: 4.0 7.0 9.0 ", s);
+	}
+	
 	/**
 	 * Call a varArgs method with some arguments (via array).
 	 */
diff --git a/tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/sample/CVarArgs.java b/tests/net.sf.j2s.test.junit/src/net/sf/j2s/test/junit/sample/CVarArgs.java
@@ -9,6 +9,20 @@ public String fVarArgsInt(int... ns) {
 		return result;
 	}
 	
+	/**
+	 * Attention: DON'T change the "misleading" method name (e.g. to "<code>fVarArgsFloat</code>").
+	 * 
+	 * <p> This method is used to check for ambiguity resolution of methods with same name and 
+	 * different var args types (<code>int...</code> vs <code>float...</code>)
+	 */
+	public String fVarArgsInt(float... ns) {
+		String result = "floats: ";
+		for (int i = 0; i < ns.length; i++) {
+			result += ns[i] + " ";
+		}
+		return result;
+	}
+	
 	public String fStringVarArgsInt(String s, int... ns) {
 		String result = s;
 		for (int i = 0; i < ns.length; i++) {

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public static Test suite() {`
`24`	`24`	`suite.addTestSuite(OverloadTest.class);`
`25`	`25`	`suite.addTestSuite(SubclassTest.class);`
`26`	`26`	`suite.addTestSuite(ThisTest.class);`
	`27`	`+ suite.addTestSuite(VarArgsTest.class);`
`27`	`28`
`28`	`29`	`return suite;`
`29`	`30`	`}`