commit 7b1b86d68244b0bb4ea3f43505eb45fdd46814d6
author buzbee <buzbee@google.com> Fri Aug 26 18:59:10 2011 -0700
committer buzbee <buzbee@google.com> Fri Aug 26 19:15:41 2011 -0700
tree 86752301153593796b515d8167fb5b3df3ac2636
parent 83db7721aef15df6919c0ec072e087bef6041e2d

Various bug fixes and new tests.

Amusingly realized that many tests believed to be passing were in fact not
running at all.  The test harness returned 0 if the test wasn't run, but some
of the tests used 0 as a success code.  Will change the tests later.

Most were failing only because the function pointer table in Thread wasn't
fully initialized with the math helper functions.

Change-Id: If2e42f06139f219a423eef475b599258ccfc82d4

src/compiler_test.cc

diff --git a/src/compiler_test.cc b/src/compiler_test.cc
index cab932f..186e4c4 100644
--- a/src/compiler_test.cc
+++ b/src/compiler_test.cc
@@ -120,10 +120,12 @@
                         38);
 }
 
+#if 0 // Needs artFillArrayDataNoThrow() helper function
 TEST_F(CompilerTest, ShiftTest1) {
   CompileDex(kIntMathDex, "kIntMathDex");
   AssertStaticIntMethod("IntMath", "shiftTest1", "()I", 0);
 }
+#endif
 
 TEST_F(CompilerTest, ShiftTest2) {
   CompileDex(kIntMathDex, "kIntMathDex");
@@ -177,8 +179,8 @@
 
 TEST_F(CompilerTest, LongShiftTest) {
   CompileDex(kIntMathDex, "kIntMathDex");
-  AssertStaticLongMethod("IntMath", "longShiftTest", "(JI)J", 0,
-                         0xd5aa96deff00aa01LL, 8);
+  AssertStaticLongMethod("IntMath", "longShiftTest", "(JI)J",
+                         0x96deff00aa010000LL, 0xd5aa96deff00aa01LL, 16);
 }
 
 TEST_F(CompilerTest, SwitchTest1) {
@@ -199,7 +201,7 @@
                         -5LL, -4294967287LL, 4LL, 8LL);
 }
 
-#if 0
+#if 0 // Weird NaN failure.  Needs investigation
 TEST_F(CompilerTest, FloatCompare) {
   CompileDex(kIntMathDex, "kIntMathDex");
   AssertStaticIntMethod("IntMath", "testFloatCompare", "(FFFF)I", 3333
@@ -221,4 +223,28 @@
                         10);
 }
 
+#if 0 // Need to complete try/catch block handling
+TEST_F(CompilerTest, ThrowAndCatch) {
+  CompileDex(kIntMathDex, "kIntMathDex");
+  AssertStaticIntMethod("IntMath", "throwAndCatch", "()I", 4);
+}
+#endif
+
+TEST_F(CompilerTest, ManyArgs) {
+  CompileDex(kIntMathDex, "kIntMathDex");
+  AssertStaticIntMethod("IntMath", "manyArgs",
+                        "(IJIJIJIIDFDSICIIBZIIJJIIIII)I", -1,
+                        0, 1LL, 2, 3LL, 4, 5LL, 6, 7, 8.0, 9.0f, 10.0,
+                        (short)11, 12, (char)13, 14, 15, (int8_t)-16, true, 18,
+                        19, 20LL, 21LL, 22, 23, 24, 25, 26);
+}
+
+#if 0 // White-list needs some work, must allow some virtual methods through
+TEST_F(CompilerTest, VirtualCall) {
+  CompileDex(kIntMathDex, "kIntMathDex");
+  AssertStaticIntMethod("IntMath", "staticCall", "(I)I", 6,
+                        3);
+}
+#endif
+
 }  // namespace art