Mercurial > hg > graal-jvmci-8
changeset 11405:25161615539b
method rename to avoid ambiguous overloading
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 23 Aug 2013 13:25:57 +0200 |
parents | aaf95ab77bf5 |
children | 1688781c0238 |
files | graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java |
diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Fri Aug 23 13:22:22 2013 +0200 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Fri Aug 23 13:25:57 2013 +0200 @@ -354,11 +354,11 @@ if (runtime == null) { return; } - test(method, expect, receiver, args); + testAgainstExpected(method, expect, receiver, args); } - protected void test(Method method, Result expect, Object receiver, Object... args) { - test(method, expect, Collections.<DeoptimizationReason> emptySet(), receiver, args); + protected void testAgainstExpected(Method method, Result expect, Object receiver, Object... args) { + testAgainstExpected(method, expect, Collections.<DeoptimizationReason> emptySet(), receiver, args); } protected Result executeActualCheckDeopt(Method method, Set<DeoptimizationReason> shouldNotDeopt, Object receiver, Object... args) { @@ -390,7 +390,7 @@ } } - protected void test(Method method, Result expect, Set<DeoptimizationReason> shouldNotDeopt, Object receiver, Object... args) { + protected void testAgainstExpected(Method method, Result expect, Set<DeoptimizationReason> shouldNotDeopt, Object receiver, Object... args) { Result actual = executeActualCheckDeopt(method, shouldNotDeopt, receiver, args); assertEquals(expect, actual); }
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Fri Aug 23 13:22:22 2013 +0200 +++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/JTTTest.java Fri Aug 23 13:25:57 2013 +0200 @@ -103,10 +103,10 @@ Result expect = executeExpected(method, receiver, args); - test(method, expect, shouldNotDeopt, receiver, args); + testAgainstExpected(method, expect, shouldNotDeopt, receiver, args); if (args.length > 0) { this.argsToBind = args; - test(method, expect, shouldNotDeopt, receiver, args); + testAgainstExpected(method, expect, shouldNotDeopt, receiver, args); this.argsToBind = null; } }