diff options
| author | 2015-11-18 18:18:03 +0000 | |
|---|---|---|
| committer | 2015-11-18 18:18:03 +0000 | |
| commit | d0096a46c5c3d95dc65db4c68febeb2cb3988fcc (patch) | |
| tree | 7701ac491fb3f32f084c21d583763335456f8369 | |
| parent | e0915821252b68e363d0ecfff07606e9d274f5fa (diff) | |
| parent | a94596daeb73486d928ab90e435ec36a37e2f6d9 (diff) | |
Merge "Fix 003-omnibus-opcodes" into mnc-dr-enso-dev
| -rw-r--r-- | test/003-omnibus-opcodes/expected.txt | 8 | ||||
| -rw-r--r-- | test/003-omnibus-opcodes/src/FloatMath.java | 14 |
2 files changed, 6 insertions, 16 deletions
diff --git a/test/003-omnibus-opcodes/expected.txt b/test/003-omnibus-opcodes/expected.txt index b591a7a024..ee25ec10e6 100644 --- a/test/003-omnibus-opcodes/expected.txt +++ b/test/003-omnibus-opcodes/expected.txt @@ -31,15 +31,7 @@ FloatMath.doubleOperTest FloatMath.checkConvI FloatMath.checkConvL FloatMath.checkConvF - 0: -2.0054409E9 - 1: -8.613303E18 - 2: -3.1415927 --2.0054409E9, -8.6133031E18, -3.1415927 FloatMath.checkConvD - 0: -2.005440939E9 - 1: -8.613303245920329E18 - 2: 123.45600128173828 --2.005440939E9, -8.6133032459203287E18, 123.4560012817382 FloatMath.checkConsts FloatMath.jlmTests IntMath.testIntCompare diff --git a/test/003-omnibus-opcodes/src/FloatMath.java b/test/003-omnibus-opcodes/src/FloatMath.java index a0bc9f46dd..96befe9cdc 100644 --- a/test/003-omnibus-opcodes/src/FloatMath.java +++ b/test/003-omnibus-opcodes/src/FloatMath.java @@ -245,10 +245,9 @@ public class FloatMath { } static void checkConvF(float[] results) { System.out.println("FloatMath.checkConvF"); - // TODO: Main.assertTrue values - for (int i = 0; i < results.length; i++) - System.out.println(" " + i + ": " + results[i]); - System.out.println("-2.0054409E9, -8.6133031E18, -3.1415927"); + Main.assertTrue(results[0] == -2.0054409E9f); + Main.assertTrue(results[1] == -8.613303E18f); + Main.assertTrue(results[2] == -3.1415927f); } static double[] convD(int i, long l, float f) { @@ -260,10 +259,9 @@ public class FloatMath { } static void checkConvD(double[] results) { System.out.println("FloatMath.checkConvD"); - // TODO: Main.assertTrue values - for (int i = 0; i < results.length; i++) - System.out.println(" " + i + ": " + results[i]); - System.out.println("-2.005440939E9, -8.6133032459203287E18, 123.4560012817382"); + Main.assertTrue(results[0] == -2.005440939E9); + Main.assertTrue(results[1] == -8.6133032459203287E18); + Main.assertTrue(results[2] == 123.45600128173828); } static void checkConsts() { |