commit d2b8abf12778f3f8a56abeeda8591c39c47a8a90
author Shih-wei Liao <sliao@google.com> Mon Oct 24 20:42:51 2011 -0700
committer Shih-wei Liao <sliao@google.com> Mon Oct 24 20:53:28 2011 -0700
tree 6b1be0db07b8bad10fd933f3baebfeb316ed977f
parent d1cc8363d4f4bbac7568b1d02a5ca481cd10830f

Fix the StackWalk unit test. SegFault was caused by wrong comparisons.

Change-Id: Ie2c6bc44cb171a73bc20968feabdba328e35de74

test/StackWalk/stack_walk_jni.cc

diff --git a/test/StackWalk/stack_walk_jni.cc b/test/StackWalk/stack_walk_jni.cc
index 6a23d1f..ad9c674 100644
--- a/test/StackWalk/stack_walk_jni.cc
+++ b/test/StackWalk/stack_walk_jni.cc
@@ -44,7 +44,7 @@
     // Given the method name and the number of times the method has been called,
     // we know the Dex registers with live reference values. Assert that what we
     // find is what is expected.
-    if (m_name->Equals("f") == 0) {
+    if (m_name->Equals("f")) {
       if (gJava_StackWalk_refmap_calls == 1) {
         CHECK_EQ(1U, m->ToDexPC(pc));
         CHECK_REGS(1);
@@ -53,7 +53,7 @@
         CHECK_EQ(5U, m->ToDexPC(pc));
         CHECK_REGS(1);
       }
-    } else if (m_name->Equals("g") == 0) {
+    } else if (m_name->Equals("g")) {
       if (gJava_StackWalk_refmap_calls == 1) {
         CHECK_EQ(0xcU, m->ToDexPC(pc));
         CHECK_REGS(0, 2);  // Note that v1 is not in the minimal root set
@@ -62,7 +62,7 @@
         CHECK_EQ(0xcU, m->ToDexPC(pc));
         CHECK_REGS(0, 2);
       }
-    } else if (m_name->Equals("shlemiel") == 0) {
+    } else if (m_name->Equals("shlemiel")) {
       if (gJava_StackWalk_refmap_calls == 1) {
         CHECK_EQ(0x380U, m->ToDexPC(pc));
         CHECK_REGS(2, 4, 5, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 21, 25);