CTS: Fix & amend VM tests
Refactor the VM tests to be slightly more maintainable and precise.
Fix errors uncovered by refactoring. Add tests for b/17207857.
Bug: 17207857, 17266951, 17264206, 17287529
Change-Id: I753c568e1417eea9582dd45c965da0dbd6ffa01b
diff --git a/tools/vm-tests-tf/src/dot/junit/DxAbstractMain.java b/tools/vm-tests-tf/src/dot/junit/DxAbstractMain.java
index d40fb94..dac6dcf 100644
--- a/tools/vm-tests-tf/src/dot/junit/DxAbstractMain.java
+++ b/tools/vm-tests-tf/src/dot/junit/DxAbstractMain.java
@@ -17,15 +17,104 @@
package dot.junit;
public class DxAbstractMain {
-
+
+ /* NOTE: Because of how tests are generated, this is replicated between
+ * this class and DxTestCase.
+ */
+
+ private static void checkError(Class<?> expectedErrorClass, Throwable thrown,
+ boolean in_invocation_exc) {
+ if (expectedErrorClass != null && thrown == null) {
+ fail("Expected error of type " + expectedErrorClass);
+ } else if (expectedErrorClass == null && thrown != null) {
+ fail("Unexpected error " + thrown);
+ } else if (expectedErrorClass != null && thrown != null) {
+ if (in_invocation_exc) {
+ if (!(thrown instanceof java.lang.reflect.InvocationTargetException)) {
+ fail("Expected invocation target exception, but got " + thrown);
+ }
+ thrown = thrown.getCause();
+ }
+ if (!expectedErrorClass.equals(thrown.getClass())) {
+ thrown.printStackTrace(System.err);
+ fail("Expected error of type " + expectedErrorClass + ", but got " +
+ thrown.getClass());
+ }
+ }
+ }
+
+ /**
+ * Try to load the class with the given name, and check for the expected error.
+ */
+ public static Class<?> load(String className, Class<?> expectedErrorClass) {
+ try {
+ Class<?> c = Class.forName(className);
+ checkError(expectedErrorClass, null, false);
+ return c;
+ } catch (Throwable t) {
+ if (expectedErrorClass != null) {
+ checkError(expectedErrorClass, t, false);
+ } else {
+ t.printStackTrace(System.err);
+ fail("Could not load class " + className + ": " + t);
+ }
+ return null;
+ }
+ }
+
+ /**
+ * Try to load the class with the given name, find the "run" method and run it.
+ * If expectedErrorClass is not null, check for an exception of that class.
+ */
+ public static void loadAndRun(String className, boolean isStatic, boolean wrapped,
+ Class<?> expectedErrorClass, Object... args) {
+ Class<?> c = load(className, null);
+
+ java.lang.reflect.Method method = null;
+ // We expect only ever one declared method named run, but don't know the arguments. So
+ // search for one.
+ for (java.lang.reflect.Method m : c.getDeclaredMethods()) {
+ if (m.getName().equals("run")) {
+ method = m;
+ break;
+ }
+ }
+ if (method == null) {
+ fail("Could not find method 'run'");
+ }
+
+ Object receiver = null;
+ if (!isStatic) {
+ try {
+ receiver = c.newInstance();
+ } catch (Exception exc) {
+ fail("Could not instantiate " + className + ": " + exc.getMessage());
+ }
+ }
+
+ try {
+ method.invoke(receiver, args);
+ checkError(expectedErrorClass, null, false);
+ } catch (Throwable t) {
+ checkError(expectedErrorClass, t, wrapped);
+ }
+ }
+
+ public static void loadAndRun(String className, Class<?> expectedErrorClass) {
+ loadAndRun(className, false, true, expectedErrorClass);
+ }
+
+ public static void loadAndRun(String className, Class<?> expectedErrorClass, Object... args) {
+ loadAndRun(className, false, true, expectedErrorClass, args);
+ }
+
static public void assertEquals(int expected, int actual) {
if (expected != actual) throw new RuntimeException("AssertionFailedError: not equals. Expected " + expected + " actual " + actual);
}
-
+
static public void assertEquals(String message, int expected, int actual) {
if (expected != actual) throw new RuntimeException("AssertionFailedError: not equals: " + message + " Expected " + expected + " actual " + actual);
}
-
static public void assertEquals(long expected, long actual) {
if (expected != actual) throw new RuntimeException("AssertionFailedError: not equals. Expected " + expected + " actual " + actual);
@@ -34,7 +123,7 @@
static public void assertEquals(double expected, double actual, double delta) {
if(!(Math.abs(expected-actual) <= delta)) throw new RuntimeException("AssertionFailedError: not within delta");
}
-
+
static public void assertEquals(Object expected, Object actual) {
if (expected == null && actual == null)
return;
@@ -42,26 +131,24 @@
return;
throw new RuntimeException("AssertionFailedError: not the same");
}
-
+
static public void assertTrue(boolean condition) {
if (!condition) throw new RuntimeException("AssertionFailedError: condition was false");
}
-
+
static public void assertFalse(boolean condition) {
if (condition) throw new RuntimeException("AssertionFailedError: condition was true");
}
-
+
static public void assertNotNull(Object object) {
if (object == null) throw new RuntimeException("AssertionFailedError: object was null");
}
-
+
static public void assertNull(Object object) {
if (object != null) throw new RuntimeException("AssertionFailedError: object was not null");
}
-
+
static public void fail(String message) {
throw new RuntimeException("AssertionFailedError msg:"+message);
}
-
-
}
diff --git a/tools/vm-tests-tf/src/dot/junit/DxTestCase.java b/tools/vm-tests-tf/src/dot/junit/DxTestCase.java
index 00eb6fe..20142e0 100644
--- a/tools/vm-tests-tf/src/dot/junit/DxTestCase.java
+++ b/tools/vm-tests-tf/src/dot/junit/DxTestCase.java
@@ -19,7 +19,91 @@
import junit.framework.TestCase;
public class DxTestCase extends TestCase {
-
+
+ private static void checkError(Class<?> expectedErrorClass, Throwable thrown,
+ boolean in_invocation_exc) {
+ if (expectedErrorClass != null && thrown == null) {
+ fail("Expected error of type " + expectedErrorClass);
+ } else if (expectedErrorClass == null && thrown != null) {
+ fail("Unexpected error " + thrown);
+ } else if (expectedErrorClass != null && thrown != null) {
+ if (in_invocation_exc) {
+ if (!(thrown instanceof java.lang.reflect.InvocationTargetException)) {
+ fail("Expected invocation target exception, but got " + thrown);
+ }
+ thrown = thrown.getCause();
+ }
+ if (!expectedErrorClass.equals(thrown.getClass())) {
+ fail("Expected error of type " + expectedErrorClass + ", but got " +
+ thrown.getClass());
+ }
+ }
+ }
+
+ /**
+ * Try to load the class with the given name, and check for the expected error.
+ */
+ public static Class<?> load(String className, Class<?> expectedErrorClass) {
+ try {
+ Class<?> c = Class.forName(className);
+ checkError(expectedErrorClass, null, false);
+ return c;
+ } catch (Throwable t) {
+ if (expectedErrorClass != null) {
+ checkError(expectedErrorClass, t, false);
+ } else {
+ fail("Could not load class " + className + ": " + t);
+ }
+ return null;
+ }
+ }
+
+ /**
+ * Try to load the class with the given name, find the "run" method and run it.
+ * If expectedErrorClass is not null, check for an exception of that class.
+ */
+ public static void loadAndRun(String className, boolean isStatic, boolean wrapped,
+ Class<?> expectedErrorClass, Object... args) {
+ Class<?> c = load(className, null);
+
+ java.lang.reflect.Method method = null;
+ // We expect only ever one declared method named run, but don't know the arguments. So
+ // search for one.
+ for (java.lang.reflect.Method m : c.getDeclaredMethods()) {
+ if (m.getName().equals("run")) {
+ method = m;
+ break;
+ }
+ }
+ if (method == null) {
+ fail("Could not find method 'run'");
+ }
+
+ Object receiver = null;
+ if (!isStatic) {
+ try {
+ receiver = c.newInstance();
+ } catch (Exception exc) {
+ fail("Could not instantiate " + className + ": " + exc.getMessage());
+ }
+ }
+
+ try {
+ method.invoke(receiver, args);
+ checkError(expectedErrorClass, null, false);
+ } catch (Throwable t) {
+ checkError(expectedErrorClass, t, wrapped);
+ }
+ }
+
+ public static void loadAndRun(String className, Class<?> expectedErrorClass) {
+ loadAndRun(className, false, true, expectedErrorClass);
+ }
+
+ public static void loadAndRun(String className, Class<?> expectedErrorClass, Object... args) {
+ loadAndRun(className, false, true, expectedErrorClass, args);
+ }
+
// omit the "extends TestCase" and uncomment the following methods if you would like to run the tests as rolled-out, separate tests.
/*
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/Test_add_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/Test_add_double.java
index cbae239..d18db90 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/Test_add_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/Test_add_double.java
@@ -132,12 +132,7 @@
* @title types of arguments - float, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double.d.T_add_double_2", VerifyError.class);
}
@@ -146,12 +141,7 @@
* @title types of arguments - double, reference
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double.d.T_add_double_4", VerifyError.class);
}
/**
@@ -159,12 +149,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double.d.T_add_double_5", VerifyError.class);
}
/**
@@ -172,12 +157,7 @@
* @title types of arguments - int, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double.d.T_add_double_6", VerifyError.class);
}
/**
@@ -186,11 +166,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_double.d.T_add_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double.d.T_add_double_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/Test_add_double_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/Test_add_double_2addr.java
index cdcee13..6880719 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/Test_add_double_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/Test_add_double_2addr.java
@@ -129,12 +129,7 @@
* @title types of arguments - float, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_2", VerifyError.class);
}
/**
@@ -142,12 +137,7 @@
* @title types of arguments - double, reference
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_4", VerifyError.class);
}
/**
@@ -155,12 +145,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_6", VerifyError.class);
}
/**
@@ -168,12 +153,7 @@
* @title types of arguments - double, reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_4", VerifyError.class);
}
/**
@@ -182,11 +162,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_double_2addr.d.T_add_double_2addr_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/Test_add_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/Test_add_float.java
index 56288c2..74f1dfa 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/Test_add_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/Test_add_float.java
@@ -131,12 +131,7 @@
* @title types of arguments - float, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float.d.T_add_float_2", VerifyError.class);
}
/**
@@ -144,12 +139,7 @@
* @title types of arguments - long, float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float.d.T_add_float_3", VerifyError.class);
}
/**
@@ -157,12 +147,7 @@
* @title types of arguments - float, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float.d.T_add_float_4", VerifyError.class);
}
/**
@@ -170,12 +155,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float.d.T_add_float_6", VerifyError.class);
}
/**
@@ -184,12 +164,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_float.d.T_add_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float.d.T_add_float_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/Test_add_float_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/Test_add_float_2addr.java
index a9b5aca..9d8a8ad 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/Test_add_float_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/Test_add_float_2addr.java
@@ -131,12 +131,7 @@
* @title types of arguments - float, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_2", VerifyError.class);
}
/**
@@ -144,12 +139,7 @@
* @title types of arguments - long, float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_3", VerifyError.class);
}
/**
@@ -157,12 +147,7 @@
* @title types of arguments - float, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_4", VerifyError.class);
}
/**
@@ -170,12 +155,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_6", VerifyError.class);
}
/**
@@ -184,12 +164,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_float_2addr.d.T_add_float_2addr_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/Test_add_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/Test_add_int.java
index a6d619b..3f66616 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/Test_add_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/Test_add_int.java
@@ -127,12 +127,7 @@
* @title types of arguments - int, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int.d.T_add_int_2", VerifyError.class);
}
/**
@@ -140,12 +135,7 @@
* @title types of arguments - long, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int.d.T_add_int_3", VerifyError.class);
}
/**
@@ -153,12 +143,7 @@
* @title types of arguments - reference, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int.d.T_add_int_4", VerifyError.class);
}
/**
@@ -166,12 +151,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int.d.T_add_int_6", VerifyError.class);
}
/**
@@ -180,11 +160,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_int.d.T_add_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int.d.T_add_int_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/Test_add_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/Test_add_int_2addr.java
index 3253c9c..40ff8b9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/Test_add_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/Test_add_int_2addr.java
@@ -126,12 +126,7 @@
* @title types of arguments - int, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_2", VerifyError.class);
}
/**
@@ -139,12 +134,7 @@
* @title types of arguments - long, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_3", VerifyError.class);
}
/**
@@ -152,12 +142,7 @@
* @title types of arguments - reference, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_4", VerifyError.class);
}
/**
@@ -165,12 +150,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_6", VerifyError.class);
}
/**
@@ -179,11 +159,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_2addr.d.T_add_int_2addr_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/Test_add_int_lit16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/Test_add_int_lit16.java
index b94058a..77e5660 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/Test_add_int_lit16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/Test_add_int_lit16.java
@@ -137,12 +137,7 @@
* @title types of arguments - int, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_13", VerifyError.class);
}
/**
@@ -150,12 +145,7 @@
* @title types of arguments - long, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_14", VerifyError.class);
}
/**
@@ -163,12 +153,7 @@
* @title types of arguments - reference, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_15", VerifyError.class);
}
/**
@@ -176,12 +161,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_17", VerifyError.class);
}
/**
@@ -190,11 +170,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit16.d.T_add_int_lit16_16", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/Test_add_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/Test_add_int_lit8.java
index b1fab12..6924a13 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/Test_add_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/Test_add_int_lit8.java
@@ -137,12 +137,7 @@
* @title types of arguments - int, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_13", VerifyError.class);
}
/**
@@ -150,12 +145,7 @@
* @title types of arguments - long, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_14", VerifyError.class);
}
/**
@@ -163,12 +153,7 @@
* @title types of arguments - reference, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_15", VerifyError.class);
}
/**
@@ -176,12 +161,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_17", VerifyError.class);
}
/**
@@ -190,11 +170,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_int_lit8.d.T_add_int_lit8_16", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/Test_add_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/Test_add_long.java
index 1d403b2..5f6e4f7 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/Test_add_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/Test_add_long.java
@@ -118,12 +118,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long.d.T_add_long_2", VerifyError.class);
}
/**
@@ -131,12 +126,7 @@
* @title types of arguments - long / integer
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long.d.T_add_long_3", VerifyError.class);
}
/**
@@ -144,12 +134,7 @@
* @title types of arguments - long / float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long.d.T_add_long_4", VerifyError.class);
}
/**
@@ -157,12 +142,7 @@
* @title types of arguments - reference / long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long.d.T_add_long_5", VerifyError.class);
}
/**
@@ -171,11 +151,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_long.d.T_add_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long.d.T_add_long_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/Test_add_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/Test_add_long_2addr.java
index f801cf8..0fcbd17 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/Test_add_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/Test_add_long_2addr.java
@@ -118,12 +118,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_2", VerifyError.class);
}
/**
@@ -131,12 +126,7 @@
* @title types of arguments - long / integer
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_3", VerifyError.class);
}
/**
@@ -144,12 +134,7 @@
* @title types of arguments - long / float
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_4", VerifyError.class);
}
/**
@@ -157,12 +142,7 @@
* @title types of arguments - reference / long
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_5", VerifyError.class);
}
/**
@@ -171,11 +151,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.add_long_2addr.d.T_add_long_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/Test_aget.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/Test_aget.java
index da94745..3ac061d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/Test_aget.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/Test_aget.java
@@ -46,56 +46,31 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aget_1 t = new T_aget_1();
- int[] arr = new int[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget.d.T_aget_1", ArrayIndexOutOfBoundsException.class,
+ new int[2], 2);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aget_1 t = new T_aget_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget.d.T_aget_1", NullPointerException.class, null, 2);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aget_1 t = new T_aget_1();
- int[] arr = new int[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget.d.T_aget_1", ArrayIndexOutOfBoundsException.class,
+ new int[2], -1);
}
-
-
/**
* @constraint B1
* @title types of arguments - array, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget.d.T_aget_2", VerifyError.class);
}
/**
@@ -103,12 +78,7 @@
* @title types of arguments - array, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget.d.T_aget_3", VerifyError.class);
}
/**
@@ -116,12 +86,7 @@
* @title types of arguments - Object, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget.d.T_aget_4", VerifyError.class);
}
/**
@@ -129,12 +94,7 @@
* @title types of arguments - double[], int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget.d.T_aget_5", VerifyError.class);
}
/**
@@ -142,12 +102,7 @@
* @title types of arguments - long[], int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget.d.T_aget_6", VerifyError.class);
}
/**
@@ -155,12 +110,7 @@
* @title types of arguments - array, reference
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget.d.T_aget_7", VerifyError.class);
}
/**
@@ -168,12 +118,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget.d.T_aget_9", VerifyError.class);
}
/**
@@ -182,12 +127,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aget.d.T_aget_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget.d.T_aget_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/Test_aget_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/Test_aget_boolean.java
index 2e2a3e8..3578f07 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/Test_aget_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/Test_aget_boolean.java
@@ -46,41 +46,24 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aget_boolean_1 t = new T_aget_boolean_1();
- boolean[] arr = new boolean[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_1",
+ ArrayIndexOutOfBoundsException.class, new boolean[2], 2);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aget_boolean_1 t = new T_aget_boolean_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_1", NullPointerException.class,
+ null, 2);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aget_boolean_1 t = new T_aget_boolean_1();
- boolean[] arr = new boolean[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_1",
+ ArrayIndexOutOfBoundsException.class, new boolean[2], -1);
}
@@ -90,12 +73,7 @@
* @title types of arguments - array, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_2", VerifyError.class);
}
/**
@@ -103,12 +81,7 @@
* @title types of arguments - array, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_3", VerifyError.class);
}
/**
@@ -116,12 +89,7 @@
* @title types of arguments - Object, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_4", VerifyError.class);
}
/**
@@ -129,12 +97,7 @@
* @title types of arguments - double[], int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_5", VerifyError.class);
}
/**
@@ -142,12 +105,7 @@
* @title types of arguments - long[], int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_6", VerifyError.class);
}
/**
@@ -155,12 +113,7 @@
* @title types of arguments - array, reference
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_7", VerifyError.class);
}
/**
@@ -168,12 +121,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_9", VerifyError.class);
}
/**
@@ -182,11 +130,6 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_boolean.d.T_aget_boolean_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/Test_aget_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/Test_aget_byte.java
index 57ca7e4..f5b2b8a 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/Test_aget_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/Test_aget_byte.java
@@ -47,56 +47,32 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aget_byte_1 t = new T_aget_byte_1();
- byte[] arr = new byte[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_byte.d.T_aget_byte_1",
+ ArrayIndexOutOfBoundsException.class, new byte[2], 2);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aget_byte_1 t = new T_aget_byte_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_byte.d.T_aget_byte_1", NullPointerException.class, null,
+ 2);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aget_byte_1 t = new T_aget_byte_1();
- byte[] arr = new byte[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_byte.d.T_aget_byte_1",
+ ArrayIndexOutOfBoundsException.class, new byte[2], -1);
}
-
-
/**
* @constraint B1
* @title types of arguments - array, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_byte.d.T_aget_byte_2", VerifyError.class);
}
/**
@@ -104,12 +80,7 @@
* @title types of arguments - array, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_byte.d.T_aget_byte_3", VerifyError.class);
}
/**
@@ -117,12 +88,7 @@
* @title types of arguments - Object, short
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_byte.d.T_aget_byte_4", VerifyError.class);
}
/**
@@ -130,12 +96,7 @@
* @title types of arguments - double[], int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_byte.d.T_aget_byte_5", VerifyError.class);
}
/**
@@ -143,12 +104,7 @@
* @title types of arguments - int[], int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_byte.d.T_aget_byte_6", VerifyError.class);
}
/**
@@ -156,12 +112,7 @@
* @title types of arguments - array, reference
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_byte.d.T_aget_byte_7", VerifyError.class);
}
/**
@@ -169,12 +120,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_byte.d.T_aget_byte_9", VerifyError.class);
}
/**
@@ -183,12 +129,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aget_byte.d.T_aget_byte_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_byte.d.T_aget_byte_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/Test_aget_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/Test_aget_char.java
index e9c8ca6..09dabc7 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/Test_aget_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/Test_aget_char.java
@@ -46,41 +46,24 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aget_char_1 t = new T_aget_char_1();
- char[] arr = new char[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_char.d.T_aget_char_1",
+ ArrayIndexOutOfBoundsException.class, new char[2], 2);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aget_char_1 t = new T_aget_char_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_char.d.T_aget_char_1",
+ NullPointerException.class, null, 2);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aget_char_1 t = new T_aget_char_1();
- char[] arr = new char[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_char.d.T_aget_char_1",
+ ArrayIndexOutOfBoundsException.class, new char[2], -1);
}
@@ -90,12 +73,7 @@
* @title types of arguments - array, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_char.d.T_aget_char_2", VerifyError.class);
}
/**
@@ -103,12 +81,7 @@
* @title types of arguments - array, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_char.d.T_aget_char_3", VerifyError.class);
}
/**
@@ -116,12 +89,7 @@
* @title types of arguments - Object, char
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_char.d.T_aget_char_4", VerifyError.class);
}
/**
@@ -129,12 +97,7 @@
* @title types of arguments - double[], char
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_char.d.T_aget_char_5", VerifyError.class);
}
/**
@@ -142,12 +105,7 @@
* @title types of arguments - int[], int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_char.d.T_aget_char_6", VerifyError.class);
}
/**
@@ -155,12 +113,7 @@
* @title types of arguments - array, reference
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_char.d.T_aget_char_7", VerifyError.class);
}
/**
@@ -168,12 +121,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_char.d.T_aget_char_9", VerifyError.class);
}
/**
@@ -182,11 +130,6 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aget_char.d.T_aget_char_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_char.d.T_aget_char_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/Test_aget_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/Test_aget_object.java
index a99bae1..7afe803 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/Test_aget_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/Test_aget_object.java
@@ -45,42 +45,24 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aget_object_1 t = new T_aget_object_1();
- String[] arr = new String[] {"a", "b"};
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aioobe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_object.d.T_aget_object_1",
+ ArrayIndexOutOfBoundsException.class, new String[2], 2);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE2() {
- T_aget_object_1 t = new T_aget_object_1();
- String[] arr = new String[] {"a", "b"};
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aioobe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_object.d.T_aget_object_1",
+ ArrayIndexOutOfBoundsException.class, new String[2], -1);
}
/**
* @title expected NullPointerException
*/
public void testE3() {
- T_aget_object_1 t = new T_aget_object_1();
- String[] arr = null;
- try {
- t.run(arr, 0);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_object.d.T_aget_object_1", NullPointerException.class,
+ null, 0);
}
/**
@@ -88,12 +70,7 @@
* @title types of arguments - array, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_object.d.T_aget_object_2", VerifyError.class);
}
/**
@@ -101,12 +78,7 @@
* @title types of arguments - array, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_object.d.T_aget_object_3", VerifyError.class);
}
/**
@@ -114,12 +86,7 @@
* @title types of arguments - Object, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_object.d.T_aget_object_4", VerifyError.class);
}
/**
@@ -127,12 +94,7 @@
* @title types of arguments - float[], int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_object.d.T_aget_object_5", VerifyError.class);
}
/**
@@ -140,12 +102,7 @@
* @title types of arguments - long[], int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_object.d.T_aget_object_6", VerifyError.class);
}
/**
@@ -153,12 +110,7 @@
* @title types of arguments - array, reference
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_object.d.T_aget_object_7", VerifyError.class);
}
/**
@@ -166,12 +118,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_object.d.T_aget_object_9", VerifyError.class);
}
/**
@@ -180,12 +127,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aget_object.d.T_aget_object_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_object.d.T_aget_object_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/Test_aget_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/Test_aget_short.java
index e5801ae..334f8c1 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/Test_aget_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/Test_aget_short.java
@@ -46,56 +46,32 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aget_short_1 t = new T_aget_short_1();
- short[] arr = new short[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_short.d.T_aget_short_1",
+ ArrayIndexOutOfBoundsException.class, new short[2], 2);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aget_short_1 t = new T_aget_short_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_short.d.T_aget_short_1", NullPointerException.class,
+ null, 2);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aget_short_1 t = new T_aget_short_1();
- short[] arr = new short[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_short.d.T_aget_short_1",
+ ArrayIndexOutOfBoundsException.class, new short[2], -1);
}
-
-
/**
* @constraint B1
* @title types of arguments - array, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_short.d.T_aget_short_2", VerifyError.class);
}
/**
@@ -103,12 +79,7 @@
* @title types of arguments - array, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_short.d.T_aget_short_3", VerifyError.class);
}
/**
@@ -116,12 +87,7 @@
* @title types of arguments - Object, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_short.d.T_aget_short_4", VerifyError.class);
}
/**
@@ -129,12 +95,7 @@
* @title types of arguments - double[], int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_short.d.T_aget_short_5", VerifyError.class);
}
/**
@@ -142,12 +103,7 @@
* @title types of arguments - int[], int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_short.d.T_aget_short_6", VerifyError.class);
}
/**
@@ -155,12 +111,7 @@
* @title types of arguments - array, reference
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_short.d.T_aget_short_7", VerifyError.class);
}
/**
@@ -168,12 +119,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_short.d.T_aget_short_9", VerifyError.class);
}
/**
@@ -182,11 +128,6 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aget_short.d.T_aget_short_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_short.d.T_aget_short_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/Test_aget_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/Test_aget_wide.java
index fb9744d..fbbde61 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/Test_aget_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/Test_aget_wide.java
@@ -59,56 +59,32 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aget_wide_1 t = new T_aget_wide_1();
- long[] arr = new long[2];
- try {
- t.run(arr, 2);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_wide.d.T_aget_wide_1",
+ ArrayIndexOutOfBoundsException.class, new long[2], 2);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aget_wide_1 t = new T_aget_wide_1();
- try {
- t.run(null, 2);
- fail("expected NullPointerException");
- } catch (NullPointerException np) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_wide.d.T_aget_wide_1", NullPointerException.class,
+ null, 2);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aget_wide_1 t = new T_aget_wide_1();
- long[] arr = new long[2];
- try {
- t.run(arr, -1);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aget_wide.d.T_aget_wide_1",
+ ArrayIndexOutOfBoundsException.class, new long[2], -1);
}
-
-
/**
* @constraint B1
* @title types of arguments - array, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_wide.d.T_aget_wide_3", VerifyError.class);
}
/**
@@ -116,12 +92,7 @@
* @title types of arguments - array, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_wide.d.T_aget_wide_5", VerifyError.class);
}
/**
@@ -129,12 +100,7 @@
* @title types of arguments - Object, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_wide.d.T_aget_wide_6", VerifyError.class);
}
/**
@@ -142,12 +108,7 @@
* @title types of arguments - int[], int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_wide.d.T_aget_wide_7", VerifyError.class);
}
/**
@@ -155,12 +116,7 @@
* @title types of arguments - array, reference
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_wide.d.T_aget_wide_8", VerifyError.class);
}
/**
@@ -168,12 +124,7 @@
* @title number of registers
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_wide.d.T_aget_wide_9", VerifyError.class);
}
/**
@@ -181,12 +132,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_wide.d.T_aget_wide_11", VerifyError.class);
}
/**
@@ -195,11 +141,6 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aget_wide.d.T_aget_wide_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aget_wide.d.T_aget_wide_10", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/Test_and_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/Test_and_int.java
index 0afc0bc..fa75935 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/Test_and_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/Test_and_int.java
@@ -71,12 +71,7 @@
* and floats are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int.d.T_and_int_5", VerifyError.class);
}
/**
@@ -84,12 +79,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int.d.T_and_int_2", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int.d.T_and_int_3", VerifyError.class);
}
/**
@@ -110,12 +95,7 @@
* @title types of arguments - int & reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int.d.T_and_int_4", VerifyError.class);
}
/**
@@ -123,11 +103,6 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_int.d.T_and_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int.d.T_and_int_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/Test_and_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/Test_and_int_2addr.java
index 7a13653..1ea0b9d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/Test_and_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/Test_and_int_2addr.java
@@ -70,12 +70,7 @@
* and floats are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_5", VerifyError.class);
}
/**
@@ -83,12 +78,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_2", VerifyError.class);
}
/**
@@ -96,12 +86,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_3", VerifyError.class);
}
/**
@@ -109,12 +94,7 @@
* @title types of arguments - int & reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_4", VerifyError.class);
}
/**
@@ -122,11 +102,6 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_2addr.d.T_and_int_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/Test_and_int_lit16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/Test_and_int_lit16.java
index 2593da4..1a89ca1 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/Test_and_int_lit16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/Test_and_int_lit16.java
@@ -73,12 +73,7 @@
* @title types of arguments - double & int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_6", VerifyError.class);
}
/**
@@ -86,12 +81,7 @@
* @title types of arguments - long & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_7", VerifyError.class);
}
/**
@@ -99,12 +89,7 @@
* @title types of arguments - int & reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_8", VerifyError.class);
}
/**
@@ -112,12 +97,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_10", VerifyError.class);
}
/**
@@ -126,11 +106,6 @@
* and floats are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit16.d.T_and_int_lit16_9", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/Test_and_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/Test_and_int_lit8.java
index 578e857..343bb3a 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/Test_and_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/Test_and_int_lit8.java
@@ -73,12 +73,7 @@
* @title types of arguments - double & int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_6", VerifyError.class);
}
/**
@@ -86,12 +81,7 @@
* @title types of arguments - long & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_7", VerifyError.class);
}
/**
@@ -99,12 +89,7 @@
* @title types of arguments - int & reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_8", VerifyError.class);
}
/**
@@ -112,12 +97,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_10", VerifyError.class);
}
/**
@@ -126,11 +106,6 @@
* and longs are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_int_lit8.d.T_and_int_lit8_9", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/Test_and_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/Test_and_long.java
index b0ba073..03e60ea 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/Test_and_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/Test_and_long.java
@@ -71,12 +71,7 @@
* @title types of arguments - float & long
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long.d.T_and_long_2", VerifyError.class);
}
/**
@@ -84,12 +79,7 @@
* @title types of arguments - int & long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long.d.T_and_long_3", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title types of arguments - reference & long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long.d.T_and_long_4", VerifyError.class);
}
/**
@@ -110,12 +95,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long.d.T_and_long_5", VerifyError.class);
}
/**
@@ -124,11 +104,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_long.d.T_and_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long.d.T_and_long_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/Test_and_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/Test_and_long_2addr.java
index e3b8969..b791342 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/Test_and_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/Test_and_long_2addr.java
@@ -70,12 +70,7 @@
* @title types of arguments - float & long
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_2", VerifyError.class);
}
/**
@@ -83,12 +78,7 @@
* @title types of arguments - int & long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_3", VerifyError.class);
}
/**
@@ -96,12 +86,7 @@
* @title types of arguments - reference & long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_4", VerifyError.class);
}
/**
@@ -109,12 +94,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_5", VerifyError.class);
}
/**
@@ -123,11 +103,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.and_long_2addr.d.T_and_long_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/Test_aput.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/Test_aput.java
index a41dc58..3bf95c8 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/Test_aput.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/Test_aput.java
@@ -47,41 +47,24 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aput_1 t = new T_aput_1();
- int[] arr = new int[2];
- try {
- t.run(arr, 2, 100000000);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput.d.T_aput_1", ArrayIndexOutOfBoundsException.class,
+ new int[2], 2, 100000000);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aput_1 t = new T_aput_1();
- try {
- t.run(null, 2, 100000000);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput.d.T_aput_1", NullPointerException.class,
+ null, 2, 100000000);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aput_1 t = new T_aput_1();
- int[] arr = new int[2];
- try {
- t.run(arr, -1, 100000000);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput.d.T_aput_1", ArrayIndexOutOfBoundsException.class,
+ new int[2], -1, 100000000);
}
@@ -91,12 +74,7 @@
* @title types of arguments - array, double, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput.d.T_aput_2", VerifyError.class);
}
/**
@@ -104,12 +82,7 @@
* @title types of arguments - array, int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput.d.T_aput_3", VerifyError.class);
}
/**
@@ -117,12 +90,7 @@
* @title types of arguments - object, int, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput.d.T_aput_4", VerifyError.class);
}
/**
@@ -130,12 +98,7 @@
* @title types of arguments - double[], int, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput.d.T_aput_5", VerifyError.class);
}
/**
@@ -143,12 +106,7 @@
* @title types of arguments - long[], int, int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput.d.T_aput_6", VerifyError.class);
}
/**
@@ -156,12 +114,7 @@
* @title types of arguments - array, reference, int
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput.d.T_aput_7", VerifyError.class);
}
/**
@@ -169,12 +122,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput.d.T_aput_9", VerifyError.class);
}
/**
@@ -183,11 +131,6 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput.d.T_aput_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput.d.T_aput_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java
index f4fe940..fb31499 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/Test_aput_boolean.java
@@ -46,56 +46,32 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aput_boolean_1 t = new T_aput_boolean_1();
- boolean[] arr = new boolean[2];
- try {
- t.run(arr, 2, true);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_1",
+ ArrayIndexOutOfBoundsException.class, new boolean[2], 2, true);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aput_boolean_1 t = new T_aput_boolean_1();
- try {
- t.run(null, 2, true);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_1",
+ NullPointerException.class, null, 2, true);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aput_boolean_1 t = new T_aput_boolean_1();
- boolean[] arr = new boolean[2];
- try {
- t.run(arr, -1, true);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_1",
+ ArrayIndexOutOfBoundsException.class, new boolean[2], -1, true);
}
-
-
/**
* @constraint B1
* @title types of arguments - array, double, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_2", VerifyError.class);
}
/**
@@ -103,12 +79,7 @@
* @title types of arguments - array, int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_3", VerifyError.class);
}
/**
@@ -116,12 +87,7 @@
* @title types of arguments - object, int, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_4", VerifyError.class);
}
/**
@@ -129,12 +95,7 @@
* @title types of arguments - double[], int, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_5", VerifyError.class);
}
/**
@@ -142,12 +103,7 @@
* @title types of arguments - long[], int, int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_6", VerifyError.class);
}
/**
@@ -155,12 +111,7 @@
* @title types of arguments - array, reference, int
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_7", VerifyError.class);
}
/**
@@ -168,12 +119,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_9", VerifyError.class);
}
/**
@@ -182,12 +128,7 @@
* and floats are not used interchangeably.
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_boolean.d.T_aput_boolean_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java
index 396e5b7..60352c3 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/Test_aput_byte.java
@@ -46,41 +46,24 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aput_byte_1 t = new T_aput_byte_1();
- byte[] arr = new byte[2];
- try {
- t.run(arr, 2, (byte) 100);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_byte.d.T_aput_byte_1",
+ ArrayIndexOutOfBoundsException.class, new byte[2], 2, (byte) 100);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aput_byte_1 t = new T_aput_byte_1();
- try {
- t.run(null, 2, (byte) 100);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_byte.d.T_aput_byte_1",
+ NullPointerException.class, null, 2, (byte) 100);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aput_byte_1 t = new T_aput_byte_1();
- byte[] arr = new byte[2];
- try {
- t.run(arr, -1, (byte) 100);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_byte.d.T_aput_byte_1",
+ ArrayIndexOutOfBoundsException.class, new byte[2], -1, (byte) 100);
}
@@ -91,12 +74,7 @@
* @title types of arguments - array, double, short
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_byte.d.T_aput_byte_2", VerifyError.class);
}
/**
@@ -104,12 +82,7 @@
* @title types of arguments - array, int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_byte.d.T_aput_byte_3", VerifyError.class);
}
/**
@@ -117,12 +90,7 @@
* @title types of arguments - object, int, short
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_byte.d.T_aput_byte_4", VerifyError.class);
}
/**
@@ -130,12 +98,7 @@
* @title types of arguments - double[], int, short
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_byte.d.T_aput_byte_5", VerifyError.class);
}
/**
@@ -143,12 +106,7 @@
* @title types of arguments - long[], int, short
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_byte.d.T_aput_byte_6", VerifyError.class);
}
/**
@@ -156,12 +114,7 @@
* @title types of arguments - array, reference, short
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_byte.d.T_aput_byte_7", VerifyError.class);
}
/**
@@ -169,12 +122,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_byte.d.T_aput_byte_9", VerifyError.class);
}
/**
@@ -183,12 +131,7 @@
* and floats are not used interchangeably.
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.aput_byte.d.T_aput_byte_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_byte.d.T_aput_byte_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/Test_aput_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/Test_aput_char.java
index 8698034..952f4dd 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/Test_aput_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/Test_aput_char.java
@@ -47,57 +47,32 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aput_char_1 t = new T_aput_char_1();
- char[] arr = new char[2];
- try {
- t.run(arr, 2, 'g');
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_char.d.T_aput_char_1",
+ ArrayIndexOutOfBoundsException.class, new char[2], 2, 'g');
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aput_char_1 t = new T_aput_char_1();
- try {
- t.run(null, 2, 'g');
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_char.d.T_aput_char_1", NullPointerException.class, null,
+ 0, 'g');
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aput_char_1 t = new T_aput_char_1();
- char[] arr = new char[2];
- try {
- t.run(arr, -1, 'g');
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_char.d.T_aput_char_1",
+ ArrayIndexOutOfBoundsException.class, new char[2], -1, 'g');
}
-
-
-
/**
* @constraint B1
* @title types of arguments - array, double, char
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_char.d.T_aput_char_2", VerifyError.class);
}
/**
@@ -105,12 +80,7 @@
* @title types of arguments - array, int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_char.d.T_aput_char_3", VerifyError.class);
}
/**
@@ -118,12 +88,7 @@
* @title types of arguments - object, int, char
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_char.d.T_aput_char_4", VerifyError.class);
}
/**
@@ -131,12 +96,7 @@
* @title types of arguments - double[], int, char
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_char.d.T_aput_char_5", VerifyError.class);
}
/**
@@ -144,12 +104,7 @@
* @title types of arguments - long[], int, char
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_char.d.T_aput_char_6", VerifyError.class);
}
/**
@@ -157,12 +112,7 @@
* @title types of arguments - array, reference, char
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_char.d.T_aput_char_7", VerifyError.class);
}
/**
@@ -170,12 +120,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_char.d.T_aput_char_9", VerifyError.class);
}
/**
@@ -184,12 +129,6 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput_char.d.T_aput_char_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_char.d.T_aput_char_8", VerifyError.class);
}
-
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/Test_aput_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/Test_aput_object.java
index 86c3159..4dce800 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/Test_aput_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/Test_aput_object.java
@@ -72,56 +72,33 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aput_object_1 t = new T_aput_object_1();
- String[] arr = new String[2];
- try {
- t.run(arr, arr.length, "abc");
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_object.d.T_aput_object_1",
+ ArrayIndexOutOfBoundsException.class, new String[2], 2, "abc");
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE2() {
- T_aput_object_1 t = new T_aput_object_1();
- String[] arr = new String[2];
- try {
- t.run(arr, -1, "abc");
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_object.d.T_aput_object_1",
+ ArrayIndexOutOfBoundsException.class, new String[2], -1, "abc");
+
}
/**
* @title expected NullPointerException
*/
public void testE3() {
- T_aput_object_1 t = new T_aput_object_1();
- String[] arr = null;
- try {
- t.run(arr, 0, "abc");
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_object.d.T_aput_object_1", NullPointerException.class,
+ null, 0, "abc");
}
/**
* @title expected ArrayStoreException
*/
public void testE4() {
- T_aput_object_4 t = new T_aput_object_4();
- String[] arr = new String[2];
- try {
- t.run(arr, 0, t);
- fail("expected ArrayStoreException");
- } catch (ArrayStoreException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_object.d.T_aput_object_4", ArrayStoreException.class,
+ new String[2], 0, new Integer(1));
}
@@ -130,12 +107,7 @@
* @title types of arguments - array, double, String
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_5", VerifyError.class);
}
/**
@@ -143,12 +115,7 @@
* @title types of arguments - array, int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_6", VerifyError.class);
}
/**
@@ -156,12 +123,7 @@
* @title types of arguments - object, int, String
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_7", VerifyError.class);
}
/**
@@ -169,12 +131,7 @@
* @title types of arguments - float[], int, String
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_8", VerifyError.class);
}
/**
@@ -182,12 +139,7 @@
* @title types of arguments - long[], int, String
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_9", VerifyError.class);
}
/**
@@ -195,12 +147,7 @@
* @title types of arguments - array, reference, String
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_10", VerifyError.class);
}
/**
@@ -208,12 +155,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_11", VerifyError.class);
}
/**
@@ -221,12 +163,7 @@
* @title put integer into array of references
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_13", VerifyError.class);
}
/**
@@ -235,11 +172,6 @@
* and floats are not used interchangeably.
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.aput_object.d.T_aput_object_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_object.d.T_aput_object_12", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/Test_aput_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/Test_aput_short.java
index a3dcf18..14a5eb4 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/Test_aput_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/Test_aput_short.java
@@ -46,56 +46,32 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aput_short_1 t = new T_aput_short_1();
- short[] arr = new short[2];
- try {
- t.run(arr, 2, (short) 10000);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_short.d.T_aput_short_1",
+ ArrayIndexOutOfBoundsException.class, new short[2], 2, (short) 10000);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aput_short_1 t = new T_aput_short_1();
- try {
- t.run(null, 2, (short) 10000);
- fail("expected NullPointerException");
- } catch (NullPointerException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_short.d.T_aput_short_1", NullPointerException.class,
+ null, 2, (short) 10000);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aput_short_1 t = new T_aput_short_1();
- short[] arr = new short[2];
- try {
- t.run(arr, -1, (short) 10000);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_short.d.T_aput_short_1",
+ ArrayIndexOutOfBoundsException.class, new short[2], -1, (short) 10000);
}
-
-
/**
* @constraint B1
* @title types of arguments - array, double, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_short.d.T_aput_short_2", VerifyError.class);
}
/**
@@ -103,12 +79,7 @@
* @title types of arguments - array, int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_short.d.T_aput_short_3", VerifyError.class);
}
/**
@@ -116,12 +87,7 @@
* @title types of arguments - object, int, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_short.d.T_aput_short_4", VerifyError.class);
}
/**
@@ -129,12 +95,7 @@
* @title types of arguments - double[], int, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_short.d.T_aput_short_5", VerifyError.class);
}
/**
@@ -142,12 +103,7 @@
* @title types of arguments - long[], int, int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_short.d.T_aput_short_6", VerifyError.class);
}
/**
@@ -155,12 +111,7 @@
* @title types of arguments - array, reference, int
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_short.d.T_aput_short_7", VerifyError.class);
}
/**
@@ -168,12 +119,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_short.d.T_aput_short_9", VerifyError.class);
}
/**
@@ -182,12 +128,7 @@
* and floats are not used interchangeably.
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.aput_short.d.T_aput_short_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_short.d.T_aput_short_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/Test_aput_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/Test_aput_wide.java
index 735b0e4..03da8ae 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/Test_aput_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/Test_aput_wide.java
@@ -59,41 +59,24 @@
* @title expected ArrayIndexOutOfBoundsException
*/
public void testE1() {
- T_aput_wide_1 t = new T_aput_wide_1();
- long[] arr = new long[2];
- try {
- t.run(arr, 2, 100000000000l);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_wide.d.T_aput_wide_1",
+ ArrayIndexOutOfBoundsException.class, new long[2], 2, 100000000000l);
}
/**
* @title expected NullPointerException
*/
public void testE2() {
- T_aput_wide_1 t = new T_aput_wide_1();
- try {
- t.run(null, 1, 100000000000l);
- fail("expected NullPointerException");
- } catch (NullPointerException np) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_wide.d.T_aput_wide_1", NullPointerException.class,
+ null, 2, 100000000000l);
}
/**
* @title expected ArrayIndexOutOfBoundsException (negative index)
*/
public void testE3() {
- T_aput_wide_1 t = new T_aput_wide_1();
- long[] arr = new long[2];
- try {
- t.run(arr, -1, 100000000000l);
- fail("expected ArrayIndexOutOfBoundsException");
- } catch (ArrayIndexOutOfBoundsException aie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.aput_wide.d.T_aput_wide_1",
+ ArrayIndexOutOfBoundsException.class, new long[2], -1, 100000000000l);
}
@@ -102,12 +85,7 @@
* @title types of arguments - array, double, long
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_wide.d.T_aput_wide_3", VerifyError.class);
}
/**
@@ -115,12 +93,7 @@
* @title types of arguments - array, int, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_wide.d.T_aput_wide_4", VerifyError.class);
}
/**
@@ -128,12 +101,7 @@
* @title types of arguments - object, int, long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_wide.d.T_aput_wide_5", VerifyError.class);
}
/**
@@ -142,12 +110,7 @@
* and floats are not used interchangeably.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_wide.d.T_aput_wide_9", VerifyError.class);
}
/**
@@ -155,12 +118,7 @@
* @title types of arguments - int[], int, long
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_wide.d.T_aput_wide_7", VerifyError.class);
}
/**
@@ -168,12 +126,7 @@
* @title types of arguments - array, reference, long
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_wide.d.T_aput_wide_8", VerifyError.class);
}
/**
@@ -181,12 +134,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_wide.d.T_aput_wide_10", VerifyError.class);
}
/**
@@ -195,11 +143,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.aput_wide.d.T_aput_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.aput_wide.d.T_aput_wide_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/Test_array_length.java b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/Test_array_length.java
index f49cccb..e284880 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/Test_array_length.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/Test_array_length.java
@@ -45,28 +45,16 @@
* @title expected NullPointerException
*/
public void testNPE1() {
- T_array_length_1 t = new T_array_length_1();
- try {
- t.run(null);
- fail("NPE expected");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.array_length.d.T_array_length_1", NullPointerException.class,
+ new Object[] {null});
}
-
-
/**
* @constraint B1
* @title types of arguments - Object
*/
public void testVFE1() {
- try {
- Class.forName("dxc.junit.opcodes.array_length.jm.T_array_length_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.array_length.d.T_array_length_2", VerifyError.class);
}
/**
@@ -74,12 +62,7 @@
* @title types of arguments - int
*/
public void testVFE2() {
- try {
- Class.forName("dxc.junit.opcodes.array_length.jm.T_array_length_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.array_length.d.T_array_length_3", VerifyError.class);
}
/**
@@ -87,11 +70,6 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dxc.junit.opcodes.array_length.jm.T_array_length_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.array_length.d.T_array_length_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/Test_check_cast.java b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/Test_check_cast.java
index 78a0479..bbff2f2 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/Test_check_cast.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/Test_check_cast.java
@@ -56,13 +56,8 @@
* @title expected ClassCastException
*/
public void testE1() {
- T_check_cast_1 t = new T_check_cast_1();
- try {
- t.run(t);
- fail("expected ClassCastException");
- } catch (ClassCastException iae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.check_cast.d.T_check_cast_1", ClassCastException.class,
+ new Integer(1));
}
/**
@@ -70,12 +65,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.check_cast.d.T_check_cast_4", VerifyError.class);
}
/**
@@ -84,12 +74,7 @@
* @title type of argument - int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.check_cast.d.T_check_cast_5", VerifyError.class);
}
/**
@@ -98,12 +83,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.check_cast.d.T_check_cast_8", VerifyError.class);
}
/**
@@ -112,12 +92,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.check_cast.d.T_check_cast_6", VerifyError.class);
}
/**
@@ -126,14 +101,7 @@
*/
public void testVFE5() {
//@uses dot.junit.opcodes.check_cast.TestStubs
- //@uses dot.junit.opcodes.check_cast.d.T_check_cast_3
- T_check_cast_3 t = new T_check_cast_3();
- try {
- t.run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError iae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.check_cast.d.T_check_cast_3", IllegalAccessError.class);
}
/**
@@ -142,13 +110,7 @@
* first access
*/
public void testVFE6() {
- T_check_cast_7 t = new T_check_cast_7();
- try {
- t.run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError iae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.check_cast.d.T_check_cast_7", NoClassDefFoundError.class);
}
/**
@@ -156,12 +118,7 @@
* @title constant pool type
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.check_cast.d.T_check_cast_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.check_cast.d.T_check_cast_9", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/Test_cmp_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/Test_cmp_long.java
index 5edd117..aea844b 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/Test_cmp_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/Test_cmp_long.java
@@ -100,12 +100,7 @@
* @title types of arguments - float, long
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmp_long.d.T_cmp_long_3", VerifyError.class);
}
/**
@@ -113,12 +108,7 @@
* @title types of arguments - int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmp_long.d.T_cmp_long_4", VerifyError.class);
}
/**
@@ -126,12 +116,7 @@
* @title types of arguments - reference, long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmp_long.d.T_cmp_long_5", VerifyError.class);
}
/**
@@ -139,12 +124,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmp_long.d.T_cmp_long_6", VerifyError.class);
}
/**
@@ -153,11 +133,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.cmp_long.d.T_cmp_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmp_long.d.T_cmp_long_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/Test_cmpg_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/Test_cmpg_double.java
index 4afc0d2..c7f9946 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/Test_cmpg_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/Test_cmpg_double.java
@@ -94,12 +94,7 @@
* @title types of arguments - double, float
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_2", VerifyError.class);
}
/**
@@ -107,12 +102,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_5", VerifyError.class);
}
/**
@@ -120,12 +110,7 @@
* @title types of arguments - double, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_4", VerifyError.class);
}
/**
@@ -133,12 +118,7 @@
* @title types of arguments - int, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_6", VerifyError.class);
}
/**
@@ -147,12 +127,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_double.d.T_cmpg_double_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/Test_cmpg_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/Test_cmpg_float.java
index 3e5f4af..49f8fe3 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/Test_cmpg_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/Test_cmpg_float.java
@@ -95,12 +95,7 @@
* @title types of arguments - float, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_2", VerifyError.class);
}
/**
@@ -108,12 +103,7 @@
* @title types of arguments - long, float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_3", VerifyError.class);
}
/**
@@ -121,12 +111,7 @@
* @title types of arguments - reference, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_4", VerifyError.class);
}
/**
@@ -134,12 +119,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_5", VerifyError.class);
}
/**
@@ -148,12 +128,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpg_float.d.T_cmpg_float_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/Test_cmpl_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/Test_cmpl_double.java
index efade2c..e3c9629 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/Test_cmpl_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/Test_cmpl_double.java
@@ -96,12 +96,7 @@
* @title types of arguments - double, float
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_2", VerifyError.class);
}
/**
@@ -109,12 +104,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_5", VerifyError.class);
}
/**
@@ -122,12 +112,7 @@
* @title types of arguments - double, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_4", VerifyError.class);
}
/**
@@ -135,12 +120,7 @@
* @title types of arguments - int, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_6", VerifyError.class);
}
/**
@@ -149,12 +129,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_double.d.T_cmpl_double_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/Test_cmpl_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/Test_cmpl_float.java
index 0ef9efc..364dd75 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/Test_cmpl_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/Test_cmpl_float.java
@@ -94,12 +94,7 @@
* @title types of arguments - float, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_2", VerifyError.class);
}
/**
@@ -107,12 +102,7 @@
* @title types of arguments - long, float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_3", VerifyError.class);
}
/**
@@ -120,12 +110,7 @@
* @title types of arguments - reference, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_4", VerifyError.class);
}
/**
@@ -133,12 +118,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_5", VerifyError.class);
}
/**
@@ -147,12 +127,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.cmpl_float.d.T_cmpl_float_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/Test_const_16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/Test_const_16.java
index 00e6b78..3328118 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/Test_const_16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/Test_const_16.java
@@ -37,12 +37,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_16.d.T_const_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_16.d.T_const_16_3", VerifyError.class);
}
/**
@@ -52,12 +47,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_16.d.T_const_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_16.d.T_const_16_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/Test_const_4.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/Test_const_4.java
index d9bb26b..aad3a48 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/Test_const_4.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/Test_const_4.java
@@ -36,12 +36,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_4.d.T_const_4_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_4.d.T_const_4_3", VerifyError.class);
}
/**
@@ -51,11 +46,6 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_4.d.T_const_4_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_4.d.T_const_4_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_class/Test_const_class.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_class/Test_const_class.java
index 93f5ee4..20fa270 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_class/Test_const_class.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_class/Test_const_class.java
@@ -46,15 +46,7 @@
* @title Class definition not found
*/
public void testE1() {
- try {
- T_const_class_6 t = new T_const_class_6();
- t.run();
- fail("expected a verification exception");
- } catch (NoClassDefFoundError e) {
- // expected
- } catch(VerifyError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.const_class.d.T_const_class_6", NoClassDefFoundError.class);
}
/**
@@ -62,14 +54,7 @@
*/
public void testE2() {
//@uses dot.junit.opcodes.const_class.TestStubs
- //@uses dot.junit.opcodes.const_class.d.T_const_class_7
- try {
- T_const_class_7 t = new T_const_class_7();
- t.run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.const_class.d.T_const_class_7", IllegalAccessError.class);
}
/**
@@ -77,12 +62,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_class.d.T_const_class_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_class.d.T_const_class_3", VerifyError.class);
}
/**
@@ -92,12 +72,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_class.d.T_const_class_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_class.d.T_const_class_4", VerifyError.class);
}
/**
@@ -105,12 +80,7 @@
* @title constant pool index
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.const_class.d.T_const_class_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_class.d.T_const_class_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/Test_const_high16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/Test_const_high16.java
index 68340a8..642a8ef 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/Test_const_high16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/Test_const_high16.java
@@ -34,12 +34,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_high16.d.T_const_high16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_high16.d.T_const_high16_3", VerifyError.class);
}
/**
@@ -49,12 +44,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_high16.d.T_const_high16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_high16.d.T_const_high16_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/Test_const_string.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/Test_const_string.java
index b5c778d..5e76157 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/Test_const_string.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/Test_const_string.java
@@ -38,12 +38,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_string.d.T_const_string_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_string.d.T_const_string_3", VerifyError.class);
}
/**
@@ -53,12 +48,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_string.d.T_const_string_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_string.d.T_const_string_4", VerifyError.class);
}
/**
@@ -66,12 +56,7 @@
* @title constant pool index
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.const_string.d.T_const_string_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_string.d.T_const_string_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/Test_const_string_jumbo.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/Test_const_string_jumbo.java
index 6234730..93dd391 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/Test_const_string_jumbo.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/Test_const_string_jumbo.java
@@ -38,12 +38,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_3", VerifyError.class);
}
/**
@@ -53,12 +48,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_4", VerifyError.class);
}
/**
@@ -66,12 +56,7 @@
* @title constant pool index
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_string_jumbo.d.T_const_string_jumbo_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/Test_const_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/Test_const_wide.java
index 1ce3caa..f36a560 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/Test_const_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/Test_const_wide.java
@@ -47,12 +47,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_wide.d.T_const_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_wide.d.T_const_wide_3", VerifyError.class);
}
/**
@@ -62,12 +57,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_wide.d.T_const_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_wide.d.T_const_wide_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/Test_const_wide_16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/Test_const_wide_16.java
index 941b00d..dff7947 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/Test_const_wide_16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/Test_const_wide_16.java
@@ -37,12 +37,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_16.d.T_const_wide_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_wide_16.d.T_const_wide_16_3", VerifyError.class);
}
/**
@@ -52,12 +47,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_16.d.T_const_wide_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_wide_16.d.T_const_wide_16_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/Test_const_wide_32.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/Test_const_wide_32.java
index 0847b3b..0a93390 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/Test_const_wide_32.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/Test_const_wide_32.java
@@ -36,12 +36,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_32.d.T_const_wide_32_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_wide_32.d.T_const_wide_32_3", VerifyError.class);
}
/**
@@ -51,12 +46,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_32.d.T_const_wide_32_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_wide_32.d.T_const_wide_32_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_high16/Test_const_wide_high16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_high16/Test_const_wide_high16.java
index 2dd3e32..7ece9ae 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_high16/Test_const_wide_high16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_high16/Test_const_wide_high16.java
@@ -34,12 +34,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_3", VerifyError.class);
}
/**
@@ -49,12 +44,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.const_wide_high16.d.T_const_wide_high16_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/Test_div_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/Test_div_double.java
index 1af5e66..090754a 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/Test_div_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/Test_div_double.java
@@ -131,12 +131,7 @@
* @title types of arguments - float / double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double.d.T_div_double_2", VerifyError.class);
}
/**
@@ -144,12 +139,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double.d.T_div_double_5", VerifyError.class);
}
/**
@@ -157,12 +147,7 @@
* @title types of arguments - double / reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double.d.T_div_double_4", VerifyError.class);
}
/**
@@ -170,12 +155,7 @@
* @title types of arguments - int / int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double.d.T_div_double_6", VerifyError.class);
}
/**
@@ -184,12 +164,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_double.d.T_div_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double.d.T_div_double_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/Test_div_double_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/Test_div_double_2addr.java
index dfd238e..864969e 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/Test_div_double_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/Test_div_double_2addr.java
@@ -131,12 +131,7 @@
* @title types of arguments - float / double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_2", VerifyError.class);
}
/**
@@ -144,12 +139,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_5", VerifyError.class);
}
/**
@@ -157,12 +147,7 @@
* @title types of arguments - double / reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_4", VerifyError.class);
}
/**
@@ -170,12 +155,7 @@
* @title types of arguments - int / int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_6", VerifyError.class);
}
/**
@@ -184,12 +164,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_double_2addr.d.T_div_double_2addr_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/Test_div_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/Test_div_float.java
index f4672af..e3bb16e 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/Test_div_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/Test_div_float.java
@@ -129,12 +129,7 @@
* @title types of arguments - float / double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float.d.T_div_float_2", VerifyError.class);
}
/**
@@ -142,12 +137,7 @@
* @title types of arguments - long / float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float.d.T_div_float_3", VerifyError.class);
}
/**
@@ -155,12 +145,7 @@
* @title types of arguments - reference / float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float.d.T_div_float_4", VerifyError.class);
}
/**
@@ -168,12 +153,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float.d.T_div_float_6", VerifyError.class);
}
/**
@@ -182,12 +162,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_float.d.T_div_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float.d.T_div_float_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/Test_div_float_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/Test_div_float_2addr.java
index f4c3c9c..3746d9d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/Test_div_float_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/Test_div_float_2addr.java
@@ -129,12 +129,7 @@
* @title types of arguments - float / double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_2", VerifyError.class);
}
/**
@@ -142,12 +137,7 @@
* @title types of arguments - long / float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_3", VerifyError.class);
}
/**
@@ -155,12 +145,7 @@
* @title types of arguments - reference / float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_4", VerifyError.class);
}
/**
@@ -168,12 +153,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_6", VerifyError.class);
}
/**
@@ -182,12 +162,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_float_2addr.d.T_div_float_2addr_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/Test_div_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/Test_div_int.java
index 6fc8e05..ef375f5 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/Test_div_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/Test_div_int.java
@@ -125,28 +125,15 @@
* @title Divisor is 0
*/
public void testE1() {
- T_div_int_1 t = new T_div_int_1();
- try {
- t.run(1, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.div_int.d.T_div_int_1", ArithmeticException.class, 1, 0);
}
-
-
/**
* @constraint B1
* @title types of arguments - int / double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int.d.T_div_int_2", VerifyError.class);
}
/**
@@ -154,12 +141,7 @@
* @title types of arguments - long / int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int.d.T_div_int_3", VerifyError.class);
}
/**
@@ -167,12 +149,7 @@
* @title types of arguments - reference / int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int.d.T_div_int_4", VerifyError.class);
}
/**
@@ -180,12 +157,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int.d.T_div_int_6", VerifyError.class);
}
/**
@@ -194,12 +166,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_int.d.T_div_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int.d.T_div_int_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/Test_div_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/Test_div_int_2addr.java
index d43aadd..6a27841 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/Test_div_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/Test_div_int_2addr.java
@@ -123,28 +123,16 @@
* @title Divisor is 0
*/
public void testE1() {
- T_div_int_2addr_1 t = new T_div_int_2addr_1();
- try {
- t.run(1, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_1", ArithmeticException.class,
+ 1, 0);
}
-
-
/**
* @constraint B1
* @title types of arguments - int, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_2", VerifyError.class);
}
/**
@@ -152,12 +140,7 @@
* @title types of arguments - long, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_3", VerifyError.class);
}
/**
@@ -165,12 +148,7 @@
* @title types of arguments - reference, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_4", VerifyError.class);
}
/**
@@ -178,12 +156,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_6", VerifyError.class);
}
/**
@@ -192,11 +165,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_2addr.d.T_div_int_2addr_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/Test_div_int_lit16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/Test_div_int_lit16.java
index 0b03a93..75e0016 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/Test_div_int_lit16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/Test_div_int_lit16.java
@@ -136,28 +136,16 @@
* @title Divisor is 0
*/
public void testE1() {
- T_div_int_lit16_13 t = new T_div_int_lit16_13();
- try {
- t.run();
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_13",
+ ArithmeticException.class);
}
-
-
/**
* @constraint B1
* @title types of arguments - int / double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_14", VerifyError.class);
}
/**
@@ -165,12 +153,7 @@
* @title types of arguments - long / int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_15", VerifyError.class);
}
/**
@@ -178,12 +161,7 @@
* @title types of arguments - reference / int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_16", VerifyError.class);
}
/**
@@ -191,12 +169,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_18", VerifyError.class);
}
/**
@@ -205,11 +178,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit16.d.T_div_int_lit16_17", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/Test_div_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/Test_div_int_lit8.java
index e86ea75..14d4d4c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/Test_div_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/Test_div_int_lit8.java
@@ -135,13 +135,7 @@
* @title Divisor is 0
*/
public void testE1() {
- T_div_int_lit8_13 t = new T_div_int_lit8_13();
- try {
- t.run();
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_13", ArithmeticException.class);
}
@@ -151,12 +145,7 @@
* @title types of arguments - int / double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_14", VerifyError.class);
}
/**
@@ -164,12 +153,7 @@
* @title types of arguments - long / int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_15", VerifyError.class);
}
/**
@@ -177,12 +161,7 @@
* @title types of arguments - reference / int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_16", VerifyError.class);
}
/**
@@ -190,12 +169,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_18", VerifyError.class);
}
/**
@@ -204,11 +178,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_int_lit8.d.T_div_int_lit8_17", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/Test_div_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/Test_div_long.java
index ce3713c..46c0c94 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/Test_div_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/Test_div_long.java
@@ -123,28 +123,16 @@
* @title Divisor is 0
*/
public void testE1() {
- T_div_long_1 t = new T_div_long_1();
- try {
- t.run(12345678912345l, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.div_long.d.T_div_long_1", ArithmeticException.class,
+ 12345678912345l, 0);
}
-
-
/**
* @constraint A24
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long.d.T_div_long_6", VerifyError.class);
}
/**
@@ -152,12 +140,7 @@
* @title types of arguments - int / long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long.d.T_div_long_3", VerifyError.class);
}
/**
@@ -165,12 +148,7 @@
* @title types of arguments - float / long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long.d.T_div_long_4", VerifyError.class);
}
/**
@@ -178,12 +156,7 @@
* @title types of arguments - reference / long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long.d.T_div_long_5", VerifyError.class);
}
/**
@@ -192,12 +165,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_long.d.T_div_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long.d.T_div_long_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/Test_div_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/Test_div_long_2addr.java
index 4bc3cf1..ca446fd 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/Test_div_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/Test_div_long_2addr.java
@@ -122,13 +122,8 @@
* @title Divisor is 0
*/
public void testE1() {
- T_div_long_2addr_1 t = new T_div_long_2addr_1();
- try {
- t.run(12345678912345l, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_1",
+ ArithmeticException.class, 12345678912345l, 0);
}
@@ -138,12 +133,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_6", VerifyError.class);
}
/**
@@ -151,12 +141,7 @@
* @title types of arguments - int / long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_3", VerifyError.class);
}
/**
@@ -164,12 +149,7 @@
* @title types of arguments - float / long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_4", VerifyError.class);
}
/**
@@ -177,12 +157,7 @@
* @title types of arguments - reference / long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_5", VerifyError.class);
}
/**
@@ -191,12 +166,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.div_long_2addr.d.T_div_long_2addr_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/Test_double_to_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/Test_double_to_float.java
index bcaa4c8..bf0c070 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/Test_double_to_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/Test_double_to_float.java
@@ -110,12 +110,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_float.d.T_double_to_float_3", VerifyError.class);
}
/**
@@ -123,12 +118,7 @@
* @title type of argument - float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_float.d.T_double_to_float_2", VerifyError.class);
}
/**
@@ -137,12 +127,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_float.d.T_double_to_float_5", VerifyError.class);
}
/**
@@ -151,12 +136,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_float.d.T_double_to_float_4", VerifyError.class);
}
/**
@@ -165,12 +145,7 @@
* @title type of argument - int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.double_to_float.d.T_double_to_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_float.d.T_double_to_float_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/Test_double_to_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/Test_double_to_int.java
index ccd8618..cb0a5a6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/Test_double_to_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/Test_double_to_int.java
@@ -102,12 +102,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_int.d.T_double_to_int_3", VerifyError.class);
}
/**
@@ -115,12 +110,7 @@
* @title type of argument - float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_int.d.T_double_to_int_2", VerifyError.class);
}
/**
@@ -129,12 +119,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_int.d.T_double_to_int_5", VerifyError.class);
}
/**
@@ -143,12 +128,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_int.d.T_double_to_int_4", VerifyError.class);
}
/**
@@ -157,12 +137,7 @@
* @title type of argument - reference
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.double_to_int.d.T_double_to_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_int.d.T_double_to_int_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/Test_double_to_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/Test_double_to_long.java
index 0785280..5e98b03 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/Test_double_to_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/Test_double_to_long.java
@@ -99,12 +99,7 @@
* @title type of argument - float
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_long.d.T_double_to_long_2", VerifyError.class);
}
/**
@@ -113,12 +108,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_long.d.T_double_to_long_5", VerifyError.class);
}
/**
@@ -127,12 +117,7 @@
* @title type of argument - reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_long.d.T_double_to_long_4", VerifyError.class);
}
@@ -142,12 +127,7 @@
* @title type of argument - int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_long.d.T_double_to_long_6", VerifyError.class);
}
/**
@@ -156,11 +136,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.double_to_long.d.T_double_to_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.double_to_long.d.T_double_to_long_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/fill_array_data/Test_fill_array_data.java b/tools/vm-tests-tf/src/dot/junit/opcodes/fill_array_data/Test_fill_array_data.java
index 5bac3cd..7c22076 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/fill_array_data/Test_fill_array_data.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/fill_array_data/Test_fill_array_data.java
@@ -88,12 +88,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_3", VerifyError.class);
}
/**
@@ -101,12 +96,7 @@
* @title type of argument - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_4", VerifyError.class);
}
/**
@@ -114,12 +104,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_5", VerifyError.class);
}
/**
@@ -127,12 +112,7 @@
* @title type of argument - reference (not array)
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_6", VerifyError.class);
}
/**
@@ -140,12 +120,7 @@
* @title array of Objects
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_7", VerifyError.class);
}
/**
@@ -153,12 +128,7 @@
* @title array type and data size shall be consistent
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_8", VerifyError.class);
}
/**
@@ -166,12 +136,7 @@
* @title offset to table shall be inside method
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_9", VerifyError.class);
}
/**
@@ -179,12 +144,7 @@
* @title the size and the list must be consistent.
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_11", VerifyError.class);
}
@@ -193,12 +153,7 @@
* @title packed-switch-data pseudo-instructions must not be reachable by control flow
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_12", VerifyError.class);
}
/**
@@ -206,11 +161,6 @@
* @title table has wrong ident code
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.fill_array_data.d.T_fill_array_data_13", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/Test_filled_new_array.java b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/Test_filled_new_array.java
index b17c29b..8a85a6d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/Test_filled_new_array.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/Test_filled_new_array.java
@@ -54,12 +54,7 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_3", VerifyError.class);
}
/**
@@ -67,12 +62,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_4", VerifyError.class);
}
@@ -81,12 +71,7 @@
* @title try to pass obj ref instead of int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_5", VerifyError.class);
}
/**
@@ -94,12 +79,7 @@
* @title try to pass long instead of int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_6", VerifyError.class);
}
/**
@@ -107,12 +87,7 @@
* @title try to create non-array type
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_7", VerifyError.class);
}
/**
@@ -120,12 +95,7 @@
* @title invalid arg count
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_8", VerifyError.class);
}
/**
@@ -133,12 +103,7 @@
* @title attempt to instantiate String[] and fill it with reference to assignment-incompatible class
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_9");
- fail("expected a verification exception");
- } catch(Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_9", VerifyError.class);
}
/**
@@ -146,14 +111,8 @@
* @title attempt to instantiate array of non-existent class
*/
public void testVFE8() {
- //@uses dot.junit.opcodes.filled_new_array.d.T_filled_new_array_10
- try {
- T_filled_new_array_10 T = new T_filled_new_array_10();
- T.run();
- fail("expected a NoClassDefFoundError exception");
- } catch(NoClassDefFoundError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_10",
+ NoClassDefFoundError.class);
}
/**
@@ -161,15 +120,9 @@
* @title attempt to instantiate array of inaccessible class
*/
public void testVFE9() {
- //@uses dot.junit.opcodes.filled_new_array.d.T_filled_new_array_11
//@uses dot.junit.opcodes.filled_new_array.TestStubs
- try {
- T_filled_new_array_11 T = new T_filled_new_array_11();
- T.run();
- fail("expected a IllegalAccessError exception");
- } catch(IllegalAccessError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.filled_new_array.d.T_filled_new_array_11",
+ IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/Test_filled_new_array_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/Test_filled_new_array_range.java
index 84b1379..b6da488 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/Test_filled_new_array_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/Test_filled_new_array_range.java
@@ -54,12 +54,8 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_3",
+ VerifyError.class);
}
/**
@@ -67,12 +63,8 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_4",
+ VerifyError.class);
}
/**
@@ -80,12 +72,8 @@
* @title try to pass obj ref instead of int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_5",
+ VerifyError.class);
}
/**
@@ -93,12 +81,8 @@
* @title try to pass long instead of int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_6",
+ VerifyError.class);
}
/**
@@ -106,12 +90,8 @@
* @title try to create non-array type
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_7",
+ VerifyError.class);
}
/**
@@ -119,12 +99,8 @@
* @title invalid arg count
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_8",
+ VerifyError.class);
}
/**
@@ -132,12 +108,8 @@
* @title attempt to instantiate String[] and fill it with reference to assignment-incompatible class
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_9");
- fail("expected a verification exception");
- } catch(Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_9",
+ VerifyError.class);
}
/**
@@ -145,13 +117,8 @@
* @title attempt to instantiate array of non-existent class
*/
public void testVFE8() {
- T_filled_new_array_range_10 t = new T_filled_new_array_range_10();
- try {
- t.run();
- fail("expected NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_10",
+ NoClassDefFoundError.class);
}
/**
@@ -159,14 +126,8 @@
* @title attempt to instantiate array of inaccessible class
*/
public void testVFE9() {
- //@uses dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_11
//@uses dot.junit.opcodes.filled_new_array_range.TestStubs
- T_filled_new_array_range_11 t = new T_filled_new_array_range_11();
- try {
- t.run();
- fail("expected IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.filled_new_array_range.d.T_filled_new_array_range_11",
+ IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/Test_float_to_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/Test_float_to_double.java
index 4f53011..1c4d788 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/Test_float_to_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/Test_float_to_double.java
@@ -103,12 +103,7 @@
* @title type of argument - double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_double.d.T_float_to_double_2", VerifyError.class);
}
/**
@@ -117,12 +112,7 @@
* @title type of argument - long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_double.d.T_float_to_double_3", VerifyError.class);
}
/**
@@ -130,12 +120,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_double.d.T_float_to_double_4", VerifyError.class);
}
/**
@@ -143,12 +128,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_double.d.T_float_to_double_5", VerifyError.class);
}
/**
@@ -156,12 +136,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_double.d.T_float_to_double_6", VerifyError.class);
}
/**
@@ -170,12 +145,7 @@
* and floats are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.float_to_double.d.T_float_to_double_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_double.d.T_float_to_double_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/Test_float_to_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/Test_float_to_int.java
index e8b7f86..0c0b8cc 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/Test_float_to_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/Test_float_to_int.java
@@ -101,12 +101,7 @@
* @title type of argument - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_int.d.T_float_to_int_2", VerifyError.class);
}
/**
@@ -115,12 +110,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_int.d.T_float_to_int_3", VerifyError.class);
}
/**
@@ -129,12 +119,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_int.d.T_float_to_int_4", VerifyError.class);
}
/**
@@ -142,12 +127,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_int.d.T_float_to_int_6", VerifyError.class);
}
/**
@@ -156,11 +136,6 @@
* and floats are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.float_to_int.d.T_float_to_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_int.d.T_float_to_int_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/Test_float_to_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/Test_float_to_long.java
index 9627d82..39d4cf8 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/Test_float_to_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/Test_float_to_long.java
@@ -99,13 +99,7 @@
* @title number of arguments
*/
public void testVFE1() {
- try
- {
- Class.forName("dxc.junit.opcodes.float_to_long.jm.T_float_to_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_long.d.T_float_to_long_2", VerifyError.class);
}
@@ -115,13 +109,7 @@
* @title type of argument - double
*/
public void testVFE2() {
- try
- {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_long.d.T_float_to_long_2", VerifyError.class);
}
/**
@@ -130,13 +118,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try
- {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_long.d.T_float_to_long_3", VerifyError.class);
}
/**
@@ -144,13 +126,7 @@
* @title number of registers
*/
public void testVFE4() {
- try
- {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_long.d.T_float_to_long_4", VerifyError.class);
}
/**
@@ -158,13 +134,7 @@
* @title type of argument - reference
*/
public void testVFE5() {
- try
- {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_long.d.T_float_to_long_5", VerifyError.class);
}
/**
@@ -172,12 +142,7 @@
* @title number of registers
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_long.d.T_float_to_long_6", VerifyError.class);
}
/**
@@ -186,11 +151,6 @@
* and floats are not used interchangeably.
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.float_to_long.d.T_float_to_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.float_to_long.d.T_float_to_long_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/goto_16/Test_goto_16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/goto_16/Test_goto_16.java
index 2891fc4..48f3b71 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/goto_16/Test_goto_16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/goto_16/Test_goto_16.java
@@ -35,12 +35,7 @@
* @title branch target is inside instruction
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.goto_16.d.T_goto_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.goto_16.d.T_goto_16_3", VerifyError.class);
}
/**
@@ -48,12 +43,7 @@
* @title branch target shall be inside the method
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.goto_16.d.T_goto_16_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.goto_16.d.T_goto_16_2", VerifyError.class);
}
/**
@@ -61,11 +51,6 @@
* @title zero offset
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.goto_16.d.T_goto_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.goto_16.d.T_goto_16_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/goto_32/Test_goto_32.java b/tools/vm-tests-tf/src/dot/junit/opcodes/goto_32/Test_goto_32.java
index 5f7a4dc..0e8b373 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/goto_32/Test_goto_32.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/goto_32/Test_goto_32.java
@@ -35,12 +35,7 @@
* @title branch target is inside instruction
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.goto_32.d.T_goto_32_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.goto_32.d.T_goto_32_2", VerifyError.class);
}
/**
@@ -48,12 +43,7 @@
* @title branch target shall be inside the method
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.goto_32.d.T_goto_32_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.goto_32.d.T_goto_32_3", VerifyError.class);
}
/**
@@ -62,12 +52,7 @@
* @title zero offset - no exception expected
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.goto_32.d.T_goto_32_4");
- // no exception is expected
- } catch (Throwable t) {
- fail("not expected" + t);
- }
+ load("dot.junit.opcodes.goto_32.d.T_goto_32_4", null);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/Test_if_eq.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/Test_if_eq.java
index bb89f67..c68525a 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/Test_if_eq.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/Test_if_eq.java
@@ -125,12 +125,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eq.d.T_if_eq_5", VerifyError.class);
}
@@ -139,12 +134,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eq.d.T_if_eq_7", VerifyError.class);
}
/**
@@ -152,12 +142,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eq.d.T_if_eq_8", VerifyError.class);
}
/**
@@ -165,12 +150,7 @@
* @title types of arguments - int, reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eq.d.T_if_eq_9", VerifyError.class);
}
/**
@@ -178,12 +158,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eq.d.T_if_eq_10", VerifyError.class);
}
/**
@@ -191,12 +166,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eq.d.T_if_eq_11", VerifyError.class);
}
/**
@@ -204,12 +174,7 @@
* @title zero offset
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eq.d.T_if_eq_12", VerifyError.class);
}
/**
@@ -218,11 +183,6 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_eq.d.T_if_eq_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eq.d.T_if_eq_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/Test_if_eqz.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/Test_if_eqz.java
index ebedd7f..fac0c9b 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/Test_if_eqz.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/Test_if_eqz.java
@@ -68,12 +68,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eqz.d.T_if_eqz_5", VerifyError.class);
}
@@ -82,12 +77,7 @@
* @title types of arguments - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eqz.d.T_if_eqz_6", VerifyError.class);
}
/**
@@ -95,12 +85,7 @@
* @title types of arguments - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eqz.d.T_if_eqz_7", VerifyError.class);
}
/**
@@ -108,12 +93,7 @@
* @title branch target shall be inside the method
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eqz.d.T_if_eqz_9", VerifyError.class);
}
/**
@@ -121,12 +101,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eqz.d.T_if_eqz_10", VerifyError.class);
}
/**
@@ -134,12 +109,7 @@
* @title branch must not be 0
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eqz.d.T_if_eqz_11", VerifyError.class);
}
/**
@@ -148,12 +118,7 @@
* and floats are not used interchangeably.
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_eqz.d.T_if_eqz_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_eqz.d.T_if_eqz_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/Test_if_ge.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/Test_if_ge.java
index c56a616..e5a4f1e 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/Test_if_ge.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/Test_if_ge.java
@@ -76,12 +76,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ge.d.T_if_ge_4", VerifyError.class);
}
@@ -91,12 +86,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ge.d.T_if_ge_5", VerifyError.class);
}
/**
@@ -104,12 +94,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ge.d.T_if_ge_6", VerifyError.class);
}
/**
@@ -117,12 +102,7 @@
* @title types of arguments - int, reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ge.d.T_if_ge_7", VerifyError.class);
}
/**
@@ -131,12 +111,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ge.d.T_if_ge_3", VerifyError.class);
}
/**
@@ -144,12 +119,7 @@
* @title branch target shall be inside the method
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ge.d.T_if_ge_9", VerifyError.class);
}
/**
@@ -157,12 +127,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ge.d.T_if_ge_10", VerifyError.class);
}
/**
@@ -170,12 +135,7 @@
* @title branch target shall 0
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_ge.d.T_if_ge_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ge.d.T_if_ge_11", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/Test_if_gez.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/Test_if_gez.java
index 432485f..5042943 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/Test_if_gez.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/Test_if_gez.java
@@ -52,12 +52,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gez.d.T_if_gez_3", VerifyError.class);
}
@@ -67,12 +62,7 @@
* @title types of arguments - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gez.d.T_if_gez_4", VerifyError.class);
}
/**
@@ -80,12 +70,7 @@
* @title types of arguments - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gez.d.T_if_gez_5", VerifyError.class);
}
/**
@@ -93,12 +78,7 @@
* @title types of arguments - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gez.d.T_if_gez_6", VerifyError.class);
}
/**
@@ -106,12 +86,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gez.d.T_if_gez_8", VerifyError.class);
}
/**
@@ -119,12 +94,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gez.d.T_if_gez_9", VerifyError.class);
}
/**
@@ -132,12 +102,7 @@
* @title branch must not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gez.d.T_if_gez_10", VerifyError.class);
}
/**
@@ -146,12 +111,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_gez.d.T_if_gez_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gez.d.T_if_gez_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/Test_if_gt.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/Test_if_gt.java
index b977e57..8209480 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/Test_if_gt.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/Test_if_gt.java
@@ -76,12 +76,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gt.d.T_if_gt_4", VerifyError.class);
}
@@ -90,12 +85,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gt.d.T_if_gt_5", VerifyError.class);
}
/**
@@ -103,12 +93,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gt.d.T_if_gt_6", VerifyError.class);
}
/**
@@ -116,12 +101,7 @@
* @title types of arguments - int, reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gt.d.T_if_gt_7", VerifyError.class);
}
/**
@@ -129,12 +109,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gt.d.T_if_gt_9", VerifyError.class);
}
/**
@@ -142,12 +117,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gt.d.T_if_gt_10", VerifyError.class);
}
/**
@@ -155,12 +125,7 @@
* @title branch target shall not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gt.d.T_if_gt_11", VerifyError.class);
}
/**
@@ -169,12 +134,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_gt.d.T_if_gt_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gt.d.T_if_gt_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/Test_if_gtz.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/Test_if_gtz.java
index 242cf26..ead93fe 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/Test_if_gtz.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/Test_if_gtz.java
@@ -52,12 +52,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gtz.d.T_if_gtz_3", VerifyError.class);
}
@@ -66,12 +61,7 @@
* @title types of arguments - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gtz.d.T_if_gtz_4", VerifyError.class);
}
/**
@@ -79,12 +69,7 @@
* @title types of arguments - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gtz.d.T_if_gtz_5", VerifyError.class);
}
/**
@@ -92,12 +77,7 @@
* @title types of arguments - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gtz.d.T_if_gtz_6", VerifyError.class);
}
/**
@@ -105,12 +85,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gtz.d.T_if_gtz_8", VerifyError.class);
}
/**
@@ -118,12 +93,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gtz.d.T_if_gtz_9", VerifyError.class);
}
/**
@@ -131,12 +101,7 @@
* @title branch must not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gtz.d.T_if_gtz_10", VerifyError.class);
}
/**
@@ -145,12 +110,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_gtz.d.T_if_gtz_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_gtz.d.T_if_gtz_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/Test_if_le.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/Test_if_le.java
index e0653b4..49e9bf8 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/Test_if_le.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/Test_if_le.java
@@ -76,12 +76,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_le.d.T_if_le_4", VerifyError.class);
}
@@ -91,12 +86,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_le.d.T_if_le_5", VerifyError.class);
}
/**
@@ -104,12 +94,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_le.d.T_if_le_6", VerifyError.class);
}
/**
@@ -117,12 +102,7 @@
* @title types of arguments - int, reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_le.d.T_if_le_7", VerifyError.class);
}
/**
@@ -130,12 +110,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_le.d.T_if_le_9", VerifyError.class);
}
/**
@@ -143,12 +118,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_le.d.T_if_le_10", VerifyError.class);
}
/**
@@ -156,12 +126,7 @@
* @title branch target shall not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_le.d.T_if_le_12", VerifyError.class);
}
/**
@@ -170,11 +135,6 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_le.d.T_if_le_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_le.d.T_if_le_11", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/Test_if_lez.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/Test_if_lez.java
index 74599d5..a6097fe 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/Test_if_lez.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/Test_if_lez.java
@@ -52,12 +52,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lez.d.T_if_lez_3", VerifyError.class);
}
@@ -67,12 +62,7 @@
* @title types of arguments - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lez.d.T_if_lez_4", VerifyError.class);
}
/**
@@ -80,12 +70,7 @@
* @title types of arguments - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lez.d.T_if_lez_5", VerifyError.class);
}
/**
@@ -93,12 +78,7 @@
* @title types of arguments - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lez.d.T_if_lez_6", VerifyError.class);
}
/**
@@ -106,12 +86,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lez.d.T_if_lez_8", VerifyError.class);
}
/**
@@ -119,12 +94,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lez.d.T_if_lez_9", VerifyError.class);
}
/**
@@ -132,12 +102,7 @@
* @title branch must not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lez.d.T_if_lez_10", VerifyError.class);
}
/**
@@ -146,12 +111,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_lez.d.T_if_lez_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lez.d.T_if_lez_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/Test_if_lt.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/Test_if_lt.java
index 7f186d9..3be2998 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/Test_if_lt.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/Test_if_lt.java
@@ -76,12 +76,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lt.d.T_if_lt_4", VerifyError.class);
}
@@ -90,12 +85,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lt.d.T_if_lt_5", VerifyError.class);
}
/**
@@ -103,12 +93,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lt.d.T_if_lt_6", VerifyError.class);
}
/**
@@ -116,12 +101,7 @@
* @title types of arguments - int, reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lt.d.T_if_lt_7", VerifyError.class);
}
/**
@@ -129,12 +109,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lt.d.T_if_lt_9", VerifyError.class);
}
/**
@@ -142,12 +117,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lt.d.T_if_lt_10", VerifyError.class);
}
/**
@@ -155,12 +125,7 @@
* @title branch target shall not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lt.d.T_if_lt_12", VerifyError.class);
}
/**
@@ -169,12 +134,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_lt.d.T_if_lt_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_lt.d.T_if_lt_11", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/Test_if_ltz.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/Test_if_ltz.java
index a73b95b..471deee 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/Test_if_ltz.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/Test_if_ltz.java
@@ -52,12 +52,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ltz.d.T_if_ltz_3", VerifyError.class);
}
@@ -66,12 +61,7 @@
* @title types of arguments - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ltz.d.T_if_ltz_4", VerifyError.class);
}
/**
@@ -79,12 +69,7 @@
* @title types of arguments - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ltz.d.T_if_ltz_5", VerifyError.class);
}
/**
@@ -92,12 +77,7 @@
* @title types of arguments - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ltz.d.T_if_ltz_6", VerifyError.class);
}
/**
@@ -105,12 +85,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ltz.d.T_if_ltz_8", VerifyError.class);
}
/**
@@ -118,12 +93,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ltz.d.T_if_ltz_9", VerifyError.class);
}
/**
@@ -131,12 +101,7 @@
* @title branch must not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ltz.d.T_if_ltz_7", VerifyError.class);
}
/**
@@ -145,12 +110,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_ltz.d.T_if_ltz_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ltz.d.T_if_ltz_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/Test_if_ne.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/Test_if_ne.java
index 9f69a12..e104de6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/Test_if_ne.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/Test_if_ne.java
@@ -105,12 +105,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ne.d.T_if_ne_5", VerifyError.class);
}
@@ -120,12 +115,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ne.d.T_if_ne_7", VerifyError.class);
}
/**
@@ -133,12 +123,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ne.d.T_if_ne_8", VerifyError.class);
}
/**
@@ -146,12 +131,7 @@
* @title types of arguments - int, reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ne.d.T_if_ne_9", VerifyError.class);
}
/**
@@ -159,12 +139,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ne.d.T_if_ne_10", VerifyError.class);
}
/**
@@ -172,12 +147,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ne.d.T_if_ne_11", VerifyError.class);
}
/**
@@ -185,12 +155,7 @@
* @title branch target shall not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ne.d.T_if_ne_12", VerifyError.class);
}
/**
@@ -199,12 +164,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.if_ne.d.T_if_ne_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_ne.d.T_if_ne_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/Test_if_nez.java b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/Test_if_nez.java
index a8dece5..2a7761a 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/Test_if_nez.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/Test_if_nez.java
@@ -73,12 +73,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_nez.d.T_if_nez_5", VerifyError.class);
}
@@ -87,12 +82,7 @@
* @title types of arguments - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_nez.d.T_if_nez_6", VerifyError.class);
}
/**
@@ -100,12 +90,7 @@
* @title types of arguments - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_nez.d.T_if_nez_7", VerifyError.class);
}
/**
@@ -114,12 +99,7 @@
* and floats are not used interchangeably.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_nez.d.T_if_nez_3", VerifyError.class);
}
/**
@@ -127,12 +107,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_nez.d.T_if_nez_9", VerifyError.class);
}
/**
@@ -140,12 +115,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_nez.d.T_if_nez_10", VerifyError.class);
}
/**
@@ -153,11 +123,6 @@
* @title branch must not be 0
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.if_nez.d.T_if_nez_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.if_nez.d.T_if_nez_11", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/Test_iget.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/Test_iget.java
index 50658ce..c3a0f09 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/Test_iget.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/Test_iget.java
@@ -62,13 +62,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iget_9 t = new T_iget_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget.d.T_iget_9", NullPointerException.class);
}
/**
@@ -76,12 +70,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_4", VerifyError.class);
}
/**
@@ -90,12 +79,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_3", VerifyError.class);
}
/**
@@ -104,12 +88,7 @@
* different type exist
*/
public void testVFE3() {
- try {
- new T_iget_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget.d.T_iget_13", NoSuchFieldError.class);
}
/**
@@ -117,14 +96,8 @@
* @title Attempt to read inaccessible private field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.iget.d.T_iget_6
//@uses dot.junit.opcodes.iget.TestStubs
- try {
- new T_iget_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget.d.T_iget_6", IllegalAccessError.class);
}
/**
@@ -132,12 +105,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_iget_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget.d.T_iget_7", NoClassDefFoundError.class);
}
/**
@@ -145,12 +113,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_iget_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget.d.T_iget_8", NoSuchFieldError.class);
}
/**
@@ -158,14 +121,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.iget.d.T_iget_12
//@uses dot.junit.opcodes.iget.d.T_iget_1
- try {
- new T_iget_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget.d.T_iget_12", IllegalAccessError.class);
}
/**
@@ -173,12 +130,7 @@
* @title iget shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_14", VerifyError.class);
}
/**
@@ -187,12 +139,7 @@
* @title iget shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_15", VerifyError.class);
}
/**
@@ -201,12 +148,7 @@
* @title iget shall not work for boolean fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_16", VerifyError.class);
}
/**
@@ -215,12 +157,7 @@
* @title iget shall not work for char fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_17", VerifyError.class);
}
/**
@@ -229,12 +166,7 @@
* @title iget shall not work for byte fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_18", VerifyError.class);
}
/**
@@ -243,12 +175,7 @@
* @title iget shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_19", VerifyError.class);
}
/**
@@ -257,12 +184,7 @@
* @title iget shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_20", VerifyError.class);
}
/**
@@ -270,14 +192,8 @@
* @title Attempt to read protected field of unrelated class.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.iget.d.T_iget_21
//@uses dot.junit.opcodes.iget.TestStubs
- try {
- new T_iget_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget.d.T_iget_21", IllegalAccessError.class);
}
/**
@@ -285,27 +201,24 @@
* @title Attempt to read static field.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.iget.d.T_iget_5
//@uses dot.junit.opcodes.iget.TestStubs
- try {
- new T_iget_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget.d.T_iget_5", IncompatibleClassChangeError.class);
}
/**
* @constraint B6
- * @title instance fields may only be accessed on already initialized instances.
+ * @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget.d.T_iget_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget.d.T_iget_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference values.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iget.d.T_iget_31", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_31.d
new file mode 100644
index 0000000..3659b15
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iget_31.java
+.class public dot.junit.opcodes.iget.d.T_iget_31
+.super java/lang/Object
+
+.field public st_i1 I
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()I
+.limit regs 3
+ iget v0, v0, dot.junit.opcodes.iget.d.T_iget_31.st_i1 I
+ return v0
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/Test_iget_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/Test_iget_boolean.java
index b23f330..f16b89c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/Test_iget_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/Test_iget_boolean.java
@@ -54,28 +54,16 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iget_boolean_9 t = new T_iget_boolean_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_9",
+ NullPointerException.class);
}
-
-
/**
* @constraint A11
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_4", VerifyError.class);
}
/**
@@ -83,12 +71,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_3", VerifyError.class);
}
/**
@@ -97,12 +80,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_iget_boolean_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_13", NoSuchFieldError.class);
}
/**
@@ -110,14 +88,8 @@
* @title Attempt to read inaccessible field
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_6
//@uses dot.junit.opcodes.iget_boolean.TestStubs
- try {
- new T_iget_boolean_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_6", IllegalAccessError.class);
}
/**
@@ -125,12 +97,8 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_iget_boolean_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_7",
+ NoClassDefFoundError.class);
}
/**
@@ -138,12 +106,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_iget_boolean_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_8", NoSuchFieldError.class);
}
/**
@@ -151,14 +114,9 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_12
//@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_1
- try {
- new T_iget_boolean_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_12
+ loadAndRun("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_12", IllegalAccessError.class);
}
/**
@@ -166,12 +124,7 @@
* @title iget_boolean shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_14", VerifyError.class);
}
/**
@@ -180,12 +133,7 @@
* @title iget_boolean shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_15", VerifyError.class);
}
/**
@@ -193,12 +141,7 @@
* @title iget_boolean shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_16", VerifyError.class);
}
/**
@@ -206,12 +149,7 @@
* @title iget_boolean shall not work for char fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_17", VerifyError.class);
}
/**
@@ -219,12 +157,7 @@
* @title iget_boolean shall not work for byte fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_18", VerifyError.class);
}
/**
@@ -232,12 +165,7 @@
* @title iget_boolean shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_19", VerifyError.class);
}
/**
@@ -245,12 +173,7 @@
* @title iget_boolean shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_20", VerifyError.class);
}
/**
@@ -258,14 +181,8 @@
* @title Attempt to read inaccessible protected field.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_21
//@uses dot.junit.opcodes.iget_boolean.TestStubs
- try {
- new T_iget_boolean_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_21", IllegalAccessError.class);
}
@@ -274,14 +191,9 @@
* @title Attempt to read static field.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.iget_boolean.d.T_iget_boolean_5
//@uses dot.junit.opcodes.iget_boolean.TestStubs
- try {
- new T_iget_boolean_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_5",
+ IncompatibleClassChangeError.class);
}
/**
@@ -289,11 +201,14 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference values.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iget_boolean.d.T_iget_boolean_31", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_31.d
new file mode 100644
index 0000000..ade9e7b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iget_boolean_31.java
+.class public dot.junit.opcodes.iget_boolean.d.T_iget_boolean_31
+.super java/lang/Object
+
+.field public st_i1 Z
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()Z
+.limit regs 3
+ iget v0, v0, dot.junit.opcodes.iget_boolean.d.T_iget_boolean_31.st_i1 Z
+ return v0
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/Test_iget_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/Test_iget_byte.java
index de48192..410dad4 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/Test_iget_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/Test_iget_byte.java
@@ -54,13 +54,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iget_byte_9 t = new T_iget_byte_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_byte.d.T_iget_byte_9", NullPointerException.class);
}
/**
@@ -68,12 +62,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_4", VerifyError.class);
}
/**
@@ -81,12 +70,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_3", VerifyError.class);
}
/**
@@ -95,12 +79,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_iget_byte_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_byte.d.T_iget_byte_13", NoSuchFieldError.class);
}
/**
@@ -108,14 +87,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_6
//@uses dot.junit.opcodes.iget_byte.TestStubs
- try {
- new T_iget_byte_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_byte.d.T_iget_byte_6", IllegalAccessError.class);
}
/**
@@ -123,12 +96,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_iget_byte_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_byte.d.T_iget_byte_7", NoClassDefFoundError.class);
}
/**
@@ -136,12 +104,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_iget_byte_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_byte.d.T_iget_byte_8", NoSuchFieldError.class);
}
/**
@@ -149,14 +112,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_12
//@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_1
- try {
- new T_iget_byte_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_byte.d.T_iget_byte_12", IllegalAccessError.class);
}
/**
@@ -164,12 +121,7 @@
* @title iget_byte shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_14", VerifyError.class);
}
/**
@@ -177,12 +129,7 @@
* @title iget_byte shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_15", VerifyError.class);
}
/**
@@ -190,12 +137,7 @@
* @title iget_byte shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_16", VerifyError.class);
}
/**
@@ -203,12 +145,7 @@
* @title iget_byte shall not work for char fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_17", VerifyError.class);
}
/**
@@ -216,12 +153,7 @@
* @title iget_byte shall not work for boolean fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_18", VerifyError.class);
}
/**
@@ -229,12 +161,7 @@
* @title iget_byte shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_19", VerifyError.class);
}
/**
@@ -242,12 +169,7 @@
* @title iget_byte shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_20", VerifyError.class);
}
/**
@@ -255,14 +177,8 @@
* @title Attempt to read inaccessible protected field.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_21
//@uses dot.junit.opcodes.iget_byte.TestStubs
- try {
- new T_iget_byte_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_byte.d.T_iget_byte_21", IllegalAccessError.class);
}
@@ -271,14 +187,9 @@
* @title Attempt to read static field.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.iget_byte.d.T_iget_byte_5
- //@uses dot.junit.opcodes.iget_byte.TestStubs
- try {
- new T_iget_byte_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ //@uses dot.junit.opcodes.iget_byte.TestStubs
+ loadAndRun("dot.junit.opcodes.iget_byte.d.T_iget_byte_5",
+ IncompatibleClassChangeError.class);
}
/**
@@ -286,11 +197,14 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_byte.d.T_iget_byte_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference values.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iget_byte.d.T_iget_byte_31", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_31.d
new file mode 100644
index 0000000..0a84091
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iget_byte_31.java
+.class public dot.junit.opcodes.iget_byte.d.T_iget_byte_31
+.super java/lang/Object
+
+.field public st_i1 B
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()B
+.limit regs 3
+ iget v0, v0, dot.junit.opcodes.iget_byte.d.T_iget_byte_31.st_i1 B
+ return v0
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/Test_iget_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/Test_iget_char.java
index c7516e8..ff86ae3 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/Test_iget_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/Test_iget_char.java
@@ -54,13 +54,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iget_char_9 t = new T_iget_char_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_char.d.T_iget_char_9", NullPointerException.class);
}
@@ -69,12 +63,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_4", VerifyError.class);
}
/**
@@ -83,12 +72,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_3", VerifyError.class);
}
/**
@@ -98,12 +82,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_iget_char_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_char.d.T_iget_char_13", NoSuchFieldError.class);
}
/**
@@ -111,14 +90,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_6
//@uses dot.junit.opcodes.iget_char.TestStubs
- try {
- new T_iget_char_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_char.d.T_iget_char_6", IllegalAccessError.class);
}
/**
@@ -126,12 +99,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_iget_char_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_char.d.T_iget_char_7", NoClassDefFoundError.class);
}
/**
@@ -139,12 +107,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_iget_char_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_char.d.T_iget_char_8", NoSuchFieldError.class);
}
/**
@@ -152,14 +115,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_12
//@uses dot.junit.opcodes.iget_char.d.T_iget_char_1
- try {
- new T_iget_char_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_char.d.T_iget_char_12", IllegalAccessError.class);
}
/**
@@ -167,12 +124,7 @@
* @title iget_char shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_14", VerifyError.class);
}
/**
@@ -181,12 +133,7 @@
* @title iget_char shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_15", VerifyError.class);
}
/**
@@ -195,12 +142,7 @@
* @title iget_char shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_16", VerifyError.class);
}
/**
@@ -209,12 +151,7 @@
* @title iget_char shall not work for byte fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_17", VerifyError.class);
}
/**
@@ -223,12 +160,7 @@
* @title iget_char shall not work for boolean fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_18", VerifyError.class);
}
/**
@@ -236,12 +168,7 @@
* @title iget_char shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_19", VerifyError.class);
}
/**
@@ -249,12 +176,7 @@
* @title iget_char shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_20", VerifyError.class);
}
/**
@@ -262,14 +184,8 @@
* @title Attempt to read inaccessible protected field.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_21
//@uses dot.junit.opcodes.iget_char.TestStubs
- try {
- new T_iget_char_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_char.d.T_iget_char_21", IllegalAccessError.class);
}
@@ -278,14 +194,9 @@
* @title Attempt to read static field.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.iget_char.d.T_iget_char_5
//@uses dot.junit.opcodes.iget_char.TestStubs
- try {
- new T_iget_char_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError t) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_char.d.T_iget_char_5",
+ IncompatibleClassChangeError.class);
}
@@ -294,11 +205,14 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_char.d.T_iget_char_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference values.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iget_char.d.T_iget_char_31", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_31.d
new file mode 100644
index 0000000..0f5c6d7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iget_char_31.java
+.class public dot.junit.opcodes.iget_char.d.T_iget_char_31
+.super java/lang/Object
+
+.field public st_i1 C
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()C
+.limit regs 3
+ iget v0, v0, dot.junit.opcodes.iget_char.d.T_iget_char_31.st_i1 C
+ return v0
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/Test_iget_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/Test_iget_object.java
index 3a735b6..7314141 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/Test_iget_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/Test_iget_object.java
@@ -55,13 +55,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iget_object_9 t = new T_iget_object_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_9", NullPointerException.class);
}
/**
@@ -69,12 +63,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_4", VerifyError.class);
}
/**
@@ -83,12 +72,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_3", VerifyError.class);
}
/**
@@ -98,12 +82,7 @@
* different type exists)
*/
public void testVFE3() {
- try {
- new T_iget_object_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_13", NoSuchFieldError.class);
}
/**
@@ -111,14 +90,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_6
//@uses dot.junit.opcodes.iget_object.TestStubs
- try {
- new T_iget_object_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_6", IllegalAccessError.class);
}
/**
@@ -126,12 +99,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_iget_object_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_7", NoClassDefFoundError.class);
}
/**
@@ -139,12 +107,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_iget_object_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_8", NoSuchFieldError.class);
}
/**
@@ -152,14 +115,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_12
//@uses dot.junit.opcodes.iget_object.d.T_iget_object_1
- try {
- new T_iget_object_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_12", IllegalAccessError.class);
}
/**
@@ -167,12 +124,7 @@
* @title iget_object shall not work for short fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_14", VerifyError.class);
}
/**
@@ -181,12 +133,7 @@
* @title iget_object shall not work for char fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_15", VerifyError.class);
}
/**
@@ -195,12 +142,7 @@
* @title iget_object shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_16", VerifyError.class);
}
/**
@@ -209,12 +151,7 @@
* @title iget_object shall not work for byte fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_17", VerifyError.class);
}
/**
@@ -223,12 +160,7 @@
* @title iget_object shall not work for boolean fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_18", VerifyError.class);
}
/**
@@ -237,12 +169,7 @@
* @title iget_object shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_19", VerifyError.class);
}
/**
@@ -251,12 +178,7 @@
* @title iget_object shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_20", VerifyError.class);
}
/**
@@ -265,12 +187,7 @@
* @title only field of different type exists
*/
public void testVFE15() {
- try {
- new T_iget_object_21().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_21", NoSuchFieldError.class);
}
/**
@@ -278,14 +195,8 @@
* @title Attempt to read inaccessible protected field.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_22
//@uses dot.junit.opcodes.iget_object.TestStubs
- try {
- new T_iget_object_22().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_22", IllegalAccessError.class);
}
/**
@@ -293,14 +204,9 @@
* @title Attempt to read static field.
*/
public void testVFE17() {
- //@uses dot.junit.opcodes.iget_object.d.T_iget_object_5
//@uses dot.junit.opcodes.iget_object.TestStubs
- try {
- new T_iget_object_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_object.d.T_iget_object_5",
+ IncompatibleClassChangeError.class);
}
/**
@@ -308,11 +214,14 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_object.d.T_iget_object_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on already initialized instances.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iget_object.d.T_iget_object_31", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_31.d
new file mode 100644
index 0000000..f194ecd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iget_object_31.java
+.class public dot.junit.opcodes.iget_object.d.T_iget_object_31
+.super java/lang/Object
+
+.field public st_i1 Ldot/junit/opcodes/iget_object/d/T_iget_object_31;
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()Ldot/junit/opcodes/iget_object/d/T_iget_object_31;
+.limit regs 3
+ iget v0, v0, dot.junit.opcodes.iget_object.d.T_iget_object_31.st_i1 Ldot/junit/opcodes/iget_object/d/T_iget_object_31;
+ return v0
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/Test_iget_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/Test_iget_short.java
index a7d3658..566ec3f 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/Test_iget_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/Test_iget_short.java
@@ -54,28 +54,15 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iget_short_9 t = new T_iget_short_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_short.d.T_iget_short_9", NullPointerException.class);
}
-
-
/**
* @constraint A11
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_4", VerifyError.class);
}
/**
@@ -84,12 +71,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_3", VerifyError.class);
}
/**
@@ -99,12 +81,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_iget_short_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_short.d.T_iget_short_13", NoSuchFieldError.class);
}
/**
@@ -112,14 +89,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_6
//@uses dot.junit.opcodes.iget_short.TestStubs
- try {
- new T_iget_short_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_short.d.T_iget_short_6", IllegalAccessError.class);
}
/**
@@ -127,12 +98,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_iget_short_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_short.d.T_iget_short_7", NoClassDefFoundError.class);
}
/**
@@ -140,12 +106,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_iget_short_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_short.d.T_iget_short_8", NoSuchFieldError.class);
}
/**
@@ -153,14 +114,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_12
//@uses dot.junit.opcodes.iget_short.d.T_iget_short_1
- try {
- new T_iget_short_12().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_short.d.T_iget_short_12", IllegalAccessError.class);
}
/**
@@ -168,12 +123,7 @@
* @title iget_short shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_14", VerifyError.class);
}
/**
@@ -182,12 +132,7 @@
* @title iget_short shall not work for char fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_15", VerifyError.class);
}
/**
@@ -196,12 +141,7 @@
* @title iget_short shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_16", VerifyError.class);
}
/**
@@ -210,12 +150,7 @@
* @title iget_short shall not work for byte fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_17", VerifyError.class);
}
/**
@@ -224,12 +159,7 @@
* @title iget_short shall not work for boolean fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_18", VerifyError.class);
}
/**
@@ -238,12 +168,7 @@
* @title iget_short shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_19", VerifyError.class);
}
/**
@@ -252,12 +177,7 @@
* @title iget_short shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_20", VerifyError.class);
}
/**
@@ -265,30 +185,18 @@
* @title Attempt to read inaccessible protected field.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_21
//@uses dot.junit.opcodes.iget_short.TestStubs
- try {
- new T_iget_short_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_short.d.T_iget_short_21", IllegalAccessError.class);
}
-
/**
* @constraint A11
* @title Attempt to read static field.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.iget_short.d.T_iget_short_5
//@uses dot.junit.opcodes.iget_short.TestStubs
- try {
- new T_iget_short_5().run();
- fail("expected an IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_short.d.T_iget_short_5",
+ IncompatibleClassChangeError.class);
}
/**
@@ -296,11 +204,14 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_short.d.T_iget_short_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on already initialized instances.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iget_short.d.T_iget_short_31", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_31.d
new file mode 100644
index 0000000..af8a395
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iget_short_31.java
+.class public dot.junit.opcodes.iget_short.d.T_iget_short_31
+.super java/lang/Object
+
+.field public st_i1 S
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()S
+.limit regs 3
+ iget v0, v0, dot.junit.opcodes.iget_short.d.T_iget_short_31.st_i1 S
+ return v0
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/Test_iget_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/Test_iget_wide.java
index 7e42d32..f82a1d3 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/Test_iget_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/Test_iget_wide.java
@@ -62,13 +62,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iget_wide_9 t = new T_iget_wide_9();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_wide.d.T_iget_wide_9", NullPointerException.class);
}
/**
@@ -76,12 +70,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_4", VerifyError.class);
}
/**
@@ -90,12 +79,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_3", VerifyError.class);
}
/**
@@ -105,12 +89,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_iget_wide_13().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_wide.d.T_iget_wide_13", NoSuchFieldError.class);
}
/**
@@ -118,14 +97,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_6
//@uses dot.junit.opcodes.iget_wide.TestStubs
- try {
- new T_iget_wide_6().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_wide.d.T_iget_wide_6", IllegalAccessError.class);
}
/**
@@ -133,12 +106,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_iget_wide_7().run();
- fail("expected a NoClassDefFoundError exception");
- } catch (NoClassDefFoundError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_wide.d.T_iget_wide_7", NoClassDefFoundError.class);
}
/**
@@ -146,12 +114,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_iget_wide_8().run();
- fail("expected a NoSuchFieldError exception");
- } catch (NoSuchFieldError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_wide.d.T_iget_wide_8", NoSuchFieldError.class);
}
/**
@@ -159,14 +122,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_12
//@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_1
- try {
- new T_iget_wide_12().run();
- fail("expected a IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_wide.d.T_iget_wide_12", IllegalAccessError.class);
}
/**
@@ -174,12 +131,7 @@
* @title iget-wide shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_14", VerifyError.class);
}
/**
@@ -188,12 +140,7 @@
* @title iget-wide shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_15", VerifyError.class);
}
/**
@@ -202,12 +149,7 @@
* @title iget-wide shall not work for boolean fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_16", VerifyError.class);
}
/**
@@ -216,12 +158,7 @@
* @title iget-wide shall not work for char fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_17", VerifyError.class);
}
/**
@@ -230,12 +167,7 @@
* @title iget-wide shall not work for byte fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_18", VerifyError.class);
}
/**
@@ -244,12 +176,7 @@
* @title iget-wide shall not work for float fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_19", VerifyError.class);
}
/**
@@ -258,12 +185,7 @@
* @title iget-wide shall not work for int fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_20", VerifyError.class);
}
/**
@@ -271,14 +193,8 @@
* @title Attempt to read inaccessible protected field.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_21
//@uses dot.junit.opcodes.iget_wide.TestStubs
- try {
- new T_iget_wide_21().run();
- fail("expected an IllegalAccessError exception");
- } catch (IllegalAccessError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_wide.d.T_iget_wide_21", IllegalAccessError.class);
}
/**
@@ -286,14 +202,9 @@
* @title Attempt to read static field.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.iget_wide.d.T_iget_wide_5
//@uses dot.junit.opcodes.iget_wide.TestStubs
- try {
- new T_iget_wide_5().run();
- fail("expected a IncompatibleClassChangeError exception");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iget_wide.d.T_iget_wide_5",
+ IncompatibleClassChangeError.class);
}
/**
@@ -301,11 +212,14 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iget_wide.d.T_iget_wide_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on already initialized instances.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iget_wide.d.T_iget_wide_31", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_31.d
new file mode 100644
index 0000000..7f97a07
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iget_wide_31.java
+.class public dot.junit.opcodes.iget_wide.d.T_iget_wide_31
+.super java/lang/Object
+
+.field public st_i1 J
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()J
+.limit regs 3
+ iget v0, v0, dot.junit.opcodes.iget_wide.d.T_iget_wide_31.st_i1 J
+ return v0
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/instance_of/Test_instance_of.java b/tools/vm-tests-tf/src/dot/junit/opcodes/instance_of/Test_instance_of.java
index b0a6cc6..f35e147 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/instance_of/Test_instance_of.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/instance_of/Test_instance_of.java
@@ -64,28 +64,14 @@
*/
public void testE2() {
//@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 IllegalAccessError");
- } catch (IllegalAccessError e) {
- }
+ loadAndRun("dot.junit.opcodes.instance_of.d.T_instance_of_3", IllegalAccessError.class);
}
/**
* @title Attempt to access undefined class.
*/
public void testE3() {
- try {
- T_instance_of_7 tt = new T_instance_of_7();
- tt.run();
- fail("expected a verification exception");
- } catch (NoClassDefFoundError e) {
- // expected
- } catch(VerifyError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.instance_of.d.T_instance_of_7", NoClassDefFoundError.class);
}
/**
@@ -93,12 +79,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.instance_of.d.T_instance_of_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.instance_of.d.T_instance_of_4", VerifyError.class);
}
/**
@@ -107,12 +88,7 @@
* @title type of argument - int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.instance_of.d.T_instance_of_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.instance_of.d.T_instance_of_5", VerifyError.class);
}
/**
@@ -121,12 +97,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.instance_of.d.T_instance_of_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.instance_of.d.T_instance_of_8", VerifyError.class);
}
/**
@@ -135,12 +106,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.instance_of.d.T_instance_of_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.instance_of.d.T_instance_of_6", VerifyError.class);
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/Test_int_to_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/Test_int_to_byte.java
index ad50cb6..9401e14 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/Test_int_to_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/Test_int_to_byte.java
@@ -134,12 +134,7 @@
* @title type of argument - double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_2", VerifyError.class);
}
/**
@@ -148,12 +143,7 @@
* @title type of argument - long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_3", VerifyError.class);
}
/**
@@ -162,12 +152,7 @@
* @title type of argument - reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_4", VerifyError.class);
}
/**
@@ -175,12 +160,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_6", VerifyError.class);
}
/**
@@ -189,12 +169,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_byte.d.T_int_to_byte_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/Test_int_to_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/Test_int_to_char.java
index c6aa047..4c3f8ac 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/Test_int_to_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/Test_int_to_char.java
@@ -93,12 +93,7 @@
* @title type of argument - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_char.d.T_int_to_char_2", VerifyError.class);
}
/**
@@ -106,12 +101,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_char.d.T_int_to_char_3", VerifyError.class);
}
/**
@@ -119,12 +109,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_char.d.T_int_to_char_4", VerifyError.class);
}
/**
@@ -132,12 +117,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_char.d.T_int_to_char_6", VerifyError.class);
}
/**
@@ -146,12 +126,7 @@
* and floats are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.int_to_char.d.T_int_to_char_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_char.d.T_int_to_char_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/Test_int_to_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/Test_int_to_double.java
index 675821b..892f461 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/Test_int_to_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/Test_int_to_double.java
@@ -77,12 +77,7 @@
* @title type of argument - long
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_double.d.T_int_to_double_3", VerifyError.class);
}
/**
@@ -90,12 +85,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_double.d.T_int_to_double_4", VerifyError.class);
}
/**
@@ -103,12 +93,7 @@
* @title type of argument - reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_double.d.T_int_to_double_5", VerifyError.class);
}
/**
@@ -116,12 +101,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_double.d.T_int_to_double_7", VerifyError.class);
}
/**
@@ -130,11 +110,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.int_to_double.d.T_int_to_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_double.d.T_int_to_double_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/Test_int_to_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/Test_int_to_float.java
index eaa7a31..a6f1742 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/Test_int_to_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/Test_int_to_float.java
@@ -85,12 +85,7 @@
* @title (type of argument - double)
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_float.d.T_int_to_float_2", VerifyError.class);
}
/**
@@ -99,12 +94,7 @@
* @title type of argument - long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_float.d.T_int_to_float_3", VerifyError.class);
}
/**
@@ -113,12 +103,7 @@
* @title type of argument - reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_float.d.T_int_to_float_4", VerifyError.class);
}
/**
@@ -126,12 +111,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_float.d.T_int_to_float_6", VerifyError.class);
}
/**
@@ -140,12 +120,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.int_to_float.d.T_int_to_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_float.d.T_int_to_float_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/Test_int_to_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/Test_int_to_long.java
index 41db35d..931b79c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/Test_int_to_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/Test_int_to_long.java
@@ -77,12 +77,7 @@
* @title type of argument - double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_long.d.T_int_to_long_2", VerifyError.class);
}
/**
@@ -91,12 +86,7 @@
* @title type of argument - long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_long.d.T_int_to_long_3", VerifyError.class);
}
/**
@@ -104,12 +94,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_long.d.T_int_to_long_4", VerifyError.class);
}
/**
@@ -117,12 +102,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_long.d.T_int_to_long_5", VerifyError.class);
}
/**
@@ -130,12 +110,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_long.d.T_int_to_long_7", VerifyError.class);
}
/**
@@ -144,11 +119,6 @@
* and floats are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.int_to_long.d.T_int_to_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_long.d.T_int_to_long_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/Test_int_to_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/Test_int_to_short.java
index b245fc1..898b8ad 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/Test_int_to_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/Test_int_to_short.java
@@ -109,12 +109,7 @@
* @title type of argument - double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_short.d.T_int_to_short_2", VerifyError.class);
}
/**
@@ -123,12 +118,7 @@
* @title type of argument - long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_short.d.T_int_to_short_3", VerifyError.class);
}
/**
@@ -137,12 +127,7 @@
* @title type of argument - reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_short.d.T_int_to_short_4", VerifyError.class);
}
/**
@@ -150,12 +135,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_short.d.T_int_to_short_6", VerifyError.class);
}
/**
@@ -164,12 +144,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.int_to_short.d.T_int_to_short_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.int_to_short.d.T_int_to_short_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java
index c5402b3..34462f6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/Test_invoke_direct.java
@@ -54,26 +54,16 @@
* @title objref is null
*/
public void testE3() {
- T_invoke_direct_8 t = new T_invoke_direct_8();
- try {
- assertEquals(5, t.run());
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_8",
+ NullPointerException.class);
}
/**
* @title Native method can't be linked
*/
public void testE5() {
- T_invoke_direct_9 t = new T_invoke_direct_9();
- try {
- assertEquals(5, t.run());
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_9",
+ UnsatisfiedLinkError.class);
}
/**
@@ -81,12 +71,7 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_3", VerifyError.class);
}
/**
@@ -94,12 +79,7 @@
* @title invoke-direct may not be used to invoke <clinit>
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_4", VerifyError.class);
}
/**
@@ -107,14 +87,8 @@
* @title invoke-direct target must be in self or superclass
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_6
//@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- new T_invoke_direct_6();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_6", VerifyError.class);
}
/**
@@ -122,12 +96,7 @@
* @title number of arguments
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_5", VerifyError.class);
}
/**
@@ -135,12 +104,7 @@
* @title int is passed instead of obj ref
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_10", VerifyError.class);
}
@@ -149,12 +113,7 @@
* @title number of arguments passed to method
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_14", VerifyError.class);
}
/**
@@ -162,12 +121,7 @@
* @title types of arguments passed to method
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_24", VerifyError.class);
}
/**
@@ -175,15 +129,9 @@
* @title assignment incompatible references when accessing protected method
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_25
//@uses dot.junit.opcodes.invoke_direct.TPlain
//@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_25", VerifyError.class);
}
/**
@@ -191,14 +139,9 @@
* @title Superclass' method call
*/
public void testVFE11() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_25
//@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_1",
+ IncompatibleClassChangeError.class);
}
/**
@@ -206,12 +149,7 @@
* @title number of registers
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_15", VerifyError.class);
}
@@ -220,11 +158,7 @@
* @title Attempt to call undefined method.
*/
public void testVFE13() {
- try {
- new T_invoke_direct_7().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_7", NoSuchMethodError.class);
}
/**
@@ -232,11 +166,7 @@
* @title Method has different signature.
*/
public void testVFE14() {
- try {
- new T_invoke_direct_16().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_16", NoSuchMethodError.class);
}
/**
@@ -245,20 +175,8 @@
* on first access. Dalvik threw VerifyError on class loading.
*/
public void testVFE15() {
- try {
- Class<?> c = Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_11");
- // Attempt to instantiate and run.
- Object o = c.newInstance();
- java.lang.reflect.Method m = c.getDeclaredMethod("run");
- m.invoke(o);
- fail("expected an invocation target exception with an incompatible class change error");
- } catch (java.lang.reflect.InvocationTargetException ite) {
- if (!(ite.getCause() instanceof IncompatibleClassChangeError)) {
- fail("expected an incompatible class change error");
- }
- } catch (Throwable t) {
- throw new RuntimeException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_11",
+ IncompatibleClassChangeError.class);
}
@@ -267,13 +185,9 @@
* @title Attempt to invoke private method of superclass.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_12
//@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- new T_invoke_direct_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_12",
+ IllegalAccessError.class);
}
@@ -282,14 +196,9 @@
* @title Attempt to invoke abstract method
*/
public void testVFE17() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_13
//@uses dot.junit.opcodes.invoke_direct.TAbstract
- try {
- new T_invoke_direct_13().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_13",
+ IncompatibleClassChangeError.class);
}
/**
@@ -297,12 +206,7 @@
* @title An instance initializer must only be invoked on an uninitialized instance.
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_17", VerifyError.class);
}
/**
@@ -310,14 +214,8 @@
* @title attempt to access inherited instance field before <init> is called
*/
public void testVFE19() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_18
//@uses dot.junit.opcodes.invoke_direct.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_18", VerifyError.class);
}
/**
@@ -325,13 +223,8 @@
* @title attempt to invoke interface method
*/
public void testVFE20() {
- //@uses dot.junit.opcodes.invoke_direct.d.T_invoke_direct_26
- try {
- new T_invoke_direct_26().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_26",
+ IncompatibleClassChangeError.class);
}
/**
@@ -339,11 +232,6 @@
* @title instance methods may only be invoked on already initialized instances.
*/
public void testVFE21() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_27");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct.d.T_invoke_direct_27", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java
index 1fe95c2..2a926e7 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/Test_invoke_direct_range.java
@@ -54,26 +54,16 @@
* @title objref is null
*/
public void testE3() {
- T_invoke_direct_range_8 t = new T_invoke_direct_range_8();
- try {
- assertEquals(5, t.run());
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_8",
+ NullPointerException.class);
}
/**
* @title Native method can't be linked
*/
public void testE5() {
- T_invoke_direct_range_9 t = new T_invoke_direct_range_9();
- try {
- assertEquals(5, t.run());
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_9",
+ UnsatisfiedLinkError.class);
}
/**
@@ -81,12 +71,7 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_3", VerifyError.class);
}
/**
@@ -94,12 +79,7 @@
* @title invoke-direct may not be used to invoke <clinit>
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_4", VerifyError.class);
}
/**
@@ -107,14 +87,8 @@
* @title invoke-direct target must be in self or superclass
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_6
//@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- new T_invoke_direct_range_6();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_6", VerifyError.class);
}
/**
@@ -122,12 +96,7 @@
* @title number of arguments
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_5", VerifyError.class);
}
/**
@@ -135,12 +104,7 @@
* @title int is passed instead of obj ref
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_10", VerifyError.class);
}
@@ -149,12 +113,7 @@
* @title number of arguments passed to method
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_14", VerifyError.class);
}
/**
@@ -162,12 +121,7 @@
* @title types of arguments passed to method
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_24", VerifyError.class);
}
/**
@@ -175,15 +129,9 @@
* @title assignment incompatible references when accessing protected method
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_25
//@uses dot.junit.opcodes.invoke_direct_range.TPlain
//@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_25", VerifyError.class);
}
/**
@@ -191,14 +139,9 @@
* @title Superclass' method call
*/
public void testVFE11() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_25
//@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_1");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_1",
+ IncompatibleClassChangeError.class);
}
/**
@@ -206,12 +149,7 @@
* @title number of registers
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_15", VerifyError.class);
}
@@ -220,11 +158,8 @@
* @title Attempt to call undefined method.
*/
public void testVFE13() {
- try {
- new T_invoke_direct_range_7().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_7",
+ NoSuchMethodError.class);
}
/**
@@ -232,11 +167,8 @@
* @title Method has different signature.
*/
public void testVFE14() {
- try {
- new T_invoke_direct_range_16().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_16",
+ NoSuchMethodError.class);
}
/**
@@ -245,20 +177,8 @@
* on first access. Dalvik threw VerifyError on class loading.
*/
public void testVFE15() {
- try {
- Class<?> c = Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_11");
- // Attempt to instantiate and run.
- Object o = c.newInstance();
- java.lang.reflect.Method m = c.getDeclaredMethod("run");
- m.invoke(o);
- fail("expected an invocation target exception with an incompatible class change error");
- } catch (java.lang.reflect.InvocationTargetException ite) {
- if (!(ite.getCause() instanceof IncompatibleClassChangeError)) {
- fail("expected an incompatible class change error");
- }
- } catch (Throwable t) {
- throw new RuntimeException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_11",
+ IncompatibleClassChangeError.class);
}
@@ -268,13 +188,9 @@
* on first access but Dalvik throws VerifyError on class loading.
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_12
//@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- new T_invoke_direct_range_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_12",
+ IllegalAccessError.class);
}
@@ -283,14 +199,9 @@
* @title Attempt to invoke abstract method
*/
public void testVFE17() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_13
//@uses dot.junit.opcodes.invoke_direct_range.TAbstract
- try {
- new T_invoke_direct_range_13().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_13",
+ IncompatibleClassChangeError.class);
}
/**
@@ -298,12 +209,7 @@
* @title An instance initializer must only be invoked on an uninitialized instance.
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_17", VerifyError.class);
}
/**
@@ -311,14 +217,8 @@
* @title attempt to access inherited instance field before <init> is called
*/
public void testVFE19() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_18
//@uses dot.junit.opcodes.invoke_direct_range.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_18", VerifyError.class);
}
/**
@@ -326,13 +226,8 @@
* @title attempt to invoke interface method
*/
public void testVFE20() {
- //@uses dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_26
- try {
- new T_invoke_direct_range_26().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_26",
+ IncompatibleClassChangeError.class);
}
/**
@@ -340,11 +235,6 @@
* @title instance methods may only be invoked on already initialized instances.
*/
public void testVFE21() {
- try {
- Class.forName("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_27");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_direct_range.d.T_invoke_direct_range_27", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java
index 69c54e1..6972253 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/Test_invoke_interface.java
@@ -63,30 +63,19 @@
* @title objref is null
*/
public void testE3() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_3
//@uses dot.junit.opcodes.invoke_interface.ITest
- try {
- new T_invoke_interface_3(null);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_3",
+ NullPointerException.class);
}
/**
* @title object doesn't implement interface
*/
public void testE4() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_11
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- T_invoke_interface_11 t = new T_invoke_interface_11();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_11",
+ IncompatibleClassChangeError.class);
}
/**
@@ -99,51 +88,31 @@
//@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_11
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- T_invoke_interface_11 t = new T_invoke_interface_11();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError expected) {
- }
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError expected) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_11",
+ IncompatibleClassChangeError.class);
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_11",
+ IncompatibleClassChangeError.class);
}
/**
* @title Native method can't be linked
*/
public void testE5() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_12
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- T_invoke_interface_12 t = new T_invoke_interface_12();
- ITestImpl impl = new ITestImpl();
- try {
- t.run(impl);
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_12",
+ UnsatisfiedLinkError.class, new ITestImpl());
}
/**
* @title Attempt to invoke abstract method
*/
public void testE6() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_13
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
//@uses dot.junit.opcodes.invoke_interface.ITestImplAbstract
- T_invoke_interface_13 t = new T_invoke_interface_13();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_13",
+ AbstractMethodError.class);
}
/**
@@ -151,12 +120,7 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_2", VerifyError.class);
}
/**
@@ -164,11 +128,8 @@
* @title The referenced method_id must belong to an interface (not a class).
*/
public void testVFE2() {
- try {
- new T_invoke_interface_4().run();
- fail("expected an IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_4",
+ IncompatibleClassChangeError.class);
}
/**
@@ -178,11 +139,7 @@
public void testVFE5() {
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_5(new ITestImpl());
- fail("expected VerifyError");
- } catch (VerifyError t) {
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_5", VerifyError.class);
}
/**
@@ -190,12 +147,7 @@
* @title int is passed instead of objref
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_10", VerifyError.class);
}
/**
@@ -203,12 +155,7 @@
* @title number of arguments passed to method
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_9", VerifyError.class);
}
/**
@@ -217,12 +164,7 @@
*/
public void testVFE10() {
//@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_18
- try {
- new T_invoke_interface_18().run(new ITestImpl());
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_18", VerifyError.class);
}
/**
@@ -232,12 +174,7 @@
public void testVFE11() {
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_20().run(new ITestImpl());
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_20", VerifyError.class);
}
/**
@@ -247,11 +184,7 @@
public void testVFE12() {
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_21().run(new ITestImpl());
- fail("expected VerifyError");
- } catch (VerifyError t) {
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_21", VerifyError.class);
}
/**
@@ -259,12 +192,7 @@
* @title number of registers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_8", VerifyError.class);
}
/**
@@ -272,14 +200,10 @@
* @title Attempt to call undefined method.
*/
public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_7
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_7().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_7",
+ NoSuchMethodError.class, new ITestImpl());
}
/**
@@ -287,14 +211,10 @@
* @title Method has different signature.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_16
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- new T_invoke_interface_16().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_16",
+ NoSuchMethodError.class, new ITestImpl());
}
@@ -303,14 +223,8 @@
* @title instance methods may only be invoked on already initialized instances.
*/
public void testVFE21() {
- //@uses dot.junit.opcodes.invoke_interface.d.T_invoke_interface_22
//@uses dot.junit.opcodes.invoke_interface.ITest
//@uses dot.junit.opcodes.invoke_interface.ITestImpl
- try {
- Class.forName("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface.d.T_invoke_interface_22", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.d
index debf41a..44251bf 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.d
@@ -16,14 +16,15 @@
.class public dot.junit.opcodes.invoke_interface.d.T_invoke_interface_3
.super java/lang/Object
-
-.method public <init>(Ldot/junit/opcodes/invoke_interface/ITest;)V
-.limit regs 5
-Label0:
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- invoke-interface {v4}, dot/junit/opcodes/invoke_interface/ITest/doit()V
+.method public <init>()V
+.limit regs 2
+ invoke-direct {v1}, java/lang/Object/<init>()V
return-void
.end method
-
+.method public run()V
+.limit regs 5
+ const/4 v1, 0
+ invoke-interface {v1}, dot/junit/opcodes/invoke_interface/ITest/doit()V
+ return-void
+.end method
\ No newline at end of file
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java
index 5af318a..8faa506 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/Test_invoke_interface_range.java
@@ -63,64 +63,40 @@
* @title objref is null
*/
public void testE3() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_3
//@uses dot.junit.opcodes.invoke_interface_range.ITest
- try {
- new T_invoke_interface_range_3(null);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_3",
+ NullPointerException.class);
}
/**
* @title object doesn't implement interface
*/
public void testE4() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_11
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- T_invoke_interface_range_11 t = new T_invoke_interface_range_11();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_11",
+ IncompatibleClassChangeError.class);
}
/**
* @title Native method can't be linked
*/
public void testE5() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_12
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- T_invoke_interface_range_12 t = new T_invoke_interface_range_12();
- ITestImpl impl = new ITestImpl();
- try {
- t.run(impl);
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_12",
+ UnsatisfiedLinkError.class, new ITestImpl());
}
/**
* @title Attempt to invoke abstract method
*/
public void testE6() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_13
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
//@uses dot.junit.opcodes.invoke_interface_range.ITestImplAbstract
- T_invoke_interface_range_13 t = new T_invoke_interface_range_13();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_13",
+ AbstractMethodError.class);
}
/**
@@ -128,12 +104,8 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_2",
+ VerifyError.class);
}
/**
@@ -141,11 +113,8 @@
* @title The referenced method_id must belong to an interface (not a class).
*/
public void testVFE2() {
- try {
- new T_invoke_interface_range_4().run();
- fail("expected an IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_4",
+ IncompatibleClassChangeError.class);
}
/**
@@ -155,11 +124,8 @@
public void testVFE5() {
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_5(new ITestImpl());
- fail("expected VerifyError");
- } catch (VerifyError t) {
- }
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_5",
+ VerifyError.class);
}
/**
@@ -167,12 +133,8 @@
* @title int is passed instead of objref
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_10",
+ VerifyError.class);
}
/**
@@ -180,12 +142,8 @@
* @title number of arguments passed to method
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_9",
+ VerifyError.class);
}
/**
@@ -193,13 +151,10 @@
* @title invoke-interface may not be used to call <init>.
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_18
- try {
- new T_invoke_interface_range_18().run(new ITestImpl());
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ //@uses dot.junit.opcodes.invoke_interface_range.ITest
+ //@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_18",
+ VerifyError.class);
}
/**
@@ -209,12 +164,8 @@
public void testVFE11() {
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_20().run(new ITestImpl());
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_20",
+ VerifyError.class);
}
/**
@@ -224,11 +175,8 @@
public void testVFE12() {
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_21().run(new ITestImpl());
- fail("expected VerifyError");
- } catch (VerifyError t) {
- }
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_21",
+ VerifyError.class);
}
/**
@@ -236,12 +184,8 @@
* @title number of registers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_8",
+ VerifyError.class);
}
/**
@@ -249,14 +193,10 @@
* @title Attempt to call undefined method.
*/
public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_7
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_7().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_7",
+ NoSuchMethodError.class, new ITestImpl());
}
/**
@@ -264,15 +204,10 @@
* @title Method has different signature.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_16
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- new T_invoke_interface_range_16().run(new ITestImpl());
- fail("expected NoSuchMethodError");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_16",
+ NoSuchMethodError.class, new ITestImpl());
}
/**
@@ -283,11 +218,7 @@
//@uses dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_22
//@uses dot.junit.opcodes.invoke_interface_range.ITest
//@uses dot.junit.opcodes.invoke_interface_range.ITestImpl
- try {
- Class.forName("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_22",
+ VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.d
index ca4948d..eaf5408 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.d
@@ -16,13 +16,16 @@
.class public dot.junit.opcodes.invoke_interface_range.d.T_invoke_interface_range_3
.super java/lang/Object
+.method public <init>()V
+.limit regs 2
+ invoke-direct {v1}, java/lang/Object/<init>()V
+ return-void
+.end method
-.method public <init>(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
+.method public run()V
.limit regs 5
-Label0:
- invoke-direct {v3}, java/lang/Object/<init>()V
-
- invoke-interface/range {v4}, dot/junit/opcodes/invoke_interface_range/ITest/doit()V
+ const/4 v1, 0
+ invoke-interface/range {v1}, dot/junit/opcodes/invoke_interface_range/ITest/doit()V
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java
index 02793fd..efcdf23 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/Test_invoke_static.java
@@ -87,41 +87,24 @@
*
*/
public void testE2() {
- T_invoke_static_6 t = new T_invoke_static_6();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_static.d.T_invoke_static_6",
+ UnsatisfiedLinkError.class);
}
-
/**
* @title initialization of referenced class throws exception
*/
public void testE7() {
- T_invoke_static_14 t = new T_invoke_static_14();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_static.d.T_invoke_static_14",
+ ExceptionInInitializerError.class);
}
-
/**
* @constraint A13
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static.d.T_invoke_static_3", VerifyError.class);
}
/**
@@ -129,12 +112,7 @@
* @title <clinit> may not be called using invoke-static
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static.d.T_invoke_static_10", VerifyError.class);
}
/**
@@ -142,12 +120,7 @@
* @title number of arguments passed to method.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static.d.T_invoke_static_11", VerifyError.class);
}
/**
@@ -155,12 +128,7 @@
* @title <init> may not be called using invoke_static
*/
public void testVFE5() {
- try {
- new T_invoke_static_19().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static.d.T_invoke_static_19", VerifyError.class);
}
/**
@@ -168,12 +136,7 @@
* @title types of arguments passed to method
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static.d.T_invoke_static_20", VerifyError.class);
}
@@ -182,11 +145,8 @@
* @title Attempt to call non-static method.
*/
public void testVFE7() {
- try {
- new T_invoke_static_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static.d.T_invoke_static_5",
+ IncompatibleClassChangeError.class);
}
/**
@@ -194,11 +154,7 @@
* @title Attempt to call undefined method.
*/
public void testVFE8() {
- try {
- new T_invoke_static_7().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static.d.T_invoke_static_7", NoSuchMethodError.class);
}
/**
@@ -206,13 +162,8 @@
* @title Attempt to call private method of other class.
*/
public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_8
//@uses dot.junit.opcodes.invoke_static.TestClass
- try {
- new T_invoke_static_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static.d.T_invoke_static_8", IllegalAccessError.class);
}
/**
@@ -220,28 +171,18 @@
* @title Method has different signature.
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_13
//@uses dot.junit.opcodes.invoke_static.TestClass
- try {
- new T_invoke_static_13().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static.d.T_invoke_static_13", NoSuchMethodError.class);
}
-
/**
* @constraint B12
* @title Attempt to call protected method of unrelated class.
*/
public void testVFE12() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_17
//@uses dot.junit.opcodes.invoke_static.TestClass
- try {
- new T_invoke_static_17().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static.d.T_invoke_static_17",
+ IllegalAccessError.class);
}
/**
@@ -249,12 +190,7 @@
* @title number of registers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static.d.T_invoke_static_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static.d.T_invoke_static_16", VerifyError.class);
}
/**
@@ -262,12 +198,6 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
- //@uses dot.junit.opcodes.invoke_static.d.T_invoke_static_24
- try {
- new T_invoke_static_24().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static.d.T_invoke_static_24", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.d
index ed2aa2b..ed833e2 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_14.d
@@ -22,6 +22,7 @@
const v0, 1
const v1, 0
div-int v0, v0, v1
+ return-void
.end method
.method static public test()V
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java
index 7db6776..a2db910 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/Test_invoke_static_range.java
@@ -87,13 +87,8 @@
*
*/
public void testE2() {
- T_invoke_static_range_6 t = new T_invoke_static_range_6();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_6",
+ UnsatisfiedLinkError.class);
}
@@ -101,13 +96,8 @@
* @title initialization of referenced class throws exception
*/
public void testE7() {
- T_invoke_static_range_14 t = new T_invoke_static_range_14();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_14",
+ ExceptionInInitializerError.class);
}
/**
@@ -115,12 +105,7 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_3", VerifyError.class);
}
/**
@@ -128,12 +113,7 @@
* @title <clinit> may not be called using invoke_static_range
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_10", VerifyError.class);
}
/**
@@ -141,12 +121,7 @@
* @title number of arguments passed to method
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_11", VerifyError.class);
}
/**
@@ -154,12 +129,7 @@
* @title <init> may not be called using invoke_static_range
*/
public void testVFE5() {
- try {
- new T_invoke_static_range_19().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_19", VerifyError.class);
}
/**
@@ -167,12 +137,7 @@
* @title types of arguments passed to method
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_20", VerifyError.class);
}
@@ -181,11 +146,8 @@
* @title Attempt to call non-static method.
*/
public void testVFE7() {
- try {
- new T_invoke_static_range_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_5",
+ IncompatibleClassChangeError.class);
}
/**
@@ -193,11 +155,8 @@
* @title Attempt to call undefined method.
*/
public void testVFE8() {
- try {
- new T_invoke_static_range_7().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_7",
+ NoSuchMethodError.class);
}
/**
@@ -205,13 +164,9 @@
* @title Attempt to call private method of other class.
*/
public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_8
//@uses dot.junit.opcodes.invoke_static_range.TestClass
- try {
- new T_invoke_static_range_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_8",
+ IllegalAccessError.class);
}
/**
@@ -219,13 +174,9 @@
* @title Method has different signature.
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_13
//@uses dot.junit.opcodes.invoke_static_range.TestClass
- try {
- new T_invoke_static_range_13().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_13",
+ NoSuchMethodError.class);
}
@@ -234,13 +185,9 @@
* @title Attempt to call protected method of unrelated class.
*/
public void testVFE12() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_17
//@uses dot.junit.opcodes.invoke_static_range.TestClass
- try {
- new T_invoke_static_range_17().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_17",
+ IllegalAccessError.class);
}
/**
@@ -248,12 +195,7 @@
* @title number of registers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_16", VerifyError.class);
}
/**
@@ -261,12 +203,6 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
- //@uses dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_24
- try {
- new T_invoke_static_range_24().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_static_range.d.T_invoke_static_range_24", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.d b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.d
index e4c1bd3..08c04ff 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_14.d
@@ -22,6 +22,7 @@
const v0, 1
const v1, 0
div-int v0, v0, v1
+ return-void
.end method
.method static public test()V
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java
index b1602b6..0995fb0 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/Test_invoke_super.java
@@ -82,45 +82,25 @@
* @title obj ref is null
*/
public void testE1() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_1
//@uses dot.junit.opcodes.invoke_super.d.TSuper
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_2", NullPointerException.class);
T_invoke_super_2 t = new T_invoke_super_2();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
}
/**
* @title Native method can't be linked
*/
public void testE2() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_4
//@uses dot.junit.opcodes.invoke_super.d.TSuper
- T_invoke_super_4 t = new T_invoke_super_4();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_4", UnsatisfiedLinkError.class);
}
/**
* @title Attempt to invoke abstract method
*/
public void testE4() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_6
//@uses dot.junit.opcodes.invoke_super.ATest
- T_invoke_super_6 t = new T_invoke_super_6();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError iae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_6", AbstractMethodError.class);
}
/**
@@ -128,12 +108,7 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_8", ClassNotFoundException.class);
}
/**
@@ -141,12 +116,7 @@
* @title <clinit> may not be called using invoke-super
*/
public void testVFE3() {
- try {
- new T_invoke_super_10().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_10", VerifyError.class);
}
/**
@@ -154,12 +124,7 @@
* @title number of arguments passed to method
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_11", VerifyError.class);
}
/**
@@ -167,14 +132,8 @@
* @title types of arguments passed to method.
*/
public void testVFE5() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_12
//@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_12", VerifyError.class);
}
/**
@@ -182,12 +141,7 @@
* @title <init> may not be called using invoke_super
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_16", VerifyError.class);
}
/**
@@ -196,15 +150,9 @@
* protected method
*/
public void testVFE8() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_22
//@uses dot.junit.opcodes.invoke_super.d.TSuper
//@uses dot.junit.opcodes.invoke_super.d.TPlain
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_22", VerifyError.class);
}
/**
@@ -213,15 +161,9 @@
* public method
*/
public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_23
//@uses dot.junit.opcodes.invoke_super.d.TSuper
//@uses dot.junit.opcodes.invoke_super.d.TSuper2
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_23", VerifyError.class);
}
/**
@@ -229,13 +171,9 @@
* @title Attempt to call static method.
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_5
//@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- new T_invoke_super_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_5",
+ IncompatibleClassChangeError.class);
}
@@ -244,11 +182,7 @@
* @title Attempt to invoke non-existing method.
*/
public void testVFE12() {
- try {
- new T_invoke_super_15().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_15", NoSuchMethodError.class);
}
/**
@@ -256,13 +190,9 @@
* @title Attempt to invoke private method of other class.
*/
public void testVFE13() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_18
//@uses dot.junit.opcodes.invoke_super.TestStubs
- try {
- new T_invoke_super_18().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_18", IllegalAccessError.class,
+ new TestStubs());
}
/**
@@ -270,13 +200,9 @@
* @title Attempt to invoke protected method of unrelated class.
*/
public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_20
//@uses dot.junit.opcodes.invoke_super.TestStubs
- try {
- new T_invoke_super_20().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_20", IllegalAccessError.class,
+ new TestStubs());
}
/**
@@ -284,13 +210,8 @@
* @title Method has different signature.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_19
//@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- new T_invoke_super_19().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_19", NoSuchMethodError.class);
}
/**
@@ -298,14 +219,8 @@
* @title invoke-super shall be used to invoke private methods
*/
public void testVFE16() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_13
//@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_13", VerifyError.class);
}
/**
@@ -313,12 +228,7 @@
* @title number of registers
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_9", VerifyError.class);
}
/**
@@ -326,13 +236,8 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_24
- try {
- new T_invoke_super_24().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_super.d.T_invoke_super_24",
+ IncompatibleClassChangeError.class);
}
/**
@@ -340,13 +245,7 @@
* @title instance methods may only be invoked on already initialized instances.
*/
public void testVFE19() {
- //@uses dot.junit.opcodes.invoke_super.d.T_invoke_super_25
//@uses dot.junit.opcodes.invoke_super.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super.d.T_invoke_super_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super.d.T_invoke_super_25", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.java
index 38ebc44..58bbd63 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_24.java
@@ -18,7 +18,6 @@
public class T_invoke_super_24 {
- public int run() {
- return 0;
+ public void run() {
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java
index 51291f1..9007ef4 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/Test_invoke_super_range.java
@@ -82,45 +82,27 @@
* @title obj ref is null
*/
public void testE1() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_1
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- T_invoke_super_range_2 t = new T_invoke_super_range_2();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_2",
+ NullPointerException.class);
}
/**
* @title Native method can't be linked
*/
public void testE2() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_4
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- T_invoke_super_range_4 t = new T_invoke_super_range_4();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_4",
+ UnsatisfiedLinkError.class);
}
/**
* @title Attempt to invoke abstract method
*/
public void testE4() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_6
//@uses dot.junit.opcodes.invoke_super_range.ATest
- T_invoke_super_range_6 t = new T_invoke_super_range_6();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError iae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_6",
+ AbstractMethodError.class);
}
/**
@@ -128,12 +110,7 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_8", VerifyError.class);
}
/**
@@ -141,12 +118,7 @@
* @title <clinit> may not be called using invoke-super
*/
public void testVFE3() {
- try {
- new T_invoke_super_range_10().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_10", VerifyError.class);
}
/**
@@ -154,12 +126,7 @@
* @title number of arguments passed to method
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_11", VerifyError.class);
}
/**
@@ -167,14 +134,8 @@
* @title types of arguments passed to method.
*/
public void testVFE5() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_12
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_12", VerifyError.class);
}
/**
@@ -182,12 +143,7 @@
* @title <init> may not be called using invoke_super_range
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_16", VerifyError.class);
}
/**
@@ -196,15 +152,9 @@
* protected method
*/
public void testVFE8() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_22
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
//@uses dot.junit.opcodes.invoke_super_range.d.TPlain
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_22", VerifyError.class);
}
/**
@@ -213,15 +163,9 @@
* public method
*/
public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_23
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper2
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_23", VerifyError.class);
}
/**
@@ -229,13 +173,9 @@
* @title Attempt to call static method.
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_5
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- new T_invoke_super_range_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_5",
+ IncompatibleClassChangeError.class);
}
@@ -244,11 +184,8 @@
* @title Attempt to invoke non-existing method.
*/
public void testVFE12() {
- try {
- new T_invoke_super_range_15().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_15",
+ NoSuchMethodError.class);
}
/**
@@ -256,13 +193,9 @@
* @title Attempt to invoke private method of other class.
*/
public void testVFE13() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_18
//@uses dot.junit.opcodes.invoke_super_range.TestStubs
- try {
- new T_invoke_super_range_18().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_18",
+ IllegalAccessError.class, new TestStubs());
}
/**
@@ -270,13 +203,9 @@
* @title Attempt to invoke protected method of unrelated class.
*/
public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_20
//@uses dot.junit.opcodes.invoke_super_range.TestStubs
- try {
- new T_invoke_super_range_20().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_20",
+ IllegalAccessError.class, new TestStubs());
}
/**
@@ -284,13 +213,9 @@
* @title Method has different signature.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_19
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- new T_invoke_super_range_19().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_19",
+ NoSuchMethodError.class);
}
/**
@@ -300,12 +225,7 @@
public void testVFE16() {
//@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_13
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_13", VerifyError.class);
}
/**
@@ -313,12 +233,7 @@
* @title number of registers
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_9", VerifyError.class);
}
/**
@@ -327,12 +242,8 @@
*/
public void testVFE18() {
//@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_24
- try {
- new T_invoke_super_range_24().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_24",
+ IncompatibleClassChangeError.class);
}
/**
@@ -340,14 +251,8 @@
* @title instance methods may only be invoked on already initialized instances.
*/
public void testVFE19() {
- //@uses dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_25
//@uses dot.junit.opcodes.invoke_super_range.d.TSuper
- try {
- Class.forName("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_super_range.d.T_invoke_super_range_25", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java
index 03f2bb6..55423f4 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/Test_invoke_virtual.java
@@ -82,42 +82,25 @@
* @title expected NullPointerException
*/
public void testE1() {
- T_invoke_virtual_1 t = new T_invoke_virtual_1();
- String s = "s";
- try {
- t.run(null, s);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_1",
+ NullPointerException.class, null, "Test");
}
/**
* @title Native method can't be linked
*/
public void testE2() {
- T_invoke_virtual_4 t = new T_invoke_virtual_4();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_4",
+ UnsatisfiedLinkError.class);
}
/**
* @title Attempt to invoke abstract method
*/
public void testE4() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_6
//@uses dot.junit.opcodes.invoke_virtual.ATest
- T_invoke_virtual_6 t = new T_invoke_virtual_6();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError iae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_6",
+ AbstractMethodError.class);
}
/**
@@ -125,12 +108,7 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_8", VerifyError.class);
}
/**
@@ -138,12 +116,7 @@
* @title <clinit> may not be called using invoke-virtual
*/
public void testVFE3() {
- try {
- new T_invoke_virtual_10().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_10", VerifyError.class);
}
/**
@@ -151,12 +124,7 @@
* @title number of arguments passed to method
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_11", VerifyError.class);
}
/**
@@ -164,12 +132,7 @@
* @title types of arguments passed to method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_12", VerifyError.class);
}
/**
@@ -177,12 +140,7 @@
* @title <init> may not be called using invoke_virtual
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_16", VerifyError.class);
}
/**
@@ -194,12 +152,7 @@
//@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_22
//@uses dot.junit.opcodes.invoke_virtual.d.TSuper
//@uses dot.junit.opcodes.invoke_virtual.d.TPlain
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_22", VerifyError.class);
}
/**
@@ -211,12 +164,7 @@
//@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_23
//@uses dot.junit.opcodes.invoke_virtual.d.TSuper
//@uses dot.junit.opcodes.invoke_virtual.d.TSuper2
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_23", VerifyError.class);
}
@@ -225,11 +173,8 @@
* @title Attempt to call static method.
*/
public void testVFE10() {
- try {
- new T_invoke_virtual_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_5",
+ IncompatibleClassChangeError.class);
}
@@ -238,11 +183,8 @@
* @title Attempt to invoke non-existing method.
*/
public void testVFE12() {
- try {
- new T_invoke_virtual_15().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_15",
+ NoSuchMethodError.class);
}
/**
@@ -250,13 +192,9 @@
* @title Attempt to invoke private method of other class.
*/
public void testVFE13() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_18
//@uses dot.junit.opcodes.invoke_virtual.TestStubs
- try {
- new T_invoke_virtual_18().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_18",
+ IllegalAccessError.class, new TestStubs());
}
/**
@@ -264,13 +202,9 @@
* @title Attempt to invoke protected method of unrelated class.
*/
public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_20
//@uses dot.junit.opcodes.invoke_virtual.TestStubs
- try {
- new T_invoke_virtual_20().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_20",
+ IllegalAccessError.class, new TestStubs());
}
/**
@@ -278,13 +212,9 @@
* @title Method has different signature.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_19
//@uses dot.junit.opcodes.invoke_virtual.d.TSuper
- try {
- new T_invoke_virtual_19().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_19",
+ NoSuchMethodError.class);
}
/**
@@ -292,12 +222,7 @@
* @title invoke-virtual shall be used to invoke private methods
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_13", VerifyError.class);
}
/**
@@ -305,12 +230,7 @@
* @title number of registers
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_9", VerifyError.class);
}
/**
@@ -318,13 +238,8 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
- //@uses dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_24
- try {
- new T_invoke_virtual_24().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_24",
+ IncompatibleClassChangeError.class);
}
/**
@@ -332,12 +247,7 @@
* @title instance methods may only be invoked on already initialized instances.
*/
public void testVFE19() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual.d.T_invoke_virtual_25", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java
index 6200ce7..5aa7d33 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/Test_invoke_virtual_range.java
@@ -91,42 +91,25 @@
* @title expected NullPointerException
*/
public void testE1() {
- T_invoke_virtual_range_1 t = new T_invoke_virtual_range_1();
- String s = "s";
- try {
- t.run(null, s);
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_1",
+ NullPointerException.class, null, "Test");
}
/**
* @title Native method can't be linked
*/
public void testE2() {
- T_invoke_virtual_range_4 t = new T_invoke_virtual_range_4();
- try {
- t.run();
- fail("expected UnsatisfiedLinkError");
- } catch (UnsatisfiedLinkError ule) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_4",
+ UnsatisfiedLinkError.class);
}
/**
* @title Attempt to invoke abstract method
*/
public void testE4() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_6
//@uses dot.junit.opcodes.invoke_virtual_range.ATest
- T_invoke_virtual_range_6 t = new T_invoke_virtual_range_6();
- try {
- t.run();
- fail("expected AbstractMethodError");
- } catch (AbstractMethodError iae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_6",
+ AbstractMethodError.class);
}
/**
@@ -134,12 +117,8 @@
* @title invalid constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_8",
+ VerifyError.class);
}
/**
@@ -147,12 +126,8 @@
* @title <clinit> may not be called using invoke-virtual
*/
public void testVFE3() {
- try {
- new T_invoke_virtual_range_10().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_10",
+ VerifyError.class);
}
/**
@@ -160,12 +135,8 @@
* @title number of arguments passed to method
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_11",
+ VerifyError.class);
}
/**
@@ -173,12 +144,8 @@
* @title types of arguments passed to method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_12",
+ VerifyError.class);
}
/**
@@ -186,12 +153,8 @@
* @title <init> may not be called using invoke_virtual_range
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_16",
+ VerifyError.class);
}
/**
@@ -200,15 +163,10 @@
* protected method
*/
public void testVFE8() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_22
//@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
//@uses dot.junit.opcodes.invoke_virtual_range.d.TPlain
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_22",
+ VerifyError.class);
}
/**
@@ -217,15 +175,10 @@
* public method
*/
public void testVFE9() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_23
//@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
//@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper2
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_23",
+ VerifyError.class);
}
/**
@@ -233,11 +186,8 @@
* @title Attempt to call static method.
*/
public void testVFE10() {
- try {
- new T_invoke_virtual_range_5().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_5",
+ IncompatibleClassChangeError.class);
}
@@ -246,11 +196,8 @@
* @title Attempt to invoke non-existing method.
*/
public void testVFE12() {
- try {
- new T_invoke_virtual_range_15().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_15",
+ NoSuchMethodError.class);
}
/**
@@ -258,13 +205,9 @@
* @title Attempt to invoke private method of other class.
*/
public void testVFE13() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_18
//@uses dot.junit.opcodes.invoke_virtual_range.TestStubs
- try {
- new T_invoke_virtual_range_18().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_18",
+ IllegalAccessError.class, new TestStubs());
}
/**
@@ -272,13 +215,9 @@
* @title Attempt to invoke protected method of unrelated class.
*/
public void testVFE14() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_20
//@uses dot.junit.opcodes.invoke_virtual_range.TestStubs
- try {
- new T_invoke_virtual_range_20().run(new TestStubs());
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_20",
+ IllegalAccessError.class, new TestStubs());
}
/**
@@ -286,13 +225,9 @@
* @title Method has different signature.
*/
public void testVFE15() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_19
//@uses dot.junit.opcodes.invoke_virtual_range.d.TSuper
- try {
- new T_invoke_virtual_range_19().run();
- fail("expected NoSuchMethodError");
- } catch (NoSuchMethodError t) {
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_19",
+ NoSuchMethodError.class);
}
/**
@@ -300,12 +235,8 @@
* @title invoke-virtual/range shall be used to invoke private methods
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_13",
+ VerifyError.class);
}
/**
@@ -313,12 +244,8 @@
* @title number of registers
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_9",
+ VerifyError.class);
}
/**
@@ -326,13 +253,8 @@
* @title attempt to invoke interface method
*/
public void testVFE18() {
- //@uses dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_24
- try {
- new T_invoke_virtual_range_24().run();
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_24",
+ IncompatibleClassChangeError.class);
}
/**
@@ -340,11 +262,7 @@
* @title instance methods may only be invoked on already initialized instances.
*/
public void testVFE19() {
- try {
- Class.forName("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_25");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.invoke_virtual_range.d.T_invoke_virtual_range_25",
+ VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/Test_iput.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/Test_iput.java
index daa6b24..cc3e8c8 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/Test_iput.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/Test_iput.java
@@ -82,13 +82,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iput_13 t = new T_iput_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iput.d.T_iput_13", NullPointerException.class);
}
/**
@@ -96,12 +90,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_3", VerifyError.class);
}
/**
@@ -110,12 +99,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_4", VerifyError.class);
}
@@ -126,12 +110,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_iput_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.iput.d.T_iput_17", NoSuchFieldError.class);
}
/**
@@ -140,12 +119,7 @@
* and floats are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_5", VerifyError.class);
}
/**
@@ -155,12 +129,7 @@
* with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_18", VerifyError.class);
}
/**
@@ -168,11 +137,7 @@
* @title Attempt to set static field.
*/
public void testVFE8() {
- try {
- new T_iput_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput.d.T_iput_7", IncompatibleClassChangeError.class);
}
/**
@@ -181,12 +146,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.iput.TestStubs
- //@uses dot.junit.opcodes.iput.d.T_iput_8
- try {
- new T_iput_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput.d.T_iput_8", IllegalAccessError.class);
}
/**
@@ -194,11 +154,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_iput_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput.d.T_iput_9", NoClassDefFoundError.class);
}
/**
@@ -206,42 +162,24 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_iput_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput.d.T_iput_10", NoSuchFieldError.class);
}
-
-
/**
* @constraint n/a
* @title Attempt to modify superclass' private field from subclass.
*/
public void testVFE12() {
//@uses dot.junit.opcodes.iput.d.T_iput_1
- //@uses dot.junit.opcodes.iput.d.T_iput_15
- try {
- new T_iput_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.iput.d.T_iput_15", IllegalAccessError.class);
}
-
/**
* @constraint B1
* @title iput shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_2", VerifyError.class);
}
/**
@@ -250,12 +188,7 @@
* @title iput shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_20", VerifyError.class);
}
/**
@@ -264,12 +197,7 @@
* @title iput shall not work for short fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_21", VerifyError.class);
}
/**
@@ -278,12 +206,7 @@
* @title iput shall not work for boolean fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_22", VerifyError.class);
}
/**
@@ -292,12 +215,7 @@
* @title iput shall not work for char fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_23", VerifyError.class);
}
/**
@@ -306,12 +224,7 @@
* @title iput shall not work for byte fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_24", VerifyError.class);
}
@@ -320,12 +233,15 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput.d.T_iput_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput.d.T_iput_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference registers
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iput.d.T_iput_31", VerifyError.class);
}
/**
@@ -334,11 +250,6 @@
*/
public void testE5() {
//@uses dot.junit.opcodes.iput.TestStubs
- //@uses dot.junit.opcodes.iput.d.T_iput_11
- try {
- new T_iput_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput.d.T_iput_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_31.d
new file mode 100644
index 0000000..dd8b4f0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_31.d
@@ -0,0 +1,31 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iput_31.java
+.class public dot.junit.opcodes.iput.d.T_iput_31
+.super java/lang/Object
+
+.field public st_i1 I
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()V
+.limit regs 3
+ const v1, 0
+ iput v1, v0, dot.junit.opcodes.iput.d.T_iput_31.st_i1 I
+.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java
index 5736c7c..9903cbb 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/Test_iput_boolean.java
@@ -72,13 +72,8 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iput_boolean_13 t = new T_iput_boolean_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_13",
+ NullPointerException.class);
}
/**
@@ -86,12 +81,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_3", VerifyError.class);
}
/**
@@ -99,26 +89,16 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_4", VerifyError.class);
}
-
/**
* @constraint B14
* @title put boolean into long field - only field with same name but
* different type exists
*/
public void testVFE5() {
- try {
- new T_iput_boolean_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_17", NoSuchFieldError.class);
}
/**
@@ -128,12 +108,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_18", VerifyError.class);
}
/**
@@ -142,11 +117,8 @@
* @title Attempt to set static field.
*/
public void testVFE8() {
- try {
- new T_iput_boolean_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -155,12 +127,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.iput_boolean.TestStubs
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_8
- try {
- new T_iput_boolean_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_8", IllegalAccessError.class);
}
/**
@@ -168,11 +135,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_iput_boolean_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_9", NoClassDefFoundError.class);
}
/**
@@ -180,27 +143,16 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_iput_boolean_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_10", NoSuchFieldError.class);
}
-
-
/**
* @constraint n/a
* @title Attempt to modify superclass' private field from subclass.
*/
public void testVFE12() {
//@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_1
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_15
- try {
- new T_iput_boolean_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_15", IllegalAccessError.class);
}
@@ -209,12 +161,7 @@
* @title iput_boolean shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_2", VerifyError.class);
}
/**
@@ -223,12 +170,7 @@
* @title iput_boolean shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_20", VerifyError.class);
}
/**
@@ -237,12 +179,7 @@
* @title iput_boolean shall not work for short fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_21", VerifyError.class);
}
/**
@@ -251,12 +188,7 @@
* @title iput_boolean shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_22", VerifyError.class);
}
/**
@@ -264,12 +196,7 @@
* @title iput_boolean shall not work for char fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_23", VerifyError.class);
}
/**
@@ -277,12 +204,7 @@
* @title iput_boolean shall not work for byte fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_24", VerifyError.class);
}
/**
@@ -290,12 +212,15 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference registers.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_31", VerifyError.class);
}
/**
@@ -304,12 +229,7 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.iput_boolean.TestStubs
- //@uses dot.junit.opcodes.iput_boolean.d.T_iput_boolean_11
- try {
- new T_iput_boolean_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_boolean.d.T_iput_boolean_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_31.d
new file mode 100644
index 0000000..039f79f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iput_boolean_31.java
+.class public dot.junit.opcodes.iput_boolean.d.T_iput_boolean_31
+.super java/lang/Object
+
+.field public st_i1 Z
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()V
+.limit regs 3
+ const v1, 0
+ iput-boolean v1, v0, dot.junit.opcodes.iput_boolean.d.T_iput_boolean_31.st_i1 Z
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java
index d421980..e87831b 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/Test_iput_byte.java
@@ -68,13 +68,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iput_byte_13 t = new T_iput_byte_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iput_byte.d.T_iput_byte_13", NullPointerException.class);
}
/**
@@ -82,12 +76,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_3", VerifyError.class);
}
/**
@@ -96,12 +85,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_4", VerifyError.class);
}
@@ -112,11 +96,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_iput_byte_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_byte.d.T_iput_byte_17", NoSuchFieldError.class);
}
/**
@@ -126,12 +106,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_18", VerifyError.class);
}
/**
@@ -140,11 +115,8 @@
* @title Attempt to set static field.
*/
public void testVFE8() {
- try {
- new T_iput_byte_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_byte.d.T_iput_byte_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -153,12 +125,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.iput_byte.TestStubs
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_8
- try {
- new T_iput_byte_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_byte.d.T_iput_byte_8", IllegalAccessError.class);
}
/**
@@ -166,11 +133,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_iput_byte_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_byte.d.T_iput_byte_9", NoClassDefFoundError.class);
}
/**
@@ -178,11 +141,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_iput_byte_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_byte.d.T_iput_byte_10", NoSuchFieldError.class);
}
@@ -193,12 +152,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_1
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_15
- try {
- new T_iput_byte_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_byte.d.T_iput_byte_15", IllegalAccessError.class);
}
@@ -207,12 +161,7 @@
* @title iput-byte shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_2", VerifyError.class);
}
/**
@@ -221,12 +170,7 @@
* @title iput-byte shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_20", VerifyError.class);
}
/**
@@ -235,12 +179,7 @@
* @title iput-byte shall not work for short fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_21", VerifyError.class);
}
/**
@@ -249,12 +188,7 @@
* @title iput-byte shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_22", VerifyError.class);
}
/**
@@ -263,12 +197,7 @@
* @title iput-byte shall not work for char fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_23", VerifyError.class);
}
/**
@@ -277,12 +206,7 @@
* @title iput-byte shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_24", VerifyError.class);
}
@@ -291,12 +215,15 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_byte.d.T_iput_byte_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference registers.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iput_byte.d.T_iput_byte_31", VerifyError.class);
}
/**
@@ -305,12 +232,7 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.iput_byte.TestStubs
- //@uses dot.junit.opcodes.iput_byte.d.T_iput_byte_11
- try {
- new T_iput_byte_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_byte.d.T_iput_byte_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_31.d
new file mode 100644
index 0000000..7c26ab6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iput_byte_31.java
+.class public dot.junit.opcodes.iput_byte.d.T_iput_byte_31
+.super java/lang/Object
+
+.field public st_i1 B
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()V
+.limit regs 3
+ const v1, 0
+ iput-byte v1, v0, dot.junit.opcodes.iput_byte.d.T_iput_byte_31.st_i1 B
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/Test_iput_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/Test_iput_char.java
index 87634c7..57eee7b 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/Test_iput_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/Test_iput_char.java
@@ -68,13 +68,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iput_char_13 t = new T_iput_char_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iput_char.d.T_iput_char_13", NullPointerException.class);
}
@@ -83,12 +77,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_3", VerifyError.class);
}
/**
@@ -97,12 +86,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_4", VerifyError.class);
}
@@ -113,11 +97,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_iput_char_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_char.d.T_iput_char_17", NoSuchFieldError.class);
}
/**
@@ -127,12 +107,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_18", VerifyError.class);
}
/**
@@ -141,11 +116,8 @@
* @title Attempt to set static field.
*/
public void testVFE8() {
- try {
- new T_iput_char_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_char.d.T_iput_char_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -154,12 +126,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.iput_char.TestStubs
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_8
- try {
- new T_iput_char_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_char.d.T_iput_char_8", IllegalAccessError.class);
}
/**
@@ -167,11 +134,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_iput_char_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_char.d.T_iput_char_9", NoClassDefFoundError.class);
}
@@ -180,11 +143,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_iput_char_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_char.d.T_iput_char_10", NoSuchFieldError.class);
}
@@ -195,12 +154,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.iput_char.d.T_iput_char_1
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_15
- try {
- new T_iput_char_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_char.d.T_iput_char_15", IllegalAccessError.class);
}
@@ -209,12 +163,7 @@
* @title iput-char shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_2", VerifyError.class);
}
/**
@@ -223,12 +172,7 @@
* @title iput-char shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_20", VerifyError.class);
}
/**
@@ -237,12 +181,7 @@
* @title iput-char shall not work for short fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_21", VerifyError.class);
}
/**
@@ -251,12 +190,7 @@
* @title iput-char shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_22", VerifyError.class);
}
/**
@@ -265,12 +199,7 @@
* @title iput-char shall not work for byte fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_23", VerifyError.class);
}
/**
@@ -279,12 +208,7 @@
* @title iput-char shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_24", VerifyError.class);
}
@@ -293,12 +217,15 @@
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_char.d.T_iput_char_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference registers.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iput_char.d.T_iput_char_31", VerifyError.class);
}
/**
@@ -307,12 +234,7 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.iput_char.TestStubs
- //@uses dot.junit.opcodes.iput_char.d.T_iput_char_11
- try {
- new T_iput_char_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_char.d.T_iput_char_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_31.d
new file mode 100644
index 0000000..bd52754
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iput_char_31.java
+.class public dot.junit.opcodes.iput_char.d.T_iput_char_31
+.super java/lang/Object
+
+.field public st_i1 C
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()V
+.limit regs 3
+ const v1, 0
+ iput-char v1, v0, dot.junit.opcodes.iput_char.d.T_iput_char_31.st_i1 C
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/Test_iput_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/Test_iput_object.java
index e2f8fa4..d52c55c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/Test_iput_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/Test_iput_object.java
@@ -68,13 +68,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iput_object_13 t = new T_iput_object_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iput_object.d.T_iput_object_13", NullPointerException.class);
}
@@ -83,12 +77,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_3", VerifyError.class);
}
/**
@@ -97,12 +86,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_4", VerifyError.class);
}
@@ -113,11 +97,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_iput_object_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_object.d.T_iput_object_17", NoSuchFieldError.class);
}
@@ -128,12 +108,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_18", VerifyError.class);
}
/**
@@ -142,11 +117,8 @@
* @title Attempt to set non-static field.
*/
public void testVFE8() {
- try {
- new T_iput_object_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_object.d.T_iput_object_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -155,12 +127,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.iput_object.TestStubs
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_8
- try {
- new T_iput_object_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_object.d.T_iput_object_8", IllegalAccessError.class);
}
/**
@@ -168,11 +135,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_iput_object_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_object.d.T_iput_object_9", NoClassDefFoundError.class);
}
/**
@@ -180,11 +143,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_iput_object_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_object.d.T_iput_object_10", NoSuchFieldError.class);
}
@@ -195,12 +154,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.iput_object.d.T_iput_object_1
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_15
- try {
- new T_iput_object_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_object.d.T_iput_object_15", IllegalAccessError.class);
}
@@ -209,12 +163,7 @@
* @title iput-object shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_2", VerifyError.class);
}
/**
@@ -223,12 +172,7 @@
* @title assignment incompatible references
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_20", VerifyError.class);
}
/**
@@ -237,12 +181,7 @@
* @title iput-object shall not work for char fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_21", VerifyError.class);
}
/**
@@ -251,12 +190,7 @@
* @title iput-object shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_22", VerifyError.class);
}
/**
@@ -265,12 +199,7 @@
* @title iput-object shall not work for byte fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_23", VerifyError.class);
}
/**
@@ -279,12 +208,7 @@
* @title iput-object shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_24", VerifyError.class);
}
/**
@@ -293,27 +217,23 @@
* @title iput-object shall not work for short fields
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_6", VerifyError.class);
}
-
-
/**
* @constraint B6
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_object.d.T_iput_object_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference registers.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iput_object.d.T_iput_object_31", VerifyError.class);
}
/**
@@ -322,12 +242,7 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.iput_object.TestStubs
- //@uses dot.junit.opcodes.iput_object.d.T_iput_object_11
- try {
- new T_iput_object_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_object.d.T_iput_object_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_31.d
new file mode 100644
index 0000000..7b1b507
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iput_object_31.java
+.class public dot.junit.opcodes.iput_object.d.T_iput_object_31
+.super java/lang/Object
+
+.field public st_i1 Ljava/lang/Object;
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()V
+.limit regs 3
+ const v1, 0
+ iput-object v1, v0, dot.junit.opcodes.iput_object.d.T_iput_object_31.st_i1 Ljava/lang/Object;
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/Test_iput_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/Test_iput_short.java
index 1895953..1d9f6d3 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/Test_iput_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/Test_iput_short.java
@@ -68,13 +68,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iput_short_13 t = new T_iput_short_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iput_short.d.T_iput_short_13", NullPointerException.class);
}
@@ -84,12 +78,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_3", VerifyError.class);
}
/**
@@ -98,12 +87,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_4", VerifyError.class);
}
@@ -114,11 +98,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_iput_short_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_short.d.T_iput_short_17", NoSuchFieldError.class);
}
/**
@@ -128,12 +108,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_18", VerifyError.class);
}
/**
@@ -142,11 +117,8 @@
* @title Attempt to set static field.
*/
public void testVFE8() {
- try {
- new T_iput_short_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_short.d.T_iput_short_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -155,12 +127,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.iput_short.TestStubs
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_8
- try {
- new T_iput_short_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_short.d.T_iput_short_8", IllegalAccessError.class);
}
/**
@@ -168,11 +135,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_iput_short_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_short.d.T_iput_short_9", NoClassDefFoundError.class);
}
/**
@@ -180,11 +143,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_iput_short_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_short.d.T_iput_short_10", NoSuchFieldError.class);
}
@@ -195,12 +154,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.iput_short.d.T_iput_short_1
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_15
- try {
- new T_iput_short_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_short.d.T_iput_short_15", IllegalAccessError.class);
}
@@ -209,12 +163,7 @@
* @title iput-short shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_2", VerifyError.class);
}
/**
@@ -223,12 +172,7 @@
* @title iput-short shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_20", VerifyError.class);
}
/**
@@ -237,12 +181,7 @@
* @title iput-short shall not work for char fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_21", VerifyError.class);
}
/**
@@ -251,12 +190,7 @@
* @title iput-short shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_22", VerifyError.class);
}
/**
@@ -265,12 +199,7 @@
* @title iput-short shall not work for byte fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_23", VerifyError.class);
}
/**
@@ -279,26 +208,23 @@
* @title iput-short shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_24", VerifyError.class);
}
-
/**
* @constraint B6
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_short.d.T_iput_short_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference registers.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iput_short.d.T_iput_short_31", VerifyError.class);
}
/**
@@ -307,12 +233,7 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.iput_short.TestStubs
- //@uses dot.junit.opcodes.iput_short.d.T_iput_short_11
- try {
- new T_iput_short_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_short.d.T_iput_short_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_31.d
new file mode 100644
index 0000000..790c99e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iput_short_31.java
+.class public dot.junit.opcodes.iput_short.d.T_iput_short_31
+.super java/lang/Object
+
+.field public st_i1 S
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()V
+.limit regs 3
+ const v1, 0
+ iput-short v1, v0, dot.junit.opcodes.iput_short.d.T_iput_short_31.st_i1 S
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/Test_iput_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/Test_iput_wide.java
index a61bb70..2a3bf63 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/Test_iput_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/Test_iput_wide.java
@@ -79,13 +79,7 @@
* @title expected NullPointerException
*/
public void testE2() {
- T_iput_wide_13 t = new T_iput_wide_13();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.iput_wide.d.T_iput_wide_13", NullPointerException.class);
}
@@ -95,12 +89,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_3", VerifyError.class);
}
/**
@@ -109,15 +98,9 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_4", VerifyError.class);
}
-
/**
*
* @constraint B14
@@ -125,15 +108,9 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_iput_wide_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_wide.d.T_iput_wide_17", NoSuchFieldError.class);
}
-
-
/**
*
* @constraint B14
@@ -141,12 +118,7 @@
* field with double-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_18", VerifyError.class);
}
/**
@@ -155,11 +127,8 @@
* @title Attempt to set non-static field.
*/
public void testVFE8() {
- try {
- new T_iput_wide_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_wide.d.T_iput_wide_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -168,25 +137,15 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.iput_wide.TestStubs
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_8
- try {
- new T_iput_wide_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_wide.d.T_iput_wide_8", IllegalAccessError.class);
}
-
/**
* @constraint n/a
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_iput_wide_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_wide.d.T_iput_wide_9", NoClassDefFoundError.class);
}
/**
@@ -194,41 +153,24 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_iput_wide_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_wide.d.T_iput_wide_10", NoSuchFieldError.class);
}
-
-
/**
* @constraint n/a
* @title Attempt to modify superclass' private field from subclass.
*/
public void testVFE12() {
//@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_1
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_15
- try {
- new T_iput_wide_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_wide.d.T_iput_wide_15", IllegalAccessError.class);
}
-
/**
* @constraint B1
* @title iput-wide shall not work for single-width numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_2", VerifyError.class);
}
/**
@@ -237,12 +179,7 @@
* @title iput-wide shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_20", VerifyError.class);
}
/**
@@ -251,12 +188,7 @@
* @title iput-wide shall not work for char fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_21", VerifyError.class);
}
/**
@@ -265,12 +197,7 @@
* @title iput-wide shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_22", VerifyError.class);
}
/**
@@ -279,12 +206,7 @@
* @title iput-wide shall not work for byte fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_23", VerifyError.class);
}
/**
@@ -293,12 +215,7 @@
* @title iput-wide shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_24", VerifyError.class);
}
/**
@@ -307,27 +224,23 @@
* @title iput-wide shall not work for short fields
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_6", VerifyError.class);
}
-
-
/**
* @constraint B6
* @title instance fields may only be accessed on already initialized instances.
*/
public void testVFE30() {
- try {
- Class.forName("dot.junit.opcodes.iput_wide.d.T_iput_wide_30");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_30", VerifyError.class);
+ }
+
+ /**
+ * @constraint N/A
+ * @title instance fields may only be accessed on reference registers.
+ */
+ public void testVFE31() {
+ load("dot.junit.opcodes.iput_wide.d.T_iput_wide_31", VerifyError.class);
}
/**
@@ -336,12 +249,7 @@
*/
public void testE5() {
//@uses dot.junit.opcodes.iput_wide.TestStubs
- //@uses dot.junit.opcodes.iput_wide.d.T_iput_wide_11
- try {
- new T_iput_wide_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.iput_wide.d.T_iput_wide_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_31.d b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_31.d
new file mode 100644
index 0000000..0e5e112
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_31.d
@@ -0,0 +1,32 @@
+; Copyright (C) 2014 The Android Open Source Project
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+
+.source T_iput_wide_31.java
+.class public dot.junit.opcodes.iput_wide.d.T_iput_wide_31
+.super java/lang/Object
+
+.field public st_i1 J
+
+.method public <init>()V
+.limit regs 1
+ invoke-direct {v0}, java/lang/Object/<init>()V
+ return-void
+.end method
+
+.method public run()V
+.limit regs 3
+ const-wide v1, 0
+ iput-wide v1, v0, dot.junit.opcodes.iput_wide.d.T_iput_wide_31.st_i1 J
+.end method
+
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/Test_long_to_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/Test_long_to_double.java
index f432220..c1a1f1c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/Test_long_to_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/Test_long_to_double.java
@@ -77,12 +77,7 @@
* @title type of argument - float
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_double.d.T_long_to_double_2", VerifyError.class);
}
/**
@@ -91,12 +86,7 @@
* @title type of argument - integer
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_double.d.T_long_to_double_3", VerifyError.class);
}
/**
@@ -105,12 +95,7 @@
* @title type of argument - reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_double.d.T_long_to_double_4", VerifyError.class);
}
/**
@@ -119,12 +104,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_double.d.T_long_to_double_5", VerifyError.class);
}
/**
@@ -133,12 +113,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.long_to_double.d.T_long_to_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_double.d.T_long_to_double_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/Test_long_to_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/Test_long_to_float.java
index e769e6b..d2cedd9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/Test_long_to_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/Test_long_to_float.java
@@ -79,12 +79,7 @@
* doubles are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.long_to_float.d.T_long_to_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_float.d.T_long_to_float_2", VerifyError.class);
}
/**
@@ -92,12 +87,7 @@
* @title type of argument - integer
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.long_to_float.d.T_long_to_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_float.d.T_long_to_float_3", VerifyError.class);
}
/**
@@ -106,12 +96,7 @@
* @title type of argument - reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.long_to_float.d.T_long_to_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_float.d.T_long_to_float_4", VerifyError.class);
}
/**
@@ -120,12 +105,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.long_to_float.d.T_long_to_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_float.d.T_long_to_float_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/Test_long_to_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/Test_long_to_int.java
index dd39d3e..a6b6cda 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/Test_long_to_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/Test_long_to_int.java
@@ -85,12 +85,7 @@
* @title type of argument - float
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_int.d.T_long_to_int_3", VerifyError.class);
}
/**
@@ -99,12 +94,7 @@
* @title type of argument - reference
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_int.d.T_long_to_int_4", VerifyError.class);
}
/**
@@ -113,12 +103,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_int.d.T_long_to_int_5", VerifyError.class);
}
/**
@@ -126,12 +111,7 @@
* @title type of argument - int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_int.d.T_long_to_int_6", VerifyError.class);
}
/**
@@ -140,11 +120,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.long_to_int.d.T_long_to_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.long_to_int.d.T_long_to_int_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/Test_monitor_enter.java b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/Test_monitor_enter.java
index 3608793..fbff132 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/Test_monitor_enter.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/Test_monitor_enter.java
@@ -83,12 +83,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_4", VerifyError.class);
}
/**
@@ -96,12 +91,7 @@
* @title types of arguments - int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_5", VerifyError.class);
}
/**
@@ -109,12 +99,7 @@
* @title types of arguments - float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_6", VerifyError.class);
}
/**
@@ -122,12 +107,7 @@
* @title types of arguments - long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_7", VerifyError.class);
}
/**
@@ -135,12 +115,7 @@
* @title types of arguments - double
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_enter.d.T_monitor_enter_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/Test_monitor_exit.java b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/Test_monitor_exit.java
index d4f5842..051e951 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/Test_monitor_exit.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/Test_monitor_exit.java
@@ -47,13 +47,7 @@
* @title expected NullPointerException
*/
public void testE3() {
- T_monitor_exit_3 t = new T_monitor_exit_3();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_3", NullPointerException.class);
}
/**
@@ -61,12 +55,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_4", VerifyError.class);
}
@@ -76,12 +65,7 @@
* @title type of arguments - int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_5", VerifyError.class);
}
/**
@@ -89,12 +73,7 @@
* @title type of arguments - float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_6", VerifyError.class);
}
/**
@@ -102,12 +81,7 @@
* @title type of arguments - long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_7", VerifyError.class);
}
/**
@@ -115,12 +89,7 @@
* @title type of arguments - double
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.monitor_exit.d.T_monitor_exit_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move/Test_move.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move/Test_move.java
index d503890..8269dc9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move/Test_move.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move/Test_move.java
@@ -34,12 +34,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move.d.T_move_2", VerifyError.class);
}
/**
@@ -47,12 +42,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move.d.T_move_3", VerifyError.class);
}
/**
@@ -60,12 +50,7 @@
* @title src register contains reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move.d.T_move_4", VerifyError.class);
}
/**
@@ -73,12 +58,7 @@
* @title src register contains wide
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move.d.T_move_5", VerifyError.class);
}
/**
@@ -86,12 +66,7 @@
* @title src register is a part of reg pair
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move.d.T_move_6", VerifyError.class);
}
/**
@@ -101,12 +76,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move.d.T_move_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move.d.T_move_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/Test_move_16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/Test_move_16.java
index f3e2ab0..c27e5d9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/Test_move_16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/Test_move_16.java
@@ -41,12 +41,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_16.d.T_move_16_3", VerifyError.class);
}
/**
@@ -54,12 +49,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_16.d.T_move_16_4", VerifyError.class);
}
/**
@@ -67,12 +57,7 @@
* @title src register contains reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_16.d.T_move_16_5", VerifyError.class);
}
/**
@@ -80,12 +65,7 @@
* @title src register contains wide
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_16.d.T_move_16_6", VerifyError.class);
}
/**
@@ -93,12 +73,7 @@
* @title src register is a part of reg pair
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_16.d.T_move_16_7", VerifyError.class);
}
/**
@@ -108,11 +83,6 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_16.d.T_move_16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_16.d.T_move_16_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/Test_move_exception.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/Test_move_exception.java
index b4fd87c..be22e89 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/Test_move_exception.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/Test_move_exception.java
@@ -27,15 +27,8 @@
* @title tests move-exception functionality
*/
public void testN1() {
- T_move_exception_1 t = new T_move_exception_1();
- try {
- t.run();
- fail("ArithmeticException was not thrown");
- } catch (ArithmeticException ae) {
- //expected
- } catch (Exception ex) {
- fail("Exception " + ex + " was thrown instead off ArithmeticException");
- }
+ loadAndRun("dot.junit.opcodes.move_exception.d.T_move_exception_1",
+ ArithmeticException.class);
}
/**
@@ -51,12 +44,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_exception.d.T_move_exception_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_exception.d.T_move_exception_3", VerifyError.class);
}
/**
@@ -64,12 +52,7 @@
* @title move-exception is not first instruction in an exception handler
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_exception.d.T_move_exception_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_exception.d.T_move_exception_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/Test_move_from16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/Test_move_from16.java
index 725cbd8..f6de2c3 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/Test_move_from16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/Test_move_from16.java
@@ -33,12 +33,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_from16.d.T_move_from16_3", VerifyError.class);
}
/**
@@ -46,12 +41,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_from16.d.T_move_from16_4", VerifyError.class);
}
/**
@@ -59,12 +49,7 @@
* @title src register contains reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_from16.d.T_move_from16_5", VerifyError.class);
}
/**
@@ -72,12 +57,7 @@
* @title src register contains wide
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_from16.d.T_move_from16_6", VerifyError.class);
}
/**
@@ -85,12 +65,7 @@
* @title src register is a part of reg pair
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_from16.d.T_move_from16_7", VerifyError.class);
}
/**
@@ -100,12 +75,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_from16.d.T_move_from16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_from16.d.T_move_from16_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/Test_move_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/Test_move_object.java
index d67be88..8ec2368 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/Test_move_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/Test_move_object.java
@@ -35,12 +35,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object.d.T_move_object_2", VerifyError.class);
}
/**
@@ -48,12 +43,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object.d.T_move_object_3", VerifyError.class);
}
/**
@@ -61,12 +51,7 @@
* @title src register contains integer
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object.d.T_move_object_4", VerifyError.class);
}
/**
@@ -74,12 +59,7 @@
* @title src register contains wide
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object.d.T_move_object_5", VerifyError.class);
}
/**
@@ -87,12 +67,7 @@
* @title src register is a part of reg pair
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object.d.T_move_object_6", VerifyError.class);
}
/**
@@ -102,11 +77,6 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_object.d.T_move_object_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object.d.T_move_object_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/Test_move_object_16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/Test_move_object_16.java
index c3780cf..e8847bd 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/Test_move_object_16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/Test_move_object_16.java
@@ -34,12 +34,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_16.d.T_move_object_16_3", VerifyError.class);
}
/**
@@ -47,12 +42,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_16.d.T_move_object_16_4", VerifyError.class);
}
/**
@@ -60,12 +50,7 @@
* @title src register contains integer
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_16.d.T_move_object_16_5", VerifyError.class);
}
/**
@@ -73,12 +58,7 @@
* @title src register contains wide
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_16.d.T_move_object_16_6", VerifyError.class);
}
/**
@@ -86,12 +66,7 @@
* @title src register is a part of reg pair
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_16.d.T_move_object_16_7", VerifyError.class);
}
/**
@@ -101,11 +76,6 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_object_16.d.T_move_object_16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_16.d.T_move_object_16_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/Test_move_object_from16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/Test_move_object_from16.java
index 2fe17d3..a07f889 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/Test_move_object_from16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/Test_move_object_from16.java
@@ -35,12 +35,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_3", VerifyError.class);
}
/**
@@ -48,12 +43,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_4", VerifyError.class);
}
/**
@@ -61,12 +51,7 @@
* @title src register contains integer
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_5", VerifyError.class);
}
/**
@@ -74,12 +59,7 @@
* @title src register contains wide
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_6", VerifyError.class);
}
/**
@@ -87,12 +67,7 @@
* @title src register is a part of reg pair
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_7", VerifyError.class);
}
/**
@@ -102,12 +77,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_object_from16.d.T_move_object_from16_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/Test_move_result.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/Test_move_result.java
index 9a0eaba..b9dc99d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/Test_move_result.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/Test_move_result.java
@@ -34,12 +34,7 @@
* @title number of registers - dest is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result.d.T_move_result_2", VerifyError.class);
}
@@ -48,12 +43,7 @@
* @title reference
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result.d.T_move_result_3", VerifyError.class);
}
/**
@@ -61,12 +51,7 @@
* @title wide
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result.d.T_move_result_4", VerifyError.class);
}
@@ -77,12 +62,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result.d.T_move_result_5", VerifyError.class);
}
/**
@@ -91,12 +71,7 @@
* (in the insns array) by an <invoke-kind> instruction
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result.d.T_move_result_6", VerifyError.class);
}
/**
@@ -105,12 +80,7 @@
* (in actual control flow) by an <invoke-kind> instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result.d.T_move_result_7", VerifyError.class);
}
/**
@@ -118,11 +88,6 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.move_result.d.T_move_result_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result.d.T_move_result_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/Test_move_result_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/Test_move_result_object.java
index 9ee2ed1..4371f53 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/Test_move_result_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/Test_move_result_object.java
@@ -45,12 +45,7 @@
* @title number of registers - dest is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_object.d.T_move_result_object_2", VerifyError.class);
}
@@ -59,12 +54,7 @@
* @title integer
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_object.d.T_move_result_object_3", VerifyError.class);
}
/**
@@ -72,12 +62,7 @@
* @title wide
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_object.d.T_move_result_object_4", VerifyError.class);
}
@@ -88,12 +73,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_object.d.T_move_result_object_5", VerifyError.class);
}
/**
@@ -102,12 +82,7 @@
* (in the insns array) by an <invoke-kind> instruction
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_object.d.T_move_result_object_6", VerifyError.class);
}
/**
@@ -116,12 +91,7 @@
* (in actual control flow) by an <invoke-kind> instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_object.d.T_move_result_object_7", VerifyError.class);
}
/**
@@ -129,12 +99,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.move_result_object.d.T_move_result_object_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_object.d.T_move_result_object_9", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/Test_move_result_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/Test_move_result_wide.java
index 6c849dc..7ad8925 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/Test_move_result_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/Test_move_result_wide.java
@@ -34,12 +34,7 @@
* @title number of registers - dest is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_2", VerifyError.class);
}
@@ -48,12 +43,7 @@
* @title reference
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_3", VerifyError.class);
}
/**
@@ -61,12 +51,7 @@
* @title 32-bit value
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_4", VerifyError.class);
}
@@ -77,12 +62,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_5", VerifyError.class);
}
/**
@@ -91,12 +71,7 @@
* (in the insns array) by an <invoke-kind> instruction
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_6", VerifyError.class);
}
/**
@@ -105,12 +80,7 @@
* (in actual control flow) by an <invoke-kind> instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_7", VerifyError.class);
}
/**
@@ -118,12 +88,7 @@
* @title number of registers
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_result_wide.d.T_move_result_wide_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/Test_move_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/Test_move_wide.java
index 4ab7421..a83bf41 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/Test_move_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/Test_move_wide.java
@@ -42,12 +42,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide.d.T_move_wide_2", VerifyError.class);
}
/**
@@ -55,12 +50,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide.d.T_move_wide_3", VerifyError.class);
}
/**
@@ -68,12 +58,7 @@
* @title src register contains reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide.d.T_move_wide_4", VerifyError.class);
}
/**
@@ -81,12 +66,7 @@
* @title src register contains 32-bit value
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide.d.T_move_wide_5", VerifyError.class);
}
/**
@@ -96,12 +76,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_wide.d.T_move_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide.d.T_move_wide_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/Test_move_wide_16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/Test_move_wide_16.java
index a2b776d..7c34b61 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/Test_move_wide_16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/Test_move_wide_16.java
@@ -48,12 +48,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_3", VerifyError.class);
}
/**
@@ -61,12 +56,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_4", VerifyError.class);
}
/**
@@ -74,12 +64,7 @@
* @title src register contains reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_5", VerifyError.class);
}
/**
@@ -87,12 +72,7 @@
* @title src register contains 32-bit value
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_6", VerifyError.class);
}
/**
@@ -100,12 +80,7 @@
* @title src register is a part of reg pair
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_7", VerifyError.class);
}
/**
@@ -115,12 +90,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_16.d.T_move_wide_16_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/Test_move_wide_from16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/Test_move_wide_from16.java
index 2434e92..3c8918f 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/Test_move_wide_from16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/Test_move_wide_from16.java
@@ -41,12 +41,7 @@
* @title number of registers - src is not valid
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_3", VerifyError.class);
}
/**
@@ -54,12 +49,7 @@
* @title number of registers - dst is not valid
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_4", VerifyError.class);
}
/**
@@ -67,12 +57,7 @@
* @title src register contains reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_5", VerifyError.class);
}
/**
@@ -80,12 +65,7 @@
* @title src register contains 32-bit value
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_6", VerifyError.class);
}
/**
@@ -93,12 +73,7 @@
* @title src register is a part of reg pair
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_7", VerifyError.class);
}
/**
@@ -108,12 +83,7 @@
* up, and the other register involved in it becomes undefined.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.move_wide_from16.d.T_move_wide_from16_8", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/Test_mul_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/Test_mul_double.java
index 9f5f173..85718da 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/Test_mul_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/Test_mul_double.java
@@ -120,12 +120,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_double.d.T_mul_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_double.d.T_mul_double_2", VerifyError.class);
}
@@ -135,12 +130,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_double.d.T_mul_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_double.d.T_mul_double_3", VerifyError.class);
}
/**
@@ -148,12 +138,7 @@
* @title types of arguments - double, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_double.d.T_mul_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_double.d.T_mul_double_5", VerifyError.class);
}
/**
@@ -162,11 +147,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_double.d.T_mul_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_double.d.T_mul_double_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/Test_mul_double_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/Test_mul_double_2addr.java
index 8689e85..9770407 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/Test_mul_double_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/Test_mul_double_2addr.java
@@ -121,12 +121,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_2", VerifyError.class);
}
@@ -136,12 +131,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_3", VerifyError.class);
}
/**
@@ -149,12 +139,7 @@
* @title types of arguments - double, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_5", VerifyError.class);
}
/**
@@ -163,12 +148,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_double_2addr.d.T_mul_double_2addr_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/Test_mul_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/Test_mul_float.java
index f486966..9506361 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/Test_mul_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/Test_mul_float.java
@@ -120,12 +120,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float.d.T_mul_float_2", VerifyError.class);
}
@@ -135,12 +130,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float.d.T_mul_float_3", VerifyError.class);
}
/**
@@ -148,12 +138,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float.d.T_mul_float_4", VerifyError.class);
}
/**
@@ -161,12 +146,7 @@
* @title types of arguments - reference, float
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float.d.T_mul_float_5", VerifyError.class);
}
/**
@@ -175,11 +155,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.mul_float.d.T_mul_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float.d.T_mul_float_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/Test_mul_float_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/Test_mul_float_2addr.java
index 3a222bb..9b9271b 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/Test_mul_float_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/Test_mul_float_2addr.java
@@ -120,12 +120,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_2", VerifyError.class);
}
@@ -135,12 +130,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_3", VerifyError.class);
}
/**
@@ -148,12 +138,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_4", VerifyError.class);
}
/**
@@ -161,12 +146,7 @@
* @title types of arguments - reference, float
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_5", VerifyError.class);
}
/**
@@ -175,11 +155,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_float_2addr.d.T_mul_float_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/Test_mul_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/Test_mul_int.java
index d363abc..1797c4d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/Test_mul_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/Test_mul_int.java
@@ -101,12 +101,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int.d.T_mul_int_2", VerifyError.class);
}
@@ -116,12 +111,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int.d.T_mul_int_3", VerifyError.class);
}
/**
@@ -129,12 +119,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int.d.T_mul_int_4", VerifyError.class);
}
/**
@@ -142,12 +127,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int.d.T_mul_int_5", VerifyError.class);
}
/**
@@ -156,11 +136,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.mul_int.d.T_mul_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int.d.T_mul_int_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/Test_mul_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/Test_mul_int_2addr.java
index 744d73e..5cd574f 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/Test_mul_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/Test_mul_int_2addr.java
@@ -101,12 +101,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_2", VerifyError.class);
}
@@ -116,12 +111,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_3", VerifyError.class);
}
/**
@@ -129,12 +119,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_4", VerifyError.class);
}
/**
@@ -142,12 +127,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_5", VerifyError.class);
}
/**
@@ -156,11 +136,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_2addr.d.T_mul_int_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/Test_mul_int_lit16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/Test_mul_int_lit16.java
index 9ff4b9a..2fcfd83 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/Test_mul_int_lit16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/Test_mul_int_lit16.java
@@ -104,12 +104,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_7", VerifyError.class);
}
@@ -119,12 +114,7 @@
* @title types of arguments - int * double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_8", VerifyError.class);
}
/**
@@ -132,12 +122,7 @@
* @title types of arguments - long * int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_9", VerifyError.class);
}
/**
@@ -145,12 +130,7 @@
* @title types of arguments - reference * int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_10", VerifyError.class);
}
/**
@@ -159,11 +139,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit16.d.T_mul_int_lit16_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/Test_mul_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/Test_mul_int_lit8.java
index 86031b8..84b2620 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/Test_mul_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/Test_mul_int_lit8.java
@@ -104,12 +104,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_7", VerifyError.class);
}
@@ -119,12 +114,7 @@
* @title types of arguments - int * double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_8", VerifyError.class);
}
/**
@@ -132,12 +122,7 @@
* @title types of arguments - long * int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_9", VerifyError.class);
}
/**
@@ -145,12 +130,7 @@
* @title types of arguments - reference * int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_10", VerifyError.class);
}
/**
@@ -159,11 +139,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_int_lit8.d.T_mul_int_lit8_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/Test_mul_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/Test_mul_long.java
index dbf08de..a3e4bf2 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/Test_mul_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/Test_mul_long.java
@@ -109,12 +109,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long.d.T_mul_long_2", VerifyError.class);
}
@@ -125,12 +120,7 @@
* @title types of arguments - long * int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long.d.T_mul_long_4", VerifyError.class);
}
/**
@@ -138,12 +128,7 @@
* @title types of arguments - float * long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long.d.T_mul_long_5", VerifyError.class);
}
/**
@@ -151,12 +136,7 @@
* @title types of arguments - reference * long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long.d.T_mul_long_6", VerifyError.class);
}
/**
@@ -165,11 +145,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.mul_long.d.T_mul_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long.d.T_mul_long_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/Test_mul_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/Test_mul_long_2addr.java
index 1e66348..95e0469 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/Test_mul_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/Test_mul_long_2addr.java
@@ -109,12 +109,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_2", VerifyError.class);
}
@@ -124,12 +119,7 @@
* @title types of arguments - long * int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_4", VerifyError.class);
}
/**
@@ -137,12 +127,7 @@
* @title types of arguments - float * long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_5", VerifyError.class);
}
/**
@@ -150,12 +135,7 @@
* @title types of arguments - reference * long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_6", VerifyError.class);
}
/**
@@ -164,11 +144,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.mul_long_2addr.d.T_mul_long_2addr_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/Test_neg_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/Test_neg_double.java
index a16763f..1618921 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/Test_neg_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/Test_neg_double.java
@@ -101,12 +101,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_double.d.T_neg_double_2", VerifyError.class);
}
@@ -117,12 +112,7 @@
* @title type of argument - float
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_double.d.T_neg_double_3", VerifyError.class);
}
/**
@@ -131,12 +121,7 @@
* @title type of argument - int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_double.d.T_neg_double_5", VerifyError.class);
}
/**
@@ -145,12 +130,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_double.d.T_neg_double_6", VerifyError.class);
}
/**
@@ -159,12 +139,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.neg_double.d.T_neg_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_double.d.T_neg_double_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/Test_neg_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/Test_neg_float.java
index 8544b18..a5933d7 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/Test_neg_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/Test_neg_float.java
@@ -100,12 +100,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_float.d.T_neg_float_2", VerifyError.class);
}
@@ -116,12 +111,7 @@
* @title type of argument - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_float.d.T_neg_float_3", VerifyError.class);
}
/**
@@ -130,12 +120,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_float.d.T_neg_float_4", VerifyError.class);
}
/**
@@ -144,12 +129,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_float.d.T_neg_float_5", VerifyError.class);
}
/**
@@ -158,11 +138,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.neg_float.d.T_neg_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_float.d.T_neg_float_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/Test_neg_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/Test_neg_int.java
index 97290f6..47b29f0 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/Test_neg_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/Test_neg_int.java
@@ -85,12 +85,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_int.d.T_neg_int_3", VerifyError.class);
}
@@ -101,12 +96,7 @@
* @title type of argument - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_int.d.T_neg_int_4", VerifyError.class);
}
/**
@@ -115,12 +105,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_int.d.T_neg_int_5", VerifyError.class);
}
/**
@@ -129,12 +114,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_int.d.T_neg_int_6", VerifyError.class);
}
/**
@@ -143,11 +123,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.neg_int.d.T_neg_int_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_int.d.T_neg_int_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/Test_neg_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/Test_neg_long.java
index 6880c94..8a1049e 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/Test_neg_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/Test_neg_long.java
@@ -86,12 +86,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_long.d.T_neg_long_3", VerifyError.class);
}
@@ -101,12 +96,7 @@
* @title type of argument - int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_long.d.T_neg_long_5", VerifyError.class);
}
/**
@@ -115,12 +105,7 @@
* @title type of argument - float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_long.d.T_neg_long_6", VerifyError.class);
}
/**
@@ -129,12 +114,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_long.d.T_neg_long_7", VerifyError.class);
}
/**
@@ -143,11 +123,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.neg_long.d.T_neg_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.neg_long.d.T_neg_long_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/Test_new_array.java b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/Test_new_array.java
index 44aedaa..1e990c2 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/Test_new_array.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/Test_new_array.java
@@ -86,13 +86,8 @@
* @title expected NegativeArraySizeException
*/
public void testE1() {
- T_new_array_2 t = new T_new_array_2();
- try {
- t.run(-1);
- fail("expected NegativeArraySizeException");
- } catch (NegativeArraySizeException nase) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.new_array.d.T_new_array_2", NegativeArraySizeException.class,
+ -1);
}
@@ -101,12 +96,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_array.d.T_new_array_4", VerifyError.class);
}
/**
@@ -115,12 +105,7 @@
* @title size argument - long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_array.d.T_new_array_5", VerifyError.class);
}
/**
@@ -129,12 +114,7 @@
* @title size argument - reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_array.d.T_new_array_9", VerifyError.class);
}
/**
@@ -143,12 +123,7 @@
* @title constant pool index
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_array.d.T_new_array_6", VerifyError.class);
}
/**
@@ -157,12 +132,7 @@
* @title attempt to create object
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_array.d.T_new_array_7", VerifyError.class);
}
/**
@@ -171,12 +141,7 @@
* @title array of more than 255 dimensions
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.new_array.d.T_new_array_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_array.d.T_new_array_8", ClassNotFoundException.class);
}
/**
@@ -184,11 +149,7 @@
* @title Attempt to instantiate array of non-existent class.
*/
public void testVFE7() {
- try {
- new T_new_array_11().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.new_array.d.T_new_array_11", NoClassDefFoundError.class);
}
/**
@@ -197,11 +158,7 @@
*/
public void testVFE8() {
//@uses dot.junit.opcodes.new_array.TestStubs
- try {
- new T_new_array_10().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.new_array.d.T_new_array_10", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/Test_new_instance.java b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/Test_new_instance.java
index d994f65..3209553 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/Test_new_instance.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/Test_new_instance.java
@@ -42,12 +42,8 @@
* @title class initialization throws exception
*/
public void testE1() {
- try {
- T_new_instance_3.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ load("dot.junit.opcodes.new_instance.d.T_new_instance_3",
+ ExceptionInInitializerError.class);
}
/**
@@ -56,14 +52,7 @@
*/
public void testE4() {
//@uses dot.junit.opcodes.new_instance.d.TestAbstractClass
- //@uses dot.junit.opcodes.new_instance.d.T_new_instance_8
- T_new_instance_8 t = new T_new_instance_8();
- try {
- t.run();
- fail("expected InstantiationError");
- } catch (InstantiationError ie) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.new_instance.d.T_new_instance_8", InstantiationError.class);
}
/**
@@ -73,14 +62,7 @@
*/
public void testE5() {
//@uses dot.junit.opcodes.new_instance.d.TestAbstractClass
- //@uses dot.junit.opcodes.new_instance.d.T_new_instance_9
- T_new_instance_9 t = new T_new_instance_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error iae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.new_instance.d.T_new_instance_9", InstantiationError.class);
}
/**
@@ -88,12 +70,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_instance.d.T_new_instance_6", VerifyError.class);
}
/**
@@ -102,12 +79,7 @@
* @title attempt to create array using new
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_instance.d.T_new_instance_7", VerifyError.class);
}
/**
@@ -116,12 +88,7 @@
* called
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_instance.d.T_new_instance_2", VerifyError.class);
}
/**
@@ -129,12 +96,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_instance.d.T_new_instance_10", VerifyError.class);
}
/**
@@ -143,12 +105,7 @@
*/
public void testVFE5() {
//@uses dot.junit.opcodes.new_instance.TestStubs
- //@uses dot.junit.opcodes.new_instance.d.T_new_instance_4
- try {
- new T_new_instance_4().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.new_instance.d.T_new_instance_4", IllegalAccessError.class);
}
/**
@@ -156,11 +113,7 @@
* @title Attempt to instantiate array of non-existent class.
*/
public void testVFE6() {
- try {
- new T_new_instance_5().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.new_instance.d.T_new_instance_5", NoClassDefFoundError.class);
}
/**
@@ -169,12 +122,7 @@
* if the same new-instance instruction is again executed before the instance is initialized
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_instance.d.T_new_instance_11", VerifyError.class);
}
/**
@@ -183,11 +131,6 @@
* if the same new-instance instruction is again executed before the instance is initialized
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.new_instance.d.T_new_instance_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.new_instance.d.T_new_instance_12", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/Test_not_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/Test_not_int.java
index 110a842..1bf3f15 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/Test_not_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/Test_not_int.java
@@ -111,12 +111,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_int.d.T_not_int_3", VerifyError.class);
}
@@ -126,12 +121,7 @@
* @title types of arguments - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_int.d.T_not_int_4", VerifyError.class);
}
/**
@@ -139,12 +129,7 @@
* @title types of arguments - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_int.d.T_not_int_5", VerifyError.class);
}
/**
@@ -152,12 +137,7 @@
* @title types of arguments - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_int.d.T_not_int_6", VerifyError.class);
}
/**
@@ -166,12 +146,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.not_int.d.T_not_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_int.d.T_not_int_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/Test_not_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/Test_not_long.java
index 9e3c614..acb656d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/Test_not_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/Test_not_long.java
@@ -93,12 +93,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_long.d.T_not_long_3", VerifyError.class);
}
@@ -108,12 +103,7 @@
* @title types of arguments - int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_long.d.T_not_long_4", VerifyError.class);
}
/**
@@ -121,12 +111,7 @@
* @title types of arguments - float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_long.d.T_not_long_5", VerifyError.class);
}
/**
@@ -134,12 +119,7 @@
* @title types of arguments - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_long.d.T_not_long_6", VerifyError.class);
}
/**
@@ -148,11 +128,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.not_long.d.T_not_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.not_long.d.T_not_long_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/Test_opc_const.java b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/Test_opc_const.java
index aa19e6c..87383ce 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/Test_opc_const.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/Test_opc_const.java
@@ -48,12 +48,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.opc_const.d.T_opc_const_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_const.d.T_opc_const_3", VerifyError.class);
}
/**
@@ -63,12 +58,7 @@
* other register involved in it becomes undefined
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.opc_const.d.T_opc_const_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_const.d.T_opc_const_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/Test_opc_goto.java b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/Test_opc_goto.java
index a3558fe..64f0d5a 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/Test_opc_goto.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/Test_opc_goto.java
@@ -35,12 +35,7 @@
* @title branch target is inside instruction
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.opc_goto.d.T_opc_goto_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_goto.d.T_opc_goto_2", VerifyError.class);
}
/**
@@ -48,12 +43,7 @@
* @title branch target shall be inside the method
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.opc_goto.d.T_opc_goto_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_goto.d.T_opc_goto_3", VerifyError.class);
}
/**
@@ -61,12 +51,7 @@
* @title zero offset
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.opc_goto.d.T_opc_goto_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_goto.d.T_opc_goto_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/Test_opc_return.java b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/Test_opc_return.java
index 2fe8323..3d69bfa 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/Test_opc_return.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/Test_opc_return.java
@@ -30,32 +30,20 @@
assertEquals(123456, t.run());
}
-
/**
* @title Method is synchronized but thread is not monitor owner
*/
public void testE1() {
- T_opc_return_3 t = new T_opc_return_3();
- try {
- assertTrue(t.run());
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.opc_return.d.T_opc_return_3",
+ IllegalMonitorStateException.class);
}
-
/**
* @constraint B11
* @title method's return type - long
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.opc_return.d.T_opc_return_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_return.d.T_opc_return_5", VerifyError.class);
}
/**
@@ -63,12 +51,7 @@
* @title method's return type - reference
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.opc_return.d.T_opc_return_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_return.d.T_opc_return_6", VerifyError.class);
}
/**
@@ -76,12 +59,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.opc_return.d.T_opc_return_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_return.d.T_opc_return_7", VerifyError.class);
}
/**
@@ -89,12 +67,6 @@
* @title return on wide register pair
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.opc_return.d.T_opc_return_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_return.d.T_opc_return_8", VerifyError.class);
}
-
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/Test_opc_throw.java b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/Test_opc_throw.java
index 5055336..7baf67d 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/Test_opc_throw.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/Test_opc_throw.java
@@ -79,26 +79,15 @@
* a NullPointerException instead of objectref
*/
public void testE1() {
- T_opc_throw_4 t = new T_opc_throw_4();
- try {
- t.run();
- fail("expected NullPointerException");
- } catch (NullPointerException npe) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.opc_throw.d.T_opc_throw_4", NullPointerException.class);
}
/**
* @title expected IllegalMonitorStateException
*/
public void testE2() {
- T_opc_throw_5 t = new T_opc_throw_5();
- try {
- t.run();
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.opc_throw.d.T_opc_throw_5",
+ IllegalMonitorStateException.class);
}
/**
@@ -106,12 +95,7 @@
* @title (number of registers)
*/
public void testVFE2() {
- try {
- Class.forName("dxc.junit.opcodes.opc_throw.jm.T_opc_throw_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_throw.d.T_opc_throw_6", VerifyError.class);
}
@@ -122,12 +106,7 @@
* @title type of argument - float
*/
public void testVFE3() {
- try {
- Class.forName("dxc.junit.opcodes.opc_throw.jm.T_opc_throw_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_throw.d.T_opc_throw_7", VerifyError.class);
}
/**
@@ -136,12 +115,7 @@
* @title type of argument - long
*/
public void testVFE4() {
- try {
- Class.forName("dxc.junit.opcodes.opc_throw.jm.T_opc_throw_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_throw.d.T_opc_throw_7", VerifyError.class);
}
/**
@@ -151,11 +125,6 @@
*/
public void testVFE5() {
- try {
- Class.forName("dxc.junit.opcodes.opc_throw.jm.T_opc_throw_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.opc_throw.d.T_opc_throw_10", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/Test_or_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/Test_or_int.java
index a7eb005..7a34434 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/Test_or_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/Test_or_int.java
@@ -68,12 +68,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int.d.T_or_int_2", VerifyError.class);
}
@@ -83,12 +78,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int.d.T_or_int_3", VerifyError.class);
}
/**
@@ -96,12 +86,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int.d.T_or_int_4", VerifyError.class);
}
/**
@@ -109,12 +94,7 @@
* @title types of arguments - reference & int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int.d.T_or_int_5", VerifyError.class);
}
/**
@@ -123,11 +103,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.or_int.d.T_or_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int.d.T_or_int_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/Test_or_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/Test_or_int_2addr.java
index 0a0a66c..b453125 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/Test_or_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/Test_or_int_2addr.java
@@ -68,12 +68,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_2", VerifyError.class);
}
@@ -83,12 +78,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_3", VerifyError.class);
}
/**
@@ -96,12 +86,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_4", VerifyError.class);
}
/**
@@ -109,12 +94,7 @@
* @title types of arguments - reference & int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_5", VerifyError.class);
}
/**
@@ -123,11 +103,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_2addr.d.T_or_int_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/Test_or_int_lit16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/Test_or_int_lit16.java
index eff9cbc..efabaec 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/Test_or_int_lit16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/Test_or_int_lit16.java
@@ -71,12 +71,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_6", VerifyError.class);
}
@@ -86,12 +81,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_7", VerifyError.class);
}
/**
@@ -99,12 +89,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_8", VerifyError.class);
}
/**
@@ -112,12 +97,7 @@
* @title types of arguments - reference & int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_9", VerifyError.class);
}
/**
@@ -126,11 +106,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit16.d.T_or_int_lit16_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/Test_or_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/Test_or_int_lit8.java
index cfddb9b..90f4679 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/Test_or_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/Test_or_int_lit8.java
@@ -71,12 +71,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_6", VerifyError.class);
}
@@ -86,12 +81,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_7", VerifyError.class);
}
/**
@@ -99,12 +89,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_8", VerifyError.class);
}
/**
@@ -112,12 +97,7 @@
* @title types of arguments - reference & int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_9", VerifyError.class);
}
/**
@@ -126,11 +106,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_int_lit8.d.T_or_int_lit8_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/Test_or_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/Test_or_long.java
index 6076ad3..7b3e50f 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/Test_or_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/Test_or_long.java
@@ -69,12 +69,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long.d.T_or_long_2", VerifyError.class);
}
@@ -84,12 +79,7 @@
* @title types of arguments - int & long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long.d.T_or_long_4", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title types of arguments - float & long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long.d.T_or_long_5", VerifyError.class);
}
/**
@@ -110,12 +95,7 @@
* @title types of arguments - reference & long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long.d.T_or_long_6", VerifyError.class);
}
/**
@@ -124,11 +104,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.or_long.d.T_or_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long.d.T_or_long_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/Test_or_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/Test_or_long_2addr.java
index c9aa587..98532de 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/Test_or_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/Test_or_long_2addr.java
@@ -69,12 +69,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_2", VerifyError.class);
}
@@ -84,12 +79,7 @@
* @title types of arguments - int & long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_4", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title types of arguments - float & long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_5", VerifyError.class);
}
/**
@@ -110,12 +95,7 @@
* @title types of arguments - reference & long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_6", VerifyError.class);
}
/**
@@ -124,11 +104,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.or_long_2addr.d.T_or_long_2addr_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/packed_switch/Test_packed_switch.java b/tools/vm-tests-tf/src/dot/junit/opcodes/packed_switch/Test_packed_switch.java
index 5b983e1..992dd59 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/packed_switch/Test_packed_switch.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/packed_switch/Test_packed_switch.java
@@ -68,12 +68,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_3", VerifyError.class);
}
@@ -83,12 +78,7 @@
* @title type of argument - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_4", VerifyError.class);
}
/**
@@ -96,12 +86,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_5", VerifyError.class);
}
/**
@@ -109,12 +94,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_6", VerifyError.class);
}
/**
@@ -122,12 +102,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_7", VerifyError.class);
}
/**
@@ -135,12 +110,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_8", VerifyError.class);
}
@@ -149,12 +119,7 @@
* @title offset to table shall be inside method
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_9", VerifyError.class);
}
/**
@@ -163,12 +128,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_2", VerifyError.class);
}
/**
@@ -176,12 +136,7 @@
* @title the size and the list of targets must be consistent.
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_11", VerifyError.class);
}
@@ -190,12 +145,7 @@
* @title packed-switch-data pseudo-instructions must not be reachable by control flow
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_12", VerifyError.class);
}
/**
@@ -203,11 +153,6 @@
* @title table has wrong ident code
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.packed_switch.d.T_packed_switch_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.packed_switch.d.T_packed_switch_13", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/Test_rem_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/Test_rem_double.java
index b3a9c92..c019053 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/Test_rem_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/Test_rem_double.java
@@ -127,12 +127,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double.d.T_rem_double_2", VerifyError.class);
}
@@ -142,12 +137,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double.d.T_rem_double_3", VerifyError.class);
}
/**
@@ -155,12 +145,7 @@
* @title types of arguments - double, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double.d.T_rem_double_5", VerifyError.class);
}
/**
@@ -168,12 +153,7 @@
* @title types of arguments - double, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double.d.T_rem_double_6", VerifyError.class);
}
/**
@@ -182,11 +162,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_double.d.T_rem_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double.d.T_rem_double_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/Test_rem_double_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/Test_rem_double_2addr.java
index 15020da..6e32b1a 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/Test_rem_double_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/Test_rem_double_2addr.java
@@ -127,12 +127,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_2", VerifyError.class);
}
@@ -142,12 +137,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_3", VerifyError.class);
}
/**
@@ -155,12 +145,7 @@
* @title types of arguments - double, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_5", VerifyError.class);
}
/**
@@ -168,12 +153,7 @@
* @title types of arguments - double, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_6", VerifyError.class);
}
/**
@@ -182,11 +162,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_double_2addr.d.T_rem_double_2addr_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/Test_rem_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/Test_rem_float.java
index b028af7..004f4ad 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/Test_rem_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/Test_rem_float.java
@@ -126,12 +126,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float.d.T_rem_float_2", VerifyError.class);
}
@@ -141,12 +136,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float.d.T_rem_float_3", VerifyError.class);
}
/**
@@ -154,12 +144,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float.d.T_rem_float_4", VerifyError.class);
}
/**
@@ -167,12 +152,7 @@
* @title types of arguments - reference, float
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float.d.T_rem_float_5", VerifyError.class);
}
/**
@@ -181,11 +161,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_float.d.T_rem_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float.d.T_rem_float_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/Test_rem_float_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/Test_rem_float_2addr.java
index 29a1e49..f5055b2 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/Test_rem_float_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/Test_rem_float_2addr.java
@@ -126,12 +126,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_2", VerifyError.class);
}
@@ -141,12 +136,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_3", VerifyError.class);
}
/**
@@ -154,12 +144,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_4", VerifyError.class);
}
/**
@@ -167,12 +152,7 @@
* @title types of arguments - reference, float
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_5", VerifyError.class);
}
/**
@@ -182,11 +162,6 @@
* Note: This test works only in ICS and beyond.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_float_2addr.d.T_rem_float_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/Test_rem_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/Test_rem_int.java
index 5dd0915..dbecced 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/Test_rem_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/Test_rem_int.java
@@ -123,13 +123,7 @@
* @title Divisor is 0
*/
public void testE1() {
- T_rem_int_1 t = new T_rem_int_1();
- try {
- t.run(1, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.rem_int.d.T_rem_int_1", ArithmeticException.class, 1, 0);
}
/**
@@ -137,12 +131,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int.d.T_rem_int_2", VerifyError.class);
}
@@ -152,12 +141,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int.d.T_rem_int_3", VerifyError.class);
}
/**
@@ -165,12 +149,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int.d.T_rem_int_4", VerifyError.class);
}
/**
@@ -178,12 +157,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int.d.T_rem_int_5", VerifyError.class);
}
/**
@@ -192,12 +166,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_int.d.T_rem_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int.d.T_rem_int_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/Test_rem_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/Test_rem_int_2addr.java
index 5972821..9c5d1df 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/Test_rem_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/Test_rem_int_2addr.java
@@ -123,13 +123,8 @@
* @title Divisor is 0
*/
public void testE1() {
- T_rem_int_2addr_1 t = new T_rem_int_2addr_1();
- try {
- t.run(1, 0);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_1", ArithmeticException.class,
+ 1, 0);
}
/**
@@ -137,12 +132,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_2", VerifyError.class);
}
@@ -152,12 +142,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_3", VerifyError.class);
}
/**
@@ -165,12 +150,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_4", VerifyError.class);
}
/**
@@ -178,12 +158,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_5", VerifyError.class);
}
/**
@@ -192,12 +167,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_2addr.d.T_rem_int_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/Test_rem_int_lit16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/Test_rem_int_lit16.java
index 725391c..ce4c842 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/Test_rem_int_lit16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/Test_rem_int_lit16.java
@@ -130,13 +130,8 @@
* @title Divisor is 0
*/
public void testE1() {
- T_rem_int_lit16_9 t = new T_rem_int_lit16_9();
- try {
- t.run(1);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_9", ArithmeticException.class,
+ 1);
}
/**
@@ -144,12 +139,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_10", VerifyError.class);
}
@@ -159,12 +149,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_11", VerifyError.class);
}
/**
@@ -172,12 +157,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_12", VerifyError.class);
}
/**
@@ -185,12 +165,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_13", VerifyError.class);
}
/**
@@ -199,11 +174,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit16.d.T_rem_int_lit16_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/Test_rem_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/Test_rem_int_lit8.java
index 62b4f5b..54c2e6c 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/Test_rem_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/Test_rem_int_lit8.java
@@ -130,13 +130,8 @@
* @title Divisor is 0
*/
public void testE1() {
- T_rem_int_lit8_9 t = new T_rem_int_lit8_9();
- try {
- t.run(1);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_9", ArithmeticException.class,
+ 1);
}
/**
@@ -144,12 +139,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_10", VerifyError.class);
}
@@ -159,12 +149,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_11", VerifyError.class);
}
/**
@@ -172,12 +157,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_12", VerifyError.class);
}
/**
@@ -185,12 +165,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_13", VerifyError.class);
}
/**
@@ -199,12 +174,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_int_lit8.d.T_rem_int_lit8_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/Test_rem_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/Test_rem_long.java
index d5493a7..c3edea6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/Test_rem_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/Test_rem_long.java
@@ -123,13 +123,8 @@
* @title Divisor is 0
*/
public void testE1() {
- T_rem_long_1 t = new T_rem_long_1();
- try {
- t.run(1234567890123l, 0l);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.rem_long.d.T_rem_long_1", ArithmeticException.class,
+ 1234567890123l, 0l);
}
/**
@@ -137,12 +132,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long.d.T_rem_long_2", VerifyError.class);
}
@@ -152,12 +142,7 @@
* @title types of arguments - int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long.d.T_rem_long_4", VerifyError.class);
}
/**
@@ -165,12 +150,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long.d.T_rem_long_5", VerifyError.class);
}
/**
@@ -178,12 +158,7 @@
* @title types of arguments - reference, long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long.d.T_rem_long_6", VerifyError.class);
}
/**
@@ -192,11 +167,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_long.d.T_rem_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long.d.T_rem_long_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/Test_rem_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/Test_rem_long_2addr.java
index 16f38a6..6919e22 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/Test_rem_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/Test_rem_long_2addr.java
@@ -123,13 +123,8 @@
* @title Divisor is 0
*/
public void testE1() {
- T_rem_long_2addr_1 t = new T_rem_long_2addr_1();
- try {
- t.run(1234567890123l, 0l);
- fail("expected ArithmeticException");
- } catch (ArithmeticException ae) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_1",
+ ArithmeticException.class, 1234567890123l, 0l);
}
/**
@@ -137,12 +132,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_2", VerifyError.class);
}
@@ -152,12 +142,7 @@
* @title (types of arguments - int, long).
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_4", VerifyError.class);
}
/**
@@ -165,12 +150,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_5", VerifyError.class);
}
/**
@@ -178,12 +158,7 @@
* @title types of arguments - reference, long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_6", VerifyError.class);
}
/**
@@ -192,12 +167,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rem_long_2addr.d.T_rem_long_2addr_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/Test_return_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/Test_return_object.java
index 9336829..9f0e639 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/Test_return_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/Test_return_object.java
@@ -88,13 +88,8 @@
* @title Method is synchronized but thread is not monitor owner
*/
public void testE1() {
- T_return_object_8 t = new T_return_object_8();
- try {
- assertTrue(t.run());
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.return_object.d.T_return_object_8",
+ IllegalMonitorStateException.class);
}
@@ -103,12 +98,7 @@
* @title method's return type - void
*/
public void testVFE1() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_object.d.T_return_object_3", VerifyError.class);
}
/**
@@ -116,12 +106,7 @@
* @title method's return type - float
*/
public void testVFE2() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_object.d.T_return_object_4", VerifyError.class);
}
/**
@@ -129,12 +114,7 @@
* @title method's return type - long
*/
public void testVFE3() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_object.d.T_return_object_16", VerifyError.class);
}
/**
@@ -142,12 +122,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_object.d.T_return_object_5", VerifyError.class);
}
@@ -156,12 +131,7 @@
* @title types of argument - int
*/
public void testVFE6() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_object.d.T_return_object_10", VerifyError.class);
}
/**
@@ -169,12 +139,7 @@
* @title types of argument - long
*/
public void testVFE7() {
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_object.d.T_return_object_11", VerifyError.class);
}
/**
@@ -186,12 +151,7 @@
//@uses dot.junit.opcodes.return_object.d.TChild
//@uses dot.junit.opcodes.return_object.d.TSuper
//@uses dot.junit.opcodes.return_object.d.TInterface
- try {
- Class.forName("dxc.junit.opcodes.return_object.jm.T_return_object_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_object.d.T_return_object_14", VerifyError.class);
}
/**
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/Test_return_void.java b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/Test_return_void.java
index e5903e3..634ec7a 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/Test_return_void.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/Test_return_void.java
@@ -30,33 +30,20 @@
assertEquals(123456, t.run());
}
-
/**
* @title Method is synchronized but thread is not monitor owner
*/
public void testE1() {
- T_return_void_3 t = new T_return_void_3();
- try {
- assertTrue(t.run());
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.return_void.d.T_return_void_3",
+ IllegalMonitorStateException.class);
}
-
-
/**
* @constraint B11
* @title method's return type - int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.return_void.d.T_return_void_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_void.d.T_return_void_5", VerifyError.class);
}
/**
@@ -64,12 +51,7 @@
* @title method's return type - reference
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.return_void.d.T_return_void_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_void.d.T_return_void_6", VerifyError.class);
}
/**
@@ -77,12 +59,7 @@
* @title method's return type - wide
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.return_void.d.T_return_void_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_void.d.T_return_void_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/Test_return_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/Test_return_wide.java
index c97f0d2..e8afde0 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/Test_return_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/Test_return_wide.java
@@ -34,13 +34,8 @@
* @title Method is synchronized but thread is not monitor owner
*/
public void testE1() {
- T_return_wide_3 t = new T_return_wide_3();
- try {
- assertTrue(t.run());
- fail("expected IllegalMonitorStateException");
- } catch (IllegalMonitorStateException imse) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.return_wide.d.T_return_wide_3",
+ IllegalMonitorStateException.class);
}
@@ -49,12 +44,7 @@
* @title method's return type - int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.return_wide.d.T_return_wide_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_wide.d.T_return_wide_5", VerifyError.class);
}
/**
@@ -62,12 +52,7 @@
* @title method's return type - reference
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.return_wide.d.T_return_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_wide.d.T_return_wide_6", VerifyError.class);
}
/**
@@ -75,12 +60,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.return_wide.d.T_return_wide_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_wide.d.T_return_wide_7", VerifyError.class);
}
/**
@@ -88,12 +68,7 @@
* @title return-wide on single-width register
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.return_wide.d.T_return_wide_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.return_wide.d.T_return_wide_8", VerifyError.class);
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/Test_rsub_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/Test_rsub_int.java
index 334d79f..ae25759 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/Test_rsub_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/Test_rsub_int.java
@@ -192,12 +192,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int.d.T_rsub_int_8", VerifyError.class);
}
@@ -207,12 +202,7 @@
* @title types of arguments - double, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int.d.T_rsub_int_9", VerifyError.class);
}
/**
@@ -220,12 +210,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int.d.T_rsub_int_10", VerifyError.class);
}
/**
@@ -233,12 +218,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int.d.T_rsub_int_11", VerifyError.class);
}
/**
@@ -247,11 +227,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int.d.T_rsub_int_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int.d.T_rsub_int_12", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/Test_rsub_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/Test_rsub_int_lit8.java
index 1f4b602..4c38f79 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/Test_rsub_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/Test_rsub_int_lit8.java
@@ -192,12 +192,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_8", VerifyError.class);
}
@@ -207,12 +202,7 @@
* @title types of arguments - double, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_9", VerifyError.class);
}
/**
@@ -220,12 +210,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_10", VerifyError.class);
}
/**
@@ -233,12 +218,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_11", VerifyError.class);
}
/**
@@ -247,11 +227,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.rsub_int_lit8.d.T_rsub_int_lit8_12", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/Test_sget.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/Test_sget.java
index 981b19a..f45f7e6 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/Test_sget.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/Test_sget.java
@@ -62,26 +62,14 @@
* @title attempt to access non-static field
*/
public void testE1() {
- T_sget_5 t = new T_sget_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget.d.T_sget_5", IncompatibleClassChangeError.class);
}
/**
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sget_9 t = new T_sget_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget.d.T_sget_9", ExceptionInInitializerError.class);
}
/**
@@ -89,12 +77,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_4", VerifyError.class);
}
/**
@@ -103,12 +86,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_3", VerifyError.class);
}
/**
@@ -118,11 +96,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_sget_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget.d.T_sget_13", NoSuchFieldError.class);
}
/**
@@ -130,13 +104,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.sget.d.T_sget_6
//@uses dot.junit.opcodes.sget.TestStubs
- try {
- new T_sget_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget.d.T_sget_6", IllegalAccessError.class);
}
/**
@@ -144,11 +113,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_sget_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget.d.T_sget_7", NoClassDefFoundError.class);
}
/**
@@ -156,11 +121,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_sget_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget.d.T_sget_8", NoSuchFieldError.class);
}
/**
@@ -168,13 +129,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.sget.d.T_sget_12
//@uses dot.junit.opcodes.sget.d.T_sget_1
- try {
- new T_sget_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget.d.T_sget_12", IllegalAccessError.class);
}
/**
@@ -182,12 +138,7 @@
* @title sget shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_14", VerifyError.class);
}
/**
@@ -196,12 +147,7 @@
* @title sget shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_15", VerifyError.class);
}
/**
@@ -210,12 +156,7 @@
* @title sget shall not work for boolean fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_16", VerifyError.class);
}
/**
@@ -224,12 +165,7 @@
* @title sget shall not work for char fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_17", VerifyError.class);
}
/**
@@ -238,12 +174,7 @@
* @title sget shall not work for byte fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_18", VerifyError.class);
}
/**
@@ -252,12 +183,7 @@
* @title sget shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_19", VerifyError.class);
}
/**
@@ -266,11 +192,6 @@
* @title sget shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget.d.T_sget_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget.d.T_sget_20", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/Test_sget_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/Test_sget_boolean.java
index ccbeb09..855c8fd 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/Test_sget_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/Test_sget_boolean.java
@@ -54,42 +54,24 @@
* @title attempt to access non-static field
*/
public void testE1() {
-
- T_sget_boolean_5 t = new T_sget_boolean_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_5",
+ IncompatibleClassChangeError.class);
}
/**
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sget_boolean_9 t = new T_sget_boolean_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_9",
+ ExceptionInInitializerError.class);
}
-
-
/**
* @constraint A12
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_4", VerifyError.class);
}
/**
@@ -98,12 +80,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_3", VerifyError.class);
}
/**
@@ -113,11 +90,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_sget_boolean_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_13", NoSuchFieldError.class);
}
/**
@@ -125,12 +98,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.sget_boolean.d.T_sget_boolean_6
//@uses dot.junit.opcodes.sget_boolean.TestStubs
- try {
- new T_sget_boolean_6().run();
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_6", IllegalAccessError.class);
}
/**
@@ -138,11 +107,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_sget_boolean_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_7", NoClassDefFoundError.class);
}
/**
@@ -150,11 +115,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_sget_boolean_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_8", NoSuchFieldError.class);
}
/**
@@ -162,13 +123,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.sget_boolean.d.T_sget_boolean_12
//@uses dot.junit.opcodes.sget_boolean.d.T_sget_boolean_1
- try {
- new T_sget_boolean_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_12", IllegalAccessError.class);
}
/**
@@ -176,12 +132,7 @@
* @title sget_boolean shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_14", VerifyError.class);
}
/**
@@ -190,12 +141,7 @@
* @title sget_boolean shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_15", VerifyError.class);
}
/**
@@ -204,12 +150,7 @@
* @title sget_boolean shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_16", VerifyError.class);
}
/**
@@ -218,12 +159,7 @@
* @title sget_boolean shall not work for char fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_17", VerifyError.class);
}
/**
@@ -232,12 +168,7 @@
* @title sget_boolean shall not work for byte fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_18", VerifyError.class);
}
/**
@@ -246,12 +177,7 @@
* @title sget_boolean shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_19", VerifyError.class);
}
/**
@@ -260,11 +186,6 @@
* @title sget_boolean shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_boolean.d.T_sget_boolean_20", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/Test_sget_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/Test_sget_byte.java
index 9a19f98..9cf4306 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/Test_sget_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/Test_sget_byte.java
@@ -54,27 +54,16 @@
* @title attempt to access non-static field
*/
public void testE1() {
-
- T_sget_byte_5 t = new T_sget_byte_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_byte.d.T_sget_byte_5",
+ IncompatibleClassChangeError.class);
}
/**
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sget_byte_9 t = new T_sget_byte_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_byte.d.T_sget_byte_9",
+ ExceptionInInitializerError.class);
}
@@ -84,12 +73,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_4", VerifyError.class);
}
/**
@@ -98,12 +82,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_3", VerifyError.class);
}
/**
@@ -113,11 +92,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_sget_byte_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_byte.d.T_sget_byte_13", NoSuchFieldError.class);
}
/**
@@ -125,13 +100,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.sget_byte.d.T_sget_byte_6
//@uses dot.junit.opcodes.sget_byte.TestStubs
- try {
- new T_sget_byte_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_byte.d.T_sget_byte_6", IllegalAccessError.class);
}
/**
@@ -139,11 +109,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_sget_byte_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_byte.d.T_sget_byte_7", NoClassDefFoundError.class);
}
/**
@@ -151,11 +117,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_sget_byte_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_byte.d.T_sget_byte_8", NoSuchFieldError.class);
}
/**
@@ -163,13 +125,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.sget_byte.d.T_sget_byte_12
//@uses dot.junit.opcodes.sget_byte.d.T_sget_byte_1
- try {
- new T_sget_byte_12().run();
- fail("expected a verification exception");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_byte.d.T_sget_byte_12", IllegalAccessError.class);
}
/**
@@ -177,12 +134,7 @@
* @title sget_byte shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_14", VerifyError.class);
}
/**
@@ -191,12 +143,7 @@
* @title sget_byte shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_15", VerifyError.class);
}
/**
@@ -205,12 +152,7 @@
* @title sget_byte shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_16", VerifyError.class);
}
/**
@@ -219,12 +161,7 @@
* @title sget_byte shall not work for char fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_17", VerifyError.class);
}
/**
@@ -233,12 +170,7 @@
* @title sget_byte shall not work for boolean fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_18", VerifyError.class);
}
/**
@@ -247,12 +179,7 @@
* @title sget_byte shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_19", VerifyError.class);
}
/**
@@ -261,11 +188,6 @@
* @title sget_byte shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_byte.d.T_sget_byte_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_byte.d.T_sget_byte_20", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/Test_sget_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/Test_sget_char.java
index 10324a5..babc8f9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/Test_sget_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/Test_sget_char.java
@@ -54,27 +54,16 @@
* @title attempt to access non-static field
*/
public void testE1() {
-
- T_sget_char_5 t = new T_sget_char_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_char.d.T_sget_char_5",
+ IncompatibleClassChangeError.class);
}
/**
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sget_char_9 t = new T_sget_char_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_char.d.T_sget_char_9",
+ ExceptionInInitializerError.class);
}
@@ -84,12 +73,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_4", VerifyError.class);
}
/**
@@ -98,12 +82,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_3", VerifyError.class);
}
/**
@@ -113,11 +92,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_sget_char_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_char.d.T_sget_char_13", NoSuchFieldError.class);
}
/**
@@ -125,13 +100,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.sget_char.d.T_sget_char_6
//@uses dot.junit.opcodes.sget_char.TestStubs
- try {
- new T_sget_char_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_char.d.T_sget_char_6", IllegalAccessError.class);
}
/**
@@ -139,11 +109,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_sget_char_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_char.d.T_sget_char_7", NoClassDefFoundError.class);
}
/**
@@ -151,11 +117,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_sget_char_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_char.d.T_sget_char_8", NoSuchFieldError.class);
}
/**
@@ -163,13 +125,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.sget_char.d.T_sget_char_12
//@uses dot.junit.opcodes.sget_char.d.T_sget_char_1
- try {
- new T_sget_char_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_char.d.T_sget_char_12", IllegalAccessError.class);
}
/**
@@ -177,12 +134,7 @@
* @title sget_char shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_14", VerifyError.class);
}
/**
@@ -191,12 +143,7 @@
* @title sget_char shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_15", VerifyError.class);
}
/**
@@ -205,12 +152,7 @@
* @title sget_char shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_16", VerifyError.class);
}
/**
@@ -219,12 +161,7 @@
* @title sget_char shall not work for byte fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_17", VerifyError.class);
}
/**
@@ -233,12 +170,7 @@
* @title sget_char shall not work for boolean fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_18", VerifyError.class);
}
/**
@@ -247,12 +179,7 @@
* @title sget_char shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_19", VerifyError.class);
}
/**
@@ -261,11 +188,6 @@
* @title sget_char shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_char.d.T_sget_char_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_char.d.T_sget_char_20", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/Test_sget_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/Test_sget_object.java
index 88aa4cb..db118e5 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/Test_sget_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/Test_sget_object.java
@@ -55,27 +55,16 @@
* @title attempt to access non-static field
*/
public void testE1() {
-
- T_sget_object_5 t = new T_sget_object_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_object.d.T_sget_object_5",
+ IncompatibleClassChangeError.class);
}
/**
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sget_object_9 t = new T_sget_object_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_object.d.T_sget_object_9",
+ ExceptionInInitializerError.class);
}
@@ -85,12 +74,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_4", VerifyError.class);
}
/**
@@ -99,12 +83,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_3", VerifyError.class);
}
/**
@@ -114,11 +93,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_sget_object_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_object.d.T_sget_object_13", NoSuchFieldError.class);
}
/**
@@ -126,13 +101,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.sget_object.d.T_sget_object_6
//@uses dot.junit.opcodes.sget_object.TestStubs
- try {
- new T_sget_object_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_object.d.T_sget_object_6", IllegalAccessError.class);
}
/**
@@ -140,11 +110,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_sget_object_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_object.d.T_sget_object_7", NoClassDefFoundError.class);
}
/**
@@ -152,11 +118,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_sget_object_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_object.d.T_sget_object_8", NoSuchFieldError.class);
}
/**
@@ -164,13 +126,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.sget_object.d.T_sget_object_12
//@uses dot.junit.opcodes.sget_object.d.T_sget_object_1
- try {
- new T_sget_object_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_object.d.T_sget_object_12", IllegalAccessError.class);
}
/**
@@ -178,12 +135,7 @@
* @title sget_object shall not work for short fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_14", VerifyError.class);
}
/**
@@ -192,12 +144,7 @@
* @title sget_object shall not work for char fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_15", VerifyError.class);
}
/**
@@ -206,12 +153,7 @@
* @title sget_object shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_16", VerifyError.class);
}
/**
@@ -220,12 +162,7 @@
* @title sget_object shall not work for byte fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_17", VerifyError.class);
}
/**
@@ -234,12 +171,7 @@
* @title sget_object shall not work for boolean fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_18", VerifyError.class);
}
/**
@@ -248,12 +180,7 @@
* @title sget_object shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_19", VerifyError.class);
}
/**
@@ -262,12 +189,7 @@
* @title sget_object shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_object.d.T_sget_object_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_object.d.T_sget_object_20", VerifyError.class);
}
/**
@@ -276,10 +198,6 @@
* @title only field of different type exists)
*/
public void testVFE15() {
- try {
- new T_sget_object_21().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_object.d.T_sget_object_21", NoSuchFieldError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/Test_sget_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/Test_sget_short.java
index b38ef29..fa7c3c4 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/Test_sget_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/Test_sget_short.java
@@ -54,27 +54,16 @@
* @title attempt to access non-static field
*/
public void testE1() {
-
- T_sget_short_5 t = new T_sget_short_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_short.d.T_sget_short_5",
+ IncompatibleClassChangeError.class);
}
/**
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sget_short_9 t = new T_sget_short_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_short.d.T_sget_short_9",
+ ExceptionInInitializerError.class);
}
@@ -84,12 +73,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_4", VerifyError.class);
}
/**
@@ -98,12 +82,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_3", VerifyError.class);
}
/**
@@ -113,11 +92,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_sget_short_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_short.d.T_sget_short_13", NoSuchFieldError.class);
}
/**
@@ -125,13 +100,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.sget_short.d.T_sget_short_6
//@uses dot.junit.opcodes.sget_short.TestStubs
- try {
- new T_sget_short_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_short.d.T_sget_short_6", IllegalAccessError.class);
}
/**
@@ -139,11 +109,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_sget_short_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_short.d.T_sget_short_7", NoClassDefFoundError.class);
}
/**
@@ -151,11 +117,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_sget_short_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_short.d.T_sget_short_8", NoSuchFieldError.class);
}
/**
@@ -163,13 +125,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.sget_short.d.T_sget_short_12
//@uses dot.junit.opcodes.sget_short.d.T_sget_short_1
- try {
- new T_sget_short_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_short.d.T_sget_short_12", IllegalAccessError.class);
}
/**
@@ -177,12 +134,7 @@
* @title sget_short shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_14", VerifyError.class);
}
/**
@@ -191,12 +143,7 @@
* @title sget_short shall not work for char fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_15", VerifyError.class);
}
/**
@@ -205,12 +152,7 @@
* @title sget_short shall not work for int fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_16", VerifyError.class);
}
/**
@@ -219,12 +161,7 @@
* @title sget_short shall not work for byte fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_17", VerifyError.class);
}
/**
@@ -233,12 +170,7 @@
* @title sget_short shall not work for boolean fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_18", VerifyError.class);
}
/**
@@ -247,12 +179,7 @@
* @title sget_short shall not work for double fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_19", VerifyError.class);
}
/**
@@ -261,11 +188,6 @@
* @title sget_short shall not work for long fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_short.d.T_sget_short_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_short.d.T_sget_short_20", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/Test_sget_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/Test_sget_wide.java
index 8ecbeb7..bcf7497 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/Test_sget_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/Test_sget_wide.java
@@ -62,28 +62,16 @@
* @title attempt to access non-static field
*/
public void testE1() {
-
- T_sget_wide_5 t = new T_sget_wide_5();
- try {
- t.run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_wide.d.T_sget_wide_5",
+ IncompatibleClassChangeError.class);
}
/**
* @title initialization of referenced class throws exception
*/
public void testE6() {
-
- T_sget_wide_9 t = new T_sget_wide_9();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sget_wide.d.T_sget_wide_9",
+ ExceptionInInitializerError.class);
}
@@ -93,12 +81,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_4", VerifyError.class);
}
/**
@@ -107,12 +90,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_3", VerifyError.class);
}
/**
@@ -122,11 +100,7 @@
* different type exists
*/
public void testVFE3() {
- try {
- new T_sget_wide_13().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_wide.d.T_sget_wide_13", NoSuchFieldError.class);
}
/**
@@ -134,13 +108,8 @@
* @title Attempt to read inaccessible field.
*/
public void testVFE4() {
- //@uses dot.junit.opcodes.sget_wide.d.T_sget_wide_6
//@uses dot.junit.opcodes.sget_wide.TestStubs
- try {
- new T_sget_wide_6().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_wide.d.T_sget_wide_6", IllegalAccessError.class);
}
/**
@@ -148,11 +117,7 @@
* @title Attempt to read field of undefined class.
*/
public void testVFE5() {
- try {
- new T_sget_wide_7().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_wide.d.T_sget_wide_7", NoClassDefFoundError.class);
}
/**
@@ -160,11 +125,7 @@
* @title Attempt to read undefined field.
*/
public void testVFE6() {
- try {
- new T_sget_wide_8().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_wide.d.T_sget_wide_8", NoSuchFieldError.class);
}
/**
@@ -172,13 +133,8 @@
* @title Attempt to read superclass' private field from subclass.
*/
public void testVFE7() {
- //@uses dot.junit.opcodes.sget_wide.d.T_sget_wide_12
//@uses dot.junit.opcodes.sget_wide.d.T_sget_wide_1
- try {
- new T_sget_wide_12().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sget_wide.d.T_sget_wide_12", IllegalAccessError.class);
}
/**
@@ -186,12 +142,7 @@
* @title sget-wide shall not work for reference fields
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_14", VerifyError.class);
}
/**
@@ -200,12 +151,7 @@
* @title sget-wide shall not work for short fields
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_15");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_15", VerifyError.class);
}
/**
@@ -214,12 +160,7 @@
* @title sget-wide shall not work for boolean fields
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_16");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_16", VerifyError.class);
}
/**
@@ -228,12 +169,7 @@
* @title sget-wide shall not work for char fields
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_17");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_17", VerifyError.class);
}
/**
@@ -242,12 +178,7 @@
* @title sget-wide shall not work for byte fields
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_18", VerifyError.class);
}
/**
@@ -256,12 +187,7 @@
* @title sget-wide shall not work for float fields
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_19");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_19", VerifyError.class);
}
/**
@@ -270,11 +196,6 @@
* @title sget-wide shall not work for int fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sget_wide.d.T_sget_wide_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sget_wide.d.T_sget_wide_20", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/Test_shl_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/Test_shl_int.java
index 55b7cb9..07b0ba9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/Test_shl_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/Test_shl_int.java
@@ -85,12 +85,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int.d.T_shl_int_2", VerifyError.class);
}
@@ -100,12 +95,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int.d.T_shl_int_3", VerifyError.class);
}
/**
@@ -113,12 +103,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int.d.T_shl_int_4", VerifyError.class);
}
/**
@@ -126,12 +111,7 @@
* @title types of arguments - reference & int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int.d.T_shl_int_5", VerifyError.class);
}
/**
@@ -140,12 +120,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shl_int.d.T_shl_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int.d.T_shl_int_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/Test_shl_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/Test_shl_int_2addr.java
index f44959a..ff46973 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/Test_shl_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/Test_shl_int_2addr.java
@@ -85,12 +85,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_2", VerifyError.class);
}
@@ -100,12 +95,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_3", VerifyError.class);
}
/**
@@ -113,12 +103,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_4", VerifyError.class);
}
/**
@@ -126,12 +111,7 @@
* @title types of arguments - reference & int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_5", VerifyError.class);
}
/**
@@ -140,12 +120,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_2addr.d.T_shl_int_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/Test_shl_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/Test_shl_int_lit8.java
index 47e10bb..5cfcdc8 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/Test_shl_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/Test_shl_int_lit8.java
@@ -90,12 +90,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_7", VerifyError.class);
}
@@ -105,12 +100,7 @@
* @title types of arguments - double & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_8", VerifyError.class);
}
/**
@@ -118,12 +108,7 @@
* @title types of arguments - long & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_9", VerifyError.class);
}
/**
@@ -131,12 +116,7 @@
* @title types of arguments - reference & int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_10", VerifyError.class);
}
/**
@@ -145,11 +125,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_int_lit8.d.T_shl_int_lit8_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/Test_shl_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/Test_shl_long.java
index 7e29009..d51b29b 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/Test_shl_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/Test_shl_long.java
@@ -86,12 +86,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long.d.T_shl_long_2", VerifyError.class);
}
@@ -101,12 +96,7 @@
* @title types of arguments - long & double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long.d.T_shl_long_3", VerifyError.class);
}
/**
@@ -114,12 +104,7 @@
* @title types of arguments - int & int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long.d.T_shl_long_4", VerifyError.class);
}
/**
@@ -127,12 +112,7 @@
* @title types of arguments - float & int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long.d.T_shl_long_5", VerifyError.class);
}
/**
@@ -140,12 +120,7 @@
* @title types of arguments - reference & int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long.d.T_shl_long_6", VerifyError.class);
}
/**
@@ -154,12 +129,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.shl_long.d.T_shl_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long.d.T_shl_long_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/Test_shl_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/Test_shl_long_2addr.java
index 0dbe218..b065c35 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/Test_shl_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/Test_shl_long_2addr.java
@@ -86,12 +86,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_2", VerifyError.class);
}
@@ -101,12 +96,7 @@
* @title types of arguments - long, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_3", VerifyError.class);
}
/**
@@ -114,12 +104,7 @@
* @title types of arguments - int, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_4", VerifyError.class);
}
/**
@@ -127,12 +112,7 @@
* @title types of arguments - float, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_5", VerifyError.class);
}
/**
@@ -140,12 +120,7 @@
* @title types of arguments - reference, int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_6", VerifyError.class);
}
/**
@@ -154,12 +129,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shl_long_2addr.d.T_shl_long_2addr_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/Test_shr_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/Test_shr_int.java
index f7f1ae8..1f056e3 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/Test_shr_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/Test_shr_int.java
@@ -86,12 +86,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int.d.T_shr_int_2", VerifyError.class);
}
@@ -101,12 +96,7 @@
* @title types of arguments - double, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int.d.T_shr_int_3", VerifyError.class);
}
/**
@@ -114,12 +104,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int.d.T_shr_int_4", VerifyError.class);
}
/**
@@ -127,12 +112,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int.d.T_shr_int_5", VerifyError.class);
}
/**
@@ -141,12 +121,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shr_int.d.T_shr_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int.d.T_shr_int_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/Test_shr_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/Test_shr_int_2addr.java
index 5b31961..2ace377 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/Test_shr_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/Test_shr_int_2addr.java
@@ -86,12 +86,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_2", VerifyError.class);
}
@@ -101,12 +96,7 @@
* @title types of arguments - double, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_3", VerifyError.class);
}
/**
@@ -114,12 +104,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_4", VerifyError.class);
}
/**
@@ -127,12 +112,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_5", VerifyError.class);
}
/**
@@ -141,12 +121,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_2addr.d.T_shr_int_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/Test_shr_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/Test_shr_int_lit8.java
index 3c86bbb..cb90cbe 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/Test_shr_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/Test_shr_int_lit8.java
@@ -89,12 +89,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_7", VerifyError.class);
}
@@ -104,12 +99,7 @@
* @title types of arguments - double, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_8", VerifyError.class);
}
/**
@@ -117,12 +107,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_9", VerifyError.class);
}
/**
@@ -130,12 +115,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_10", VerifyError.class);
}
/**
@@ -144,11 +124,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_int_lit8.d.T_shr_int_lit8_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/Test_shr_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/Test_shr_long.java
index 42afd24..b6c5fc3 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/Test_shr_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/Test_shr_long.java
@@ -86,12 +86,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long.d.T_shr_long_2", VerifyError.class);
}
@@ -101,12 +96,7 @@
* @title types of arguments - long, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long.d.T_shr_long_3", VerifyError.class);
}
/**
@@ -114,12 +104,7 @@
* @title types of arguments - int, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long.d.T_shr_long_4", VerifyError.class);
}
/**
@@ -127,12 +112,7 @@
* @title types of arguments - float, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long.d.T_shr_long_5", VerifyError.class);
}
/**
@@ -140,12 +120,7 @@
* @title types of arguments - reference, int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long.d.T_shr_long_6", VerifyError.class);
}
/**
@@ -154,11 +129,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.shr_long.d.T_shr_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long.d.T_shr_long_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/Test_shr_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/Test_shr_long_2addr.java
index bb3c2ad..74548cf 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/Test_shr_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/Test_shr_long_2addr.java
@@ -86,12 +86,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_2", VerifyError.class);
}
@@ -101,12 +96,7 @@
* @title types of arguments - long, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_3", VerifyError.class);
}
/**
@@ -114,12 +104,7 @@
* @title types of arguments - int, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_4", VerifyError.class);
}
/**
@@ -127,12 +112,7 @@
* @title types of arguments - float, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_5", VerifyError.class);
}
/**
@@ -140,12 +120,7 @@
* @title types of arguments - reference, int
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_6", VerifyError.class);
}
/**
@@ -154,12 +129,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.shr_long_2addr.d.T_shr_long_2addr_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sparse_switch/Test_sparse_switch.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sparse_switch/Test_sparse_switch.java
index 7579dae..6ed7986 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sparse_switch/Test_sparse_switch.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sparse_switch/Test_sparse_switch.java
@@ -69,12 +69,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_3", VerifyError.class);
}
@@ -84,12 +79,7 @@
* @title type of argument - double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_4", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title type of argument - long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_5", VerifyError.class);
}
/**
@@ -110,12 +95,7 @@
* @title type of argument - reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_6", VerifyError.class);
}
/**
@@ -123,12 +103,7 @@
* @title branch target shall be inside the method
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_7", VerifyError.class);
}
/**
@@ -136,12 +111,7 @@
* @title branch target shall not be "inside" instruction
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_8", VerifyError.class);
}
/**
@@ -149,12 +119,7 @@
* @title offset to table shall be inside method
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_9");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_9", VerifyError.class);
}
/**
@@ -163,12 +128,7 @@
* and floats are not used interchangeably.
*/
public void testVFE8() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_2", VerifyError.class);
}
/**
@@ -176,12 +136,7 @@
* @title pairs shall be sorted in ascending order
*/
public void testVFE9() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_11", VerifyError.class);
}
/**
@@ -189,12 +144,7 @@
* @title number of entries in jump table
*/
public void testVFE10() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_12", VerifyError.class);
}
/**
@@ -202,12 +152,7 @@
* @title sparse-switch-data pseudo-instructions must not be reachable by control flow
*/
public void testVFE11() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_13", VerifyError.class);
}
/**
@@ -215,11 +160,6 @@
* @title table has wrong ident code
*/
public void testVFE12() {
- try {
- Class.forName("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sparse_switch.d.T_sparse_switch_14", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/Test_sput.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/Test_sput.java
index 0c432f3..7f27ae9 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/Test_sput.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/Test_sput.java
@@ -84,13 +84,7 @@
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sput_13 t = new T_sput_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sput.d.T_sput_13", ExceptionInInitializerError.class);
}
/**
@@ -98,12 +92,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_3", VerifyError.class);
}
/**
@@ -112,12 +101,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_4", VerifyError.class);
}
@@ -128,11 +112,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_sput_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput.d.T_sput_17", NoSuchFieldError.class);
}
/**
@@ -141,12 +121,7 @@
* and floats are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_5", VerifyError.class);
}
/**
@@ -156,12 +131,7 @@
* with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_18", VerifyError.class);
}
/**
@@ -170,11 +140,7 @@
* @title Attempt to set non-static field.
*/
public void testVFE8() {
- try {
- new T_sput_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput.d.T_sput_7", IncompatibleClassChangeError.class);
}
/**
@@ -183,12 +149,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.sput.TestStubs
- //@uses dot.junit.opcodes.sput.d.T_sput_8
- try {
- new T_sput_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput.d.T_sput_8", IllegalAccessError.class);
}
/**
@@ -196,11 +157,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_sput_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput.d.T_sput_9", NoClassDefFoundError.class);
}
/**
@@ -208,11 +165,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_sput_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput.d.T_sput_10", NoSuchFieldError.class);
}
@@ -223,12 +176,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.sput.d.T_sput_1
- //@uses dot.junit.opcodes.sput.d.T_sput_15
- try {
- new T_sput_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput.d.T_sput_15", IllegalAccessError.class);
}
@@ -237,12 +185,7 @@
* @title sput shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_2", VerifyError.class);
}
/**
@@ -251,12 +194,7 @@
* @title sput shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_20", VerifyError.class);
}
/**
@@ -265,12 +203,7 @@
* @title sput shall not work for short fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_21", VerifyError.class);
}
/**
@@ -279,12 +212,7 @@
* @title sput shall not work for boolean fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_22", VerifyError.class);
}
/**
@@ -293,12 +221,7 @@
* @title sput shall not work for char fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_23", VerifyError.class);
}
/**
@@ -307,12 +230,7 @@
* @title sput shall not work for byte fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput.d.T_sput_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput.d.T_sput_24", VerifyError.class);
}
/**
@@ -321,12 +239,7 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.sput.TestStubs
- //@uses dot.junit.opcodes.sput.d.T_sput_11
- try {
- new T_sput_11().run();
- fail("expected a verification exception");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput.d.T_sput_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java
index 1b8d96c..aae04aa 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/Test_sput_boolean.java
@@ -71,13 +71,8 @@
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sput_boolean_13 t = new T_sput_boolean_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_13",
+ ExceptionInInitializerError.class);
}
/**
@@ -85,12 +80,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_3", VerifyError.class);
}
/**
@@ -99,12 +89,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_4", VerifyError.class);
}
@@ -115,11 +100,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_sput_boolean_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_17", NoSuchFieldError.class);
}
/**
@@ -129,12 +110,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_18", VerifyError.class);
}
/**
@@ -143,11 +119,8 @@
* @title Attempt to set non-static field.
*/
public void testVFE8() {
- try {
- new T_sput_boolean_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -156,12 +129,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.sput_boolean.TestStubs
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_8
- try {
- new T_sput_boolean_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_8", IllegalAccessError.class);
}
/**
@@ -169,11 +137,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_sput_boolean_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_9", NoClassDefFoundError.class);
}
/**
@@ -181,11 +145,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_sput_boolean_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_10", NoSuchFieldError.class);
}
@@ -196,12 +156,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_1
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_15
- try {
- new T_sput_boolean_15().run();
- fail("expected a verification exception");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_15", IllegalAccessError.class);
}
@@ -210,12 +165,7 @@
* @title sput_boolean shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_2", VerifyError.class);
}
/**
@@ -224,12 +174,7 @@
* @title sput_boolean shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_20", VerifyError.class);
}
/**
@@ -238,12 +183,7 @@
* @title sput_boolean shall not work for short fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_21", VerifyError.class);
}
/**
@@ -252,12 +192,7 @@
* @title sput_boolean shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_22", VerifyError.class);
}
/**
@@ -266,12 +201,7 @@
* @title sput_boolean shall not work for char fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_23", VerifyError.class);
}
/**
@@ -280,12 +210,7 @@
* @title sput_boolean shall not work for byte fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_24", VerifyError.class);
}
/**
@@ -294,12 +219,6 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.sput_boolean.TestStubs
- //@uses dot.junit.opcodes.sput_boolean.d.T_sput_boolean_11
-
- try {
- new T_sput_boolean_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_boolean.d.T_sput_boolean_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java
index 5ac828d..6791589 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/Test_sput_byte.java
@@ -69,13 +69,8 @@
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sput_byte_13 t = new T_sput_byte_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sput_byte.d.T_sput_byte_13",
+ ExceptionInInitializerError.class);
}
/**
@@ -83,12 +78,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_3", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_4", VerifyError.class);
}
@@ -113,11 +98,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_sput_byte_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_byte.d.T_sput_byte_17", NoSuchFieldError.class);
}
/**
@@ -127,12 +108,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_18", VerifyError.class);
}
/**
@@ -141,11 +117,8 @@
* @title Attempt to set non-static field.
*/
public void testVFE8() {
- try {
- new T_sput_byte_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_byte.d.T_sput_byte_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -154,12 +127,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.sput_byte.TestStubs
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_8
- try {
- new T_sput_byte_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_byte.d.T_sput_byte_8", IllegalAccessError.class);
}
/**
@@ -167,11 +135,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_sput_byte_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_byte.d.T_sput_byte_9", NoClassDefFoundError.class);
}
/**
@@ -179,11 +143,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_sput_byte_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_byte.d.T_sput_byte_10", NoSuchFieldError.class);
}
@@ -194,12 +154,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_1
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_15
- try {
- new T_sput_byte_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_byte.d.T_sput_byte_15", IllegalAccessError.class);
}
@@ -208,12 +163,7 @@
* @title sput-byte shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_2", VerifyError.class);
}
/**
@@ -222,12 +172,7 @@
* @title sput-byte shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_20", VerifyError.class);
}
/**
@@ -236,12 +181,7 @@
* @title sput-byte shall not work for short fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_21", VerifyError.class);
}
/**
@@ -250,12 +190,7 @@
* @title sput-byte shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_22", VerifyError.class);
}
/**
@@ -264,12 +199,7 @@
* @title sput-byte shall not work for char fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_23", VerifyError.class);
}
/**
@@ -277,12 +207,7 @@
* @title sput-byte shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_byte.d.T_sput_byte_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_byte.d.T_sput_byte_24", VerifyError.class);
}
/**
@@ -291,12 +216,7 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.sput_byte.TestStubs
- //@uses dot.junit.opcodes.sput_byte.d.T_sput_byte_11
- try {
- new T_sput_byte_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_byte.d.T_sput_byte_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/Test_sput_char.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/Test_sput_char.java
index 8585365..a525c7e 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/Test_sput_char.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/Test_sput_char.java
@@ -69,13 +69,8 @@
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sput_char_13 t = new T_sput_char_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sput_char.d.T_sput_char_13",
+ ExceptionInInitializerError.class);
}
/**
@@ -83,12 +78,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_3", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_4", VerifyError.class);
}
@@ -113,11 +98,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_sput_char_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_char.d.T_sput_char_17", NoSuchFieldError.class);
}
/**
@@ -127,12 +108,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_18", VerifyError.class);
}
/**
@@ -141,11 +117,8 @@
* @title Attempt to set non-static field.
*/
public void testVFE8() {
- try {
- new T_sput_char_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_char.d.T_sput_char_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -154,12 +127,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.sput_char.TestStubs
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_8
- try {
- new T_sput_char_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_char.d.T_sput_char_8", IllegalAccessError.class);
}
/**
@@ -167,11 +135,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_sput_char_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_char.d.T_sput_char_9", NoClassDefFoundError.class);
}
/**
@@ -179,11 +143,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_sput_char_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_char.d.T_sput_char_10", NoSuchFieldError.class);
}
@@ -194,12 +154,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.sput_char.d.T_sput_char_1
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_15
- try {
- new T_sput_char_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_char.d.T_sput_char_15", IllegalAccessError.class);
}
@@ -208,12 +163,7 @@
* @title sput-char shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_2", VerifyError.class);
}
/**
@@ -222,12 +172,7 @@
* @title sput-char shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_20", VerifyError.class);
}
/**
@@ -236,12 +181,7 @@
* @title sput-char shall not work for short fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_21", VerifyError.class);
}
/**
@@ -250,12 +190,7 @@
* @title sput-char shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_22", VerifyError.class);
}
/**
@@ -264,12 +199,7 @@
* @title sput-char shall not work for byte fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_23", VerifyError.class);
}
/**
@@ -278,12 +208,7 @@
* @title sput-char shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_char.d.T_sput_char_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_char.d.T_sput_char_24", VerifyError.class);
}
/**
@@ -292,11 +217,6 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.sput_char.TestStubs
- //@uses dot.junit.opcodes.sput_char.d.T_sput_char_11
- try {
- new T_sput_char_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_char.d.T_sput_char_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/Test_sput_object.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/Test_sput_object.java
index cd070a7..8d52f7f 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/Test_sput_object.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/Test_sput_object.java
@@ -69,13 +69,8 @@
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sput_object_13 t = new T_sput_object_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sput_object.d.T_sput_object_13",
+ ExceptionInInitializerError.class);
}
/**
@@ -83,12 +78,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_3", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_4", VerifyError.class);
}
@@ -113,11 +98,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_sput_object_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_object.d.T_sput_object_17", NoSuchFieldError.class);
}
@@ -128,12 +109,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_18", VerifyError.class);
}
/**
@@ -142,12 +118,9 @@
* @title Attempt to set non-static field.
*/
public void testVFE8() {
- try {
- new T_sput_object_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
- }
+ loadAndRun("dot.junit.opcodes.sput_object.d.T_sput_object_7",
+ IncompatibleClassChangeError.class);
+ }
/**
* @constraint n/a
@@ -155,12 +128,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.sput_object.TestStubs
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_8
- try {
- new T_sput_object_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_object.d.T_sput_object_8", IllegalAccessError.class);
}
/**
@@ -168,11 +136,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_sput_object_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_object.d.T_sput_object_9", NoClassDefFoundError.class);
}
/**
@@ -180,11 +144,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_sput_object_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_object.d.T_sput_object_10", NoSuchFieldError.class);
}
@@ -195,12 +155,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.sput_object.d.T_sput_object_1
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_15
- try {
- new T_sput_object_15().run();
- fail("expected a verification exception");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_object.d.T_sput_object_15", IllegalAccessError.class);
}
@@ -209,12 +164,7 @@
* @title sput-object shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_2", VerifyError.class);
}
/**
@@ -223,12 +173,7 @@
* @title assignment incompatible references
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_20", VerifyError.class);
}
/**
@@ -237,12 +182,7 @@
* @title sput-object shall not work for char fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_21", VerifyError.class);
}
/**
@@ -251,12 +191,7 @@
* @title sput-object shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_22", VerifyError.class);
}
/**
@@ -265,12 +200,7 @@
* @title sput-object shall not work for byte fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_23", VerifyError.class);
}
/**
@@ -279,12 +209,7 @@
* @title sput-object shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_24", VerifyError.class);
}
/**
@@ -293,12 +218,7 @@
* @title sput-object shall not work for short fields
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_object.d.T_sput_object_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_object.d.T_sput_object_6", VerifyError.class);
}
@@ -308,11 +228,6 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.sput_object.TestStubs
- //@uses dot.junit.opcodes.sput_object.d.T_sput_object_11
- try {
- new T_sput_object_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_object.d.T_sput_object_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/Test_sput_short.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/Test_sput_short.java
index 5fcbe58..b6ec230 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/Test_sput_short.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/Test_sput_short.java
@@ -69,13 +69,8 @@
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sput_short_13 t = new T_sput_short_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sput_short.d.T_sput_short_13",
+ ExceptionInInitializerError.class);
}
/**
@@ -83,12 +78,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_3", VerifyError.class);
}
/**
@@ -97,12 +87,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_4", VerifyError.class);
}
@@ -113,11 +98,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_sput_short_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_short.d.T_sput_short_17", NoSuchFieldError.class);
}
/**
@@ -127,12 +108,7 @@
* field with single-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_18", VerifyError.class);
}
/**
@@ -141,11 +117,8 @@
* @title Attempt to set non-static field.
*/
public void testVFE8() {
- try {
- new T_sput_short_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_short.d.T_sput_short_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -154,12 +127,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.sput_short.TestStubs
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_8
- try {
- new T_sput_short_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_short.d.T_sput_short_8", IllegalAccessError.class);
}
/**
@@ -167,11 +135,7 @@
* @title Attempt to modify field of undefined class.
*/
public void testVFE10() {
- try {
- new T_sput_short_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_short.d.T_sput_short_9", NoClassDefFoundError.class);
}
/**
@@ -179,11 +143,7 @@
* @title Attempt to modify undefined field.
*/
public void testVFE11() {
- try {
- new T_sput_short_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_short.d.T_sput_short_10", NoSuchFieldError.class);
}
@@ -194,12 +154,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.sput_short.d.T_sput_short_1
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_15
- try {
- new T_sput_short_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_short.d.T_sput_short_15", IllegalAccessError.class);
}
@@ -208,12 +163,7 @@
* @title sput-short shall not work for wide numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_2", VerifyError.class);
}
/**
@@ -222,12 +172,7 @@
* @title sput-short shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_20", VerifyError.class);
}
/**
@@ -236,12 +181,7 @@
* @title sput-short shall not work for char fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_21", VerifyError.class);
}
/**
@@ -250,12 +190,7 @@
* @title sput-short shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_22", VerifyError.class);
}
/**
@@ -264,12 +199,7 @@
* @title sput-short shall not work for byte fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_23", VerifyError.class);
}
/**
@@ -278,12 +208,7 @@
* @title sput-short shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_short.d.T_sput_short_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_short.d.T_sput_short_24", VerifyError.class);
}
/**
@@ -292,11 +217,6 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.sput_short.TestStubs
- //@uses dot.junit.opcodes.sput_short.d.T_sput_short_11
- try {
- new T_sput_short_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_short.d.T_sput_short_11", IllegalAccessError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/Test_sput_wide.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/Test_sput_wide.java
index 29ff21b..d015912 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/Test_sput_wide.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/Test_sput_wide.java
@@ -79,13 +79,8 @@
* @title initialization of referenced class throws exception
*/
public void testE6() {
- T_sput_wide_13 t = new T_sput_wide_13();
- try {
- t.run();
- fail("expected Error");
- } catch (Error e) {
- // expected
- }
+ loadAndRun("dot.junit.opcodes.sput_wide.d.T_sput_wide_13",
+ ExceptionInInitializerError.class);
}
/**
@@ -93,12 +88,7 @@
* @title constant pool index
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_3", VerifyError.class);
}
/**
@@ -107,12 +97,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_4", VerifyError.class);
}
@@ -123,11 +108,7 @@
* different type exists
*/
public void testVFE5() {
- try {
- new T_sput_wide_17().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_wide.d.T_sput_wide_17", NoSuchFieldError.class);
}
@@ -139,12 +120,7 @@
* field with double-width register
*/
public void testVFE7() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_18");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_18", VerifyError.class);
}
/**
@@ -154,11 +130,8 @@
* executing the code.
*/
public void testVFE8() {
- try {
- new T_sput_wide_7().run();
- fail("expected IncompatibleClassChangeError");
- } catch (IncompatibleClassChangeError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_wide.d.T_sput_wide_7",
+ IncompatibleClassChangeError.class);
}
/**
@@ -168,12 +141,7 @@
*/
public void testVFE9() {
//@uses dot.junit.opcodes.sput_wide.TestStubs
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_8
- try {
- new T_sput_wide_8().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_wide.d.T_sput_wide_8", IllegalAccessError.class);
}
/**
@@ -182,12 +150,7 @@
* executing the code.
*/
public void testVFE10() {
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_9
- try {
- new T_sput_wide_9().run();
- fail("expected NoClassDefFoundError");
- } catch (NoClassDefFoundError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_wide.d.T_sput_wide_9", NoClassDefFoundError.class);
}
/**
@@ -196,12 +159,7 @@
* code.
*/
public void testVFE11() {
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_10
- try {
- new T_sput_wide_10().run();
- fail("expected NoSuchFieldError");
- } catch (NoSuchFieldError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_wide.d.T_sput_wide_10", NoSuchFieldError.class);
}
@@ -213,13 +171,7 @@
*/
public void testVFE12() {
//@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_1
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_15
- try {
- new T_sput_wide_15().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- DxUtil.checkVerifyException(t);
- }
+ loadAndRun("dot.junit.opcodes.sput_wide.d.T_sput_wide_15", IllegalAccessError.class);
}
@@ -228,12 +180,7 @@
* @title sput-wide shall not work for single-width numbers
*/
public void testVFE13() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_2", VerifyError.class);
}
/**
@@ -242,12 +189,7 @@
* @title sput-wide shall not work for reference fields
*/
public void testVFE14() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_20");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_20", VerifyError.class);
}
/**
@@ -256,12 +198,7 @@
* @title sput-wide shall not work for char fields
*/
public void testVFE15() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_21");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_21", VerifyError.class);
}
/**
@@ -270,12 +207,7 @@
* @title sput-wide shall not work for int fields
*/
public void testVFE16() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_22");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_22", VerifyError.class);
}
/**
@@ -284,12 +216,7 @@
* @title sput-wide shall not work for byte fields
*/
public void testVFE17() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_23");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_23", VerifyError.class);
}
/**
@@ -298,12 +225,7 @@
* @title sput-wide shall not work for boolean fields
*/
public void testVFE18() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_24");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_24", VerifyError.class);
}
/**
@@ -312,12 +234,7 @@
* @title sput-wide shall not work for short fields
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.sput_wide.d.T_sput_wide_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sput_wide.d.T_sput_wide_6", VerifyError.class);
}
/**
@@ -326,12 +243,7 @@
*/
public void testVFE19() {
//@uses dot.junit.opcodes.sput_wide.TestStubs
- //@uses dot.junit.opcodes.sput_wide.d.T_sput_wide_11
- try {
- new T_sput_wide_11().run();
- fail("expected IllegalAccessError");
- } catch (IllegalAccessError t) {
- }
+ loadAndRun("dot.junit.opcodes.sput_wide.d.T_sput_wide_11", IllegalAccessError.class);
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.d b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.d
index a130809..ae7d1df 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.d
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_13.d
@@ -25,7 +25,8 @@
const/4 v1, 5
div-int/2addr v1, v0
- sput-wide v1, dot.junit.opcodes.sput_wide.d.JtubInitError.value J
+ int-to-long v0, v0
+ sput-wide v0, dot.junit.opcodes.sput_wide.d.JtubInitError.value J
return-void
.end method
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/Test_sub_double.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/Test_sub_double.java
index 78bd961..36996cb 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/Test_sub_double.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/Test_sub_double.java
@@ -140,12 +140,7 @@
* @title types of arguments - float, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double.d.T_sub_double_2", VerifyError.class);
}
/**
@@ -153,12 +148,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double.d.T_sub_double_5", VerifyError.class);
}
/**
@@ -166,12 +156,7 @@
* @title types of arguments - double, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double.d.T_sub_double_4", VerifyError.class);
}
/**
@@ -179,12 +164,7 @@
* @title types of arguments - int, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double.d.T_sub_double_6", VerifyError.class);
}
/**
@@ -193,12 +173,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_double.d.T_sub_double_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double.d.T_sub_double_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/Test_sub_double_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/Test_sub_double_2addr.java
index 058a3ac..3369e31 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/Test_sub_double_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/Test_sub_double_2addr.java
@@ -139,12 +139,7 @@
* @title types of arguments - float, double
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_2", VerifyError.class);
}
/**
@@ -152,12 +147,7 @@
* @title number of registers
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_5", VerifyError.class);
}
/**
@@ -165,12 +155,7 @@
* @title types of arguments - double, reference
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_4", VerifyError.class);
}
/**
@@ -178,12 +163,7 @@
* @title types of arguments - int, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_6", VerifyError.class);
}
/**
@@ -192,12 +172,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_double_2addr.d.T_sub_double_2addr_3", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/Test_sub_float.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/Test_sub_float.java
index 0b30a66..44d33e4 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/Test_sub_float.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/Test_sub_float.java
@@ -151,12 +151,7 @@
* and floats are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float.d.T_sub_float_5", VerifyError.class);
}
/**
@@ -164,12 +159,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float.d.T_sub_float_2", VerifyError.class);
}
/**
@@ -177,12 +167,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float.d.T_sub_float_3", VerifyError.class);
}
/**
@@ -190,12 +175,7 @@
* @title types of arguments - reference, float
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float.d.T_sub_float_4", VerifyError.class);
}
/**
@@ -203,12 +183,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_float.d.T_sub_float_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float.d.T_sub_float_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/Test_sub_float_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/Test_sub_float_2addr.java
index 36c7408..5ae37cd 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/Test_sub_float_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/Test_sub_float_2addr.java
@@ -149,12 +149,7 @@
* and floats are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_5", VerifyError.class);
}
/**
@@ -162,12 +157,7 @@
* @title types of arguments - float, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_2", VerifyError.class);
}
/**
@@ -175,12 +165,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_3", VerifyError.class);
}
/**
@@ -188,12 +173,7 @@
* @title types of arguments - reference, float
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_4", VerifyError.class);
}
/**
@@ -201,12 +181,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_float_2addr.d.T_sub_float_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/Test_sub_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/Test_sub_int.java
index 3b7ef07..ae00539 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/Test_sub_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/Test_sub_int.java
@@ -135,12 +135,7 @@
* and floats are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int.d.T_sub_int_5", VerifyError.class);
}
/**
@@ -148,12 +143,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int.d.T_sub_int_2", VerifyError.class);
}
/**
@@ -161,12 +151,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int.d.T_sub_int_3", VerifyError.class);
}
/**
@@ -174,12 +159,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int.d.T_sub_int_4", VerifyError.class);
}
/**
@@ -187,12 +167,7 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_int.d.T_sub_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int.d.T_sub_int_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/Test_sub_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/Test_sub_int_2addr.java
index 0ec67f4..275c7ec 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/Test_sub_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/Test_sub_int_2addr.java
@@ -134,12 +134,7 @@
* and floats are not used interchangeably.
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_5", VerifyError.class);
}
/**
@@ -147,12 +142,7 @@
* @title types of arguments - int, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_2", VerifyError.class);
}
/**
@@ -160,12 +150,7 @@
* @title types of arguments - long, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_3", VerifyError.class);
}
/**
@@ -173,12 +158,7 @@
* @title types of arguments - reference, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_4", VerifyError.class);
}
/**
@@ -186,11 +166,6 @@
* @title number of registers
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_int_2addr.d.T_sub_int_2addr_6", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/Test_sub_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/Test_sub_long.java
index 77f30d6..f306375 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/Test_sub_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/Test_sub_long.java
@@ -102,12 +102,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long.d.T_sub_long_6", VerifyError.class);
}
/**
@@ -115,12 +110,7 @@
* @title types of arguments - int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long.d.T_sub_long_3", VerifyError.class);
}
/**
@@ -128,12 +118,7 @@
* @title types of arguments - long, float
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long.d.T_sub_long_4", VerifyError.class);
}
/**
@@ -141,12 +126,7 @@
* @title types of arguments - long, reference
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long.d.T_sub_long_5", VerifyError.class);
}
/**
@@ -155,12 +135,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_long.d.T_sub_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long.d.T_sub_long_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/Test_sub_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/Test_sub_long_2addr.java
index 1f2161d..2a784e1 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/Test_sub_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/Test_sub_long_2addr.java
@@ -102,12 +102,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_6", VerifyError.class);
}
/**
@@ -116,12 +111,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_2", VerifyError.class);
}
/**
@@ -129,12 +119,7 @@
* @title types of arguments - int, long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_3", VerifyError.class);
}
/**
@@ -142,12 +127,7 @@
* @title types of arguments - long, float
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_4", VerifyError.class);
}
/**
@@ -155,11 +135,6 @@
* @title types of arguments - long, reference
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.sub_long_2addr.d.T_sub_long_2addr_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/Test_ushr_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/Test_ushr_int.java
index 09f2948..763e1c5 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/Test_ushr_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/Test_ushr_int.java
@@ -102,12 +102,7 @@
* @title types of arguments - double, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int.d.T_ushr_int_2", VerifyError.class);
}
/**
@@ -115,12 +110,7 @@
* @title types of arguments - int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int.d.T_ushr_int_3", VerifyError.class);
}
/**
@@ -128,12 +118,7 @@
* @title types of arguments - reference, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int.d.T_ushr_int_4", VerifyError.class);
}
/**
@@ -141,12 +126,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int.d.T_ushr_int_6", VerifyError.class);
}
/**
@@ -155,12 +135,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int.d.T_ushr_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int.d.T_ushr_int_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/Test_ushr_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/Test_ushr_int_2addr.java
index fadd00c..ff00a78 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/Test_ushr_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/Test_ushr_int_2addr.java
@@ -102,12 +102,7 @@
* @title types of arguments - double, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_2", VerifyError.class);
}
/**
@@ -115,12 +110,7 @@
* @title types of arguments - int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_3", VerifyError.class);
}
/**
@@ -128,12 +118,7 @@
* @title types of arguments - reference, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_4", VerifyError.class);
}
/**
@@ -141,12 +126,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_6", VerifyError.class);
}
/**
@@ -155,11 +135,6 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_2addr.d.T_ushr_int_2addr_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/Test_ushr_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/Test_ushr_int_lit8.java
index 7739b3e..420acbc 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/Test_ushr_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/Test_ushr_int_lit8.java
@@ -111,12 +111,7 @@
* @title types of arguments - double, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_10");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_10", VerifyError.class);
}
/**
@@ -124,12 +119,7 @@
* @title types of arguments - long, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_11");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_11", VerifyError.class);
}
/**
@@ -137,12 +127,7 @@
* @title types of arguments - reference, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_12");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_12", VerifyError.class);
}
/**
@@ -150,12 +135,7 @@
* @title number of registers
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_14");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_14", VerifyError.class);
}
/**
@@ -164,12 +144,7 @@
* and floats are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_13");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_int_lit8.d.T_ushr_int_lit8_13", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/Test_ushr_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/Test_ushr_long.java
index d8541dd..6b4e4d2 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/Test_ushr_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/Test_ushr_long.java
@@ -107,12 +107,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long.d.T_ushr_long_6", VerifyError.class);
}
@@ -122,12 +117,7 @@
* @title types of arguments - long, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long.d.T_ushr_long_7", VerifyError.class);
}
/**
@@ -135,12 +125,7 @@
* @title types of arguments - int, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long.d.T_ushr_long_3", VerifyError.class);
}
/**
@@ -148,12 +133,7 @@
* @title types of arguments - float, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long.d.T_ushr_long_4", VerifyError.class);
}
/**
@@ -161,12 +141,7 @@
* @title types of arguments - long, reference
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long.d.T_ushr_long_5", VerifyError.class);
}
/**
@@ -175,12 +150,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long.d.T_ushr_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long.d.T_ushr_long_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/Test_ushr_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/Test_ushr_long_2addr.java
index 09e0880..99501f4 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/Test_ushr_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/Test_ushr_long_2addr.java
@@ -108,12 +108,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_6", VerifyError.class);
}
@@ -123,12 +118,7 @@
* @title types of arguments - long, double
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_7", VerifyError.class);
}
/**
@@ -136,12 +126,7 @@
* @title types of arguments - int, int
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_3", VerifyError.class);
}
/**
@@ -149,12 +134,7 @@
* @title types of arguments - float, int
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_4", VerifyError.class);
}
/**
@@ -162,12 +142,7 @@
* @title types of arguments - long, reference
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_5", VerifyError.class);
}
/**
@@ -176,12 +151,7 @@
* and doubles are not used interchangeably.
*/
public void testVFE6() {
- try {
- Class.forName("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.ushr_long_2addr.d.T_ushr_long_2addr_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/Test_xor_int.java b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/Test_xor_int.java
index 2f2197f..4081a96 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/Test_xor_int.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/Test_xor_int.java
@@ -69,12 +69,7 @@
* @title types of arguments - long, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_int.d.T_xor_int_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int.d.T_xor_int_2", VerifyError.class);
}
/**
@@ -82,12 +77,7 @@
* @title types of arguments - reference, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_int.d.T_xor_int_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int.d.T_xor_int_3", VerifyError.class);
}
@@ -96,12 +86,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_int.d.T_xor_int_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int.d.T_xor_int_6", VerifyError.class);
}
/**
@@ -110,11 +95,6 @@
* and floats are not used interchangeably.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.xor_int.d.T_xor_int_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int.d.T_xor_int_5", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/Test_xor_int_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/Test_xor_int_2addr.java
index 0ee2ca7..dbac319 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/Test_xor_int_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/Test_xor_int_2addr.java
@@ -69,12 +69,7 @@
* @title types of arguments - long, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_2", VerifyError.class);
}
/**
@@ -82,12 +77,7 @@
* @title types of arguments - reference, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_3", VerifyError.class);
}
/**
@@ -95,12 +85,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_5", VerifyError.class);
}
/**
@@ -109,11 +94,6 @@
* and floats are not used interchangeably.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_2addr.d.T_xor_int_2addr_4", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/Test_xor_int_lit16.java b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/Test_xor_int_lit16.java
index 383f82f..4a3c635 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/Test_xor_int_lit16.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/Test_xor_int_lit16.java
@@ -65,12 +65,7 @@
* @title types of arguments - long & int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_5", VerifyError.class);
}
/**
@@ -78,12 +73,7 @@
* @title types of arguments - reference & int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_6", VerifyError.class);
}
/**
@@ -91,12 +81,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_8", VerifyError.class);
}
/**
@@ -105,11 +90,6 @@
* and floats are not used interchangeably.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_lit16.d.T_xor_int_lit16_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/Test_xor_int_lit8.java b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/Test_xor_int_lit8.java
index a87103b..770ffa8 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/Test_xor_int_lit8.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/Test_xor_int_lit8.java
@@ -64,12 +64,7 @@
* @title types of arguments - long, int
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_5", VerifyError.class);
}
/**
@@ -77,12 +72,7 @@
* @title types of arguments - reference, int
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_6", VerifyError.class);
}
/**
@@ -90,12 +80,7 @@
* @title number of registers
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_8");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_8", VerifyError.class);
}
/**
@@ -104,11 +89,6 @@
* and floats are not used interchangeably.
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_7");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_int_lit8.d.T_xor_int_lit8_7", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/Test_xor_long.java b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/Test_xor_long.java
index a24d884..7e94a03 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/Test_xor_long.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/Test_xor_long.java
@@ -75,12 +75,7 @@
* @title number of registers
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long.d.T_xor_long_6", VerifyError.class);
}
@@ -91,12 +86,7 @@
* @title types of arguments - int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long.d.T_xor_long_3", VerifyError.class);
}
/**
@@ -105,12 +95,7 @@
* @title types of arguments - float, long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long.d.T_xor_long_4", VerifyError.class);
}
/**
@@ -119,12 +104,7 @@
* @title types of arguments - reference, long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long.d.T_xor_long_5", VerifyError.class);
}
/**
@@ -133,11 +113,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.xor_long.d.T_xor_long_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long.d.T_xor_long_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/Test_xor_long_2addr.java b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/Test_xor_long_2addr.java
index 93885fb..af4ee9b 100644
--- a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/Test_xor_long_2addr.java
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/Test_xor_long_2addr.java
@@ -76,12 +76,7 @@
* @title (number of registers).
*/
public void testVFE1() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_6");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_6", VerifyError.class);
}
@@ -92,12 +87,7 @@
* @title types of arguments - int, long
*/
public void testVFE2() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_3");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_3", VerifyError.class);
}
/**
@@ -106,12 +96,7 @@
* @title types of arguments - float, long
*/
public void testVFE3() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_4");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_4", VerifyError.class);
}
/**
@@ -120,12 +105,7 @@
* @title types of arguments - reference, long
*/
public void testVFE4() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_5");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_5", VerifyError.class);
}
/**
@@ -134,11 +114,6 @@
* and doubles are not used interchangeably.
*/
public void testVFE5() {
- try {
- Class.forName("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_2");
- fail("expected a verification exception");
- } catch (Throwable t) {
- DxUtil.checkVerifyException(t);
- }
+ load("dot.junit.opcodes.xor_long_2addr.d.T_xor_long_2addr_2", VerifyError.class);
}
}
diff --git a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
index 6f5226c..3630446 100644
--- a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
+++ b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
@@ -599,6 +599,22 @@
entries.add(res.trim());
}
+ // search for " load(\"...\" " and add as dependency
+ Pattern loadPattern = Pattern.compile("load\\(\"([^\"]*)\"", Pattern.MULTILINE);
+ Matcher loadMatcher = loadPattern.matcher(methodSource);
+ while (loadMatcher.find()) {
+ String res = loadMatcher.group(1);
+ entries.add(res.trim());
+ }
+
+ // search for " loadAndRun(\"...\" " and add as dependency
+ Pattern loadAndRunPattern = Pattern.compile("loadAndRun\\(\"([^\"]*)\"", Pattern.MULTILINE);
+ Matcher loadAndRunMatcher = loadAndRunPattern.matcher(methodSource);
+ while (loadAndRunMatcher.find()) {
+ String res = loadAndRunMatcher.group(1);
+ entries.add(res.trim());
+ }
+
// lines with the form @uses
// dot.junit.opcodes.add_double.jm.T_add_double_2
// one dependency per one @uses