commit fef2a2947258a6e25b860061151932ff83fa81a2
author Ian Rogers <irogers@google.com> Fri Jan 11 10:43:01 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 11 10:43:02 2013 -0800
tree 63533599834ad4faba68e79c74bf59506e9cf49d
parent dd0c4b81d611893f1a8cb6c613be8955219cc40d
parent e41931a27c0a9818c06d26621c05af9e4e187503

Merge "Move Invoke to a run-test." into dalvik-dev

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 314b25a..6214adf 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -430,7 +430,6 @@
 	\
 	ExceptionTest \
 	IntMath \
-	Invoke \
 	ParallelGC \
 	ReferenceMap \
 	StackWalk \

test/105-invoke/expected.txt

diff --git a/test/105-invoke/expected.txt b/test/105-invoke/expected.txt
new file mode 100644
index 0000000..e0ffebd
--- /dev/null
+++ b/test/105-invoke/expected.txt
@@ -0,0 +1 @@
+invoke PASSED

test/105-invoke/info.txt

diff --git a/test/105-invoke/info.txt b/test/105-invoke/info.txt
new file mode 100644
index 0000000..fa794de
--- /dev/null
+++ b/test/105-invoke/info.txt
@@ -0,0 +1 @@
+Tests simple method dispatch.

test/105-invoke/src/Main.java

diff --git a/test/Invoke/Invoke.java b/test/105-invoke/src/Main.java
similarity index 96%
rename from test/Invoke/Invoke.java
rename to test/105-invoke/src/Main.java
index e8c30ef..d5f3b62 100644
--- a/test/Invoke/Invoke.java
+++ b/test/105-invoke/src/Main.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-class Invoke implements InvokeInterface {
+class Main implements InvokeInterface {
 
     int virI_I(int a) {
         return a + 123;
@@ -69,7 +69,7 @@
     }
 
     static int invoke(int a) {
-        Invoke foo = new Invoke();
+        Main foo = new Main();
 
         return foo.virI_I(a) +
                foo.virI_II(a, 1) +