Switch dvmHumanReadableDescriptor over to std::string.

(Prep work before making a change to stack dumps.)

Change-Id: I0af49b920f450fd2611e4b96e717a637483122d6

1 files changed, 28 insertions, 31 deletions

diff --git a/unit-tests/dvmHumanReadableDescriptor_test.cpp b/unit-tests/dvmHumanReadableDescriptor_test.cpp
index 8530df401..9f1bdf694 100644
--- a/unit-tests/dvmHumanReadableDescriptor_test.cpp
+++ b/unit-tests/dvmHumanReadableDescriptor_test.cpp
@@ -1,44 +1,41 @@
 #include <gtest/gtest.h>
 
-// TODO: make dalvik's .h files C++-clean.
-extern "C" char* dvmHumanReadableDescriptor(const char* descriptor);
-
 TEST(dvmHumanReadableDescriptor, ArrayReferences) {
-  ASSERT_STREQ("java.lang.Class[]", dvmHumanReadableDescriptor("[Ljava/lang/Class;"));
-  ASSERT_STREQ("java.lang.Class[][]", dvmHumanReadableDescriptor("[[Ljava/lang/Class;"));
+  ASSERT_EQ("java.lang.Class[]", dvmHumanReadableDescriptor("[Ljava/lang/Class;"));
+  ASSERT_EQ("java.lang.Class[][]", dvmHumanReadableDescriptor("[[Ljava/lang/Class;"));
 }
 
 TEST(dvmHumanReadableDescriptor, ScalarReferences) {
-  ASSERT_STREQ("java.lang.String", dvmHumanReadableDescriptor("Ljava.lang.String;"));
-  ASSERT_STREQ("java.lang.String", dvmHumanReadableDescriptor("Ljava/lang/String;"));
+  ASSERT_EQ("java.lang.String", dvmHumanReadableDescriptor("Ljava.lang.String;"));
+  ASSERT_EQ("java.lang.String", dvmHumanReadableDescriptor("Ljava/lang/String;"));
 }
 
 TEST(dvmHumanReadableDescriptor, PrimitiveArrays) {
-  ASSERT_STREQ("boolean[]", dvmHumanReadableDescriptor("[Z"));
-  ASSERT_STREQ("boolean[][]", dvmHumanReadableDescriptor("[[Z"));
-  ASSERT_STREQ("byte[]", dvmHumanReadableDescriptor("[B"));
-  ASSERT_STREQ("byte[][]", dvmHumanReadableDescriptor("[[B"));
-  ASSERT_STREQ("char[]", dvmHumanReadableDescriptor("[C"));
-  ASSERT_STREQ("char[][]", dvmHumanReadableDescriptor("[[C"));
-  ASSERT_STREQ("double[]", dvmHumanReadableDescriptor("[D"));
-  ASSERT_STREQ("double[][]", dvmHumanReadableDescriptor("[[D"));
-  ASSERT_STREQ("float[]", dvmHumanReadableDescriptor("[F"));
-  ASSERT_STREQ("float[][]", dvmHumanReadableDescriptor("[[F"));
-  ASSERT_STREQ("int[]", dvmHumanReadableDescriptor("[I"));
-  ASSERT_STREQ("int[][]", dvmHumanReadableDescriptor("[[I"));
-  ASSERT_STREQ("long[]", dvmHumanReadableDescriptor("[J"));
-  ASSERT_STREQ("long[][]", dvmHumanReadableDescriptor("[[J"));
-  ASSERT_STREQ("short[]", dvmHumanReadableDescriptor("[S"));
-  ASSERT_STREQ("short[][]", dvmHumanReadableDescriptor("[[S"));
+  ASSERT_EQ("boolean[]", dvmHumanReadableDescriptor("[Z"));
+  ASSERT_EQ("boolean[][]", dvmHumanReadableDescriptor("[[Z"));
+  ASSERT_EQ("byte[]", dvmHumanReadableDescriptor("[B"));
+  ASSERT_EQ("byte[][]", dvmHumanReadableDescriptor("[[B"));
+  ASSERT_EQ("char[]", dvmHumanReadableDescriptor("[C"));
+  ASSERT_EQ("char[][]", dvmHumanReadableDescriptor("[[C"));
+  ASSERT_EQ("double[]", dvmHumanReadableDescriptor("[D"));
+  ASSERT_EQ("double[][]", dvmHumanReadableDescriptor("[[D"));
+  ASSERT_EQ("float[]", dvmHumanReadableDescriptor("[F"));
+  ASSERT_EQ("float[][]", dvmHumanReadableDescriptor("[[F"));
+  ASSERT_EQ("int[]", dvmHumanReadableDescriptor("[I"));
+  ASSERT_EQ("int[][]", dvmHumanReadableDescriptor("[[I"));
+  ASSERT_EQ("long[]", dvmHumanReadableDescriptor("[J"));
+  ASSERT_EQ("long[][]", dvmHumanReadableDescriptor("[[J"));
+  ASSERT_EQ("short[]", dvmHumanReadableDescriptor("[S"));
+  ASSERT_EQ("short[][]", dvmHumanReadableDescriptor("[[S"));
 }
 
 TEST(dvmHumanReadableDescriptor, PrimitiveScalars) {
-  ASSERT_STREQ("boolean", dvmHumanReadableDescriptor("Z"));
-  ASSERT_STREQ("byte", dvmHumanReadableDescriptor("B"));
-  ASSERT_STREQ("char", dvmHumanReadableDescriptor("C"));
-  ASSERT_STREQ("double", dvmHumanReadableDescriptor("D"));
-  ASSERT_STREQ("float", dvmHumanReadableDescriptor("F"));
-  ASSERT_STREQ("int", dvmHumanReadableDescriptor("I"));
-  ASSERT_STREQ("long", dvmHumanReadableDescriptor("J"));
-  ASSERT_STREQ("short", dvmHumanReadableDescriptor("S"));
+  ASSERT_EQ("boolean", dvmHumanReadableDescriptor("Z"));
+  ASSERT_EQ("byte", dvmHumanReadableDescriptor("B"));
+  ASSERT_EQ("char", dvmHumanReadableDescriptor("C"));
+  ASSERT_EQ("double", dvmHumanReadableDescriptor("D"));
+  ASSERT_EQ("float", dvmHumanReadableDescriptor("F"));
+  ASSERT_EQ("int", dvmHumanReadableDescriptor("I"));
+  ASSERT_EQ("long", dvmHumanReadableDescriptor("J"));
+  ASSERT_EQ("short", dvmHumanReadableDescriptor("S"));
 }