Old tests run with new system.

The tests are ported and run with the new system, though many currently
don't pass. Some of the tests also need additional fixing to run
properly.

Change-Id: I3263cf5dcb0fe064a3e6c02e4aa1bb9a067f64c7

1 files changed, 22 insertions, 22 deletions

diff --git a/test/003-omnibus-opcodes/src/InstField.java b/test/003-omnibus-opcodes/src/InstField.java
index 80b95ab..fe322b0 100644
--- a/test/003-omnibus-opcodes/src/InstField.java
+++ b/test/003-omnibus-opcodes/src/InstField.java
@@ -38,25 +38,25 @@ public class InstField {
         System.out.println("InstField.nullCheck");
         try {
             int x = nully.mInt1;
-            assert(false);
+            Main.assertTrue(false);
         } catch (NullPointerException npe) {
             // good
         }
         try {
             long l = nully.mLong1;
-            assert(false);
+            Main.assertTrue(false);
         } catch (NullPointerException npe) {
             // good
         }
         try {
             nully.mInt1 = 5;
-            assert(false);
+            Main.assertTrue(false);
         } catch (NullPointerException npe) {
             // good
         }
         try {
             nully.mLong1 = 17L;
-            assert(false);
+            Main.assertTrue(false);
         } catch (NullPointerException npe) {
             // good
         }
@@ -86,23 +86,23 @@ public class InstField {
 
     public void checkFields() {
         System.out.println("InstField check...");
-        assert(mBoolean1);
-        assert(!mBoolean2);
-        assert(mByte1 == 127);
-        assert(mByte2 == -128);
-        assert(mChar1 == 32767);
-        assert(mChar2 == 65535);
-        assert(mShort1 == 32767);
-        assert(mShort2 == -32768);
-        assert(mInt1 == 65537);
-        assert(mInt2 == -65537);
-        assert(mFloat1 > 3.141f && mFloat1 < 3.142f);
-        assert(mFloat2 < mFloat1);
-        assert(mLong1 == 1234605616436508552L);
-        assert(mLong2 == -1234605616436508552L);
-        assert(mDouble1 > 3.141592653 && mDouble1 < 3.141592654);
-        assert(mDouble2 > mDouble1);
-        assert(mVolatileLong1 == 1234605616436508551L);
-        assert(mVolatileLong2 == -1234605616436508551L);
+        Main.assertTrue(mBoolean1);
+        Main.assertTrue(!mBoolean2);
+        Main.assertTrue(mByte1 == 127);
+        Main.assertTrue(mByte2 == -128);
+        Main.assertTrue(mChar1 == 32767);
+        Main.assertTrue(mChar2 == 65535);
+        Main.assertTrue(mShort1 == 32767);
+        Main.assertTrue(mShort2 == -32768);
+        Main.assertTrue(mInt1 == 65537);
+        Main.assertTrue(mInt2 == -65537);
+        Main.assertTrue(mFloat1 > 3.141f && mFloat1 < 3.142f);
+        Main.assertTrue(mFloat2 < mFloat1);
+        Main.assertTrue(mLong1 == 1234605616436508552L);
+        Main.assertTrue(mLong2 == -1234605616436508552L);
+        Main.assertTrue(mDouble1 > 3.141592653 && mDouble1 < 3.141592654);
+        Main.assertTrue(mDouble2 > mDouble1);
+        Main.assertTrue(mVolatileLong1 == 1234605616436508551L);
+        Main.assertTrue(mVolatileLong2 == -1234605616436508551L);
     }
 }