am fc2da3f3: am 48fa39dc: Merge "Fix opcode tests for instance_of" into froyo
* commit 'fc2da3f3cb4b85fdd949833d80d27f6b26375939':
Fix opcode tests for instance_of
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/TestStubs.java b/tools/vm-tests/src/dot/junit/opcodes/instance_of/TestStubs.java
index 1343108..9867d92 100644
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/TestStubs.java
+++ b/tools/vm-tests/src/dot/junit/opcodes/instance_of/TestStubs.java
@@ -16,12 +16,5 @@
package dot.junit.opcodes.instance_of;
-public class TestStubs {
- @SuppressWarnings("unused")
- private class TestStub {
- // used by testVFE5
- public void foo() {
-
- }
- }
+class TestStubs {
}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/Test_instance_of.java b/tools/vm-tests/src/dot/junit/opcodes/instance_of/Test_instance_of.java
index fc27929..b0a6cc6 100644
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/Test_instance_of.java
+++ b/tools/vm-tests/src/dot/junit/opcodes/instance_of/Test_instance_of.java
@@ -24,8 +24,8 @@
import dot.junit.opcodes.instance_of.d.T_instance_of_7;
public class Test_instance_of extends DxTestCase {
-
-
+
+
/**
* @title (Object)String instanceof String
*/
@@ -60,25 +60,22 @@
}
/**
- * @title Attempt to access inaccessible class.
- */
+ * @title Attempt to access inaccessible class.
+ */
public void testE2() {
- //@uses dot.junit.opcodes.instance_of.TestStubs$TestStub
+ //@uses dot.junit.opcodes.instance_of.TestStubs
//@uses dot.junit.opcodes.instance_of.d.T_instance_of_3
try {
T_instance_of_3 tt = new T_instance_of_3();
tt.run();
- fail("expected a verification exception");
+ fail("expected IllegalAccessError");
} catch (IllegalAccessError e) {
- // expected
- } catch(VerifyError e) {
- // expected
}
}
-
+
/**
- * @title Attempt to access undefined class.
- */
+ * @title Attempt to access undefined class.
+ */
public void testE3() {
try {
T_instance_of_7 tt = new T_instance_of_7();
@@ -92,7 +89,7 @@
}
/**
- * @constraint A19
+ * @constraint A19
* @title constant pool index
*/
public void testVFE1() {
@@ -105,8 +102,8 @@
}
/**
- *
- * @constraint B1
+ *
+ * @constraint B1
* @title type of argument - int
*/
public void testVFE2() {
@@ -119,8 +116,8 @@
}
/**
- *
- * @constraint B1
+ *
+ * @constraint B1
* @title type of argument - long
*/
public void testVFE3() {
@@ -131,10 +128,10 @@
DxUtil.checkVerifyException(t);
}
}
-
+
/**
- *
- * @constraint B1
+ *
+ * @constraint B1
* @title number of registers
*/
public void testVFE4() {
@@ -146,5 +143,5 @@
}
}
-
+
}
diff --git a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.d b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.d
index 60457a1..6705dcf 100644
--- a/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.d
+++ b/tools/vm-tests/src/dot/junit/opcodes/instance_of/d/T_instance_of_3.d
@@ -26,7 +26,7 @@
.method public run()V
.limit regs 6
- instance-of v0, v5, dot/junit/opcodes/instance_of/TestStubs$TestStub
+ instance-of v0, v5, dot/junit/opcodes/instance_of/TestStubs
return-void
.end method