Reuse SIRT for C++ references
Change-Id: I8310e55da42f55f7ec60f6b17face436c77a979f
diff --git a/src/utils_test.cc b/src/utils_test.cc
index 0869b89..bf66d05 100644
--- a/src/utils_test.cc
+++ b/src/utils_test.cc
@@ -11,8 +11,8 @@
#define EXPECT_DESCRIPTOR(pretty_descriptor, descriptor) \
do { \
- String* s = String::AllocFromModifiedUtf8(descriptor); \
- std::string result(PrettyDescriptor(s)); \
+ SirtRef<String> s(String::AllocFromModifiedUtf8(descriptor)); \
+ std::string result(PrettyDescriptor(s.get())); \
EXPECT_EQ(pretty_descriptor, result); \
} while (false)
@@ -59,11 +59,11 @@
TEST_F(UtilsTest, PrettyTypeOf) {
EXPECT_EQ("null", PrettyTypeOf(NULL));
- String* s = String::AllocFromModifiedUtf8("");
- EXPECT_EQ("java.lang.String", PrettyTypeOf(s));
+ SirtRef<String> s(String::AllocFromModifiedUtf8(""));
+ EXPECT_EQ("java.lang.String", PrettyTypeOf(s.get()));
- ShortArray* a = ShortArray::Alloc(2);
- EXPECT_EQ("short[]", PrettyTypeOf(a));
+ SirtRef<ShortArray> a(ShortArray::Alloc(2));
+ EXPECT_EQ("short[]", PrettyTypeOf(a.get()));
Class* c = class_linker_->FindSystemClass("[Ljava/lang/String;");
ASSERT_TRUE(c != NULL);