commit f7e85a512c343c474f64791a1f5e26a5df537653
author Jesse Wilson <jessewilson@google.com> Mon Aug 01 18:45:58 2011 -0700
committer Jesse Wilson <jessewilson@google.com> Tue Aug 02 10:58:07 2011 -0700
tree cdd122858f5b0cc7fbdb483f9cd10c8f21897390
parent 905786d6c484f464724b5dfb425af409d48d3bbf

Use Java strings for Method's name.

Change-Id: Ibf0a847358a1b480069f49a0aefc783ad96a0332

src/object_test.cc

diff --git a/src/object_test.cc b/src/object_test.cc
index 7800855..46e9cca 100644
--- a/src/object_test.cc
+++ b/src/object_test.cc
@@ -32,7 +32,7 @@
     ASSERT_TRUE(string->array_ != NULL);
     ASSERT_TRUE(string->array_->GetChars() != NULL);
     // strlen is necessary because the 1-character string "\0" is interpreted as ""
-    ASSERT_TRUE(String::Equals(string, utf8_in) || length != strlen(utf8_in));
+    ASSERT_TRUE(String::EqualsUtf8(string, utf8_in) || length != strlen(utf8_in));
     for (size_t i = 0; i < length; i++) {
       EXPECT_EQ(utf16_expected[i], string->array_->GetChar(i));
     }
@@ -90,22 +90,40 @@
   AssertString(3, "h\xe1\x88\xb4i", "\x00\x68\x12\x34\x00\x69", (31 * ((31 * 0x68) + 0x1234)) + 0x69);
 }
 
-static bool StringNotEquals(const String* a, const char* b) {
+static bool StringNotEqualsUtf8(const String* a, const char* b) {
+  return !String::EqualsUtf8(a, b);
+}
+
+TEST_F(ObjectTest, StringEqualsUtf8) {
+  String* string = String::AllocFromAscii("android");
+  EXPECT_PRED2(String::EqualsUtf8, string, "android");
+  EXPECT_PRED2(StringNotEqualsUtf8, string, "Android");
+  EXPECT_PRED2(StringNotEqualsUtf8, string, "ANDROID");
+  EXPECT_PRED2(StringNotEqualsUtf8, string, "");
+  EXPECT_PRED2(StringNotEqualsUtf8, string, "and");
+  EXPECT_PRED2(StringNotEqualsUtf8, string, "androids");
+
+  String* empty = String::AllocFromAscii("");
+  EXPECT_PRED2(String::EqualsUtf8, empty, "");
+  EXPECT_PRED2(StringNotEqualsUtf8, empty, "a");
+}
+
+static bool StringNotEquals(const String* a, const String* b) {
   return !String::Equals(a, b);
 }
 
 TEST_F(ObjectTest, StringEquals) {
-  String* string = class_linker_->AllocStringFromModifiedUtf8(7, "android");
-  EXPECT_PRED2(String::Equals, string, "android");
-  EXPECT_PRED2(StringNotEquals, string, "Android");
-  EXPECT_PRED2(StringNotEquals, string, "ANDROID");
-  EXPECT_PRED2(StringNotEquals, string, "");
-  EXPECT_PRED2(StringNotEquals, string, "and");
-  EXPECT_PRED2(StringNotEquals, string, "androids");
+  String* string = String::AllocFromAscii("android");
+  EXPECT_PRED2(String::Equals, string, String::AllocFromAscii("android"));
+  EXPECT_PRED2(StringNotEquals, string, String::AllocFromAscii("Android"));
+  EXPECT_PRED2(StringNotEquals, string, String::AllocFromAscii("ANDROID"));
+  EXPECT_PRED2(StringNotEquals, string, String::AllocFromAscii(""));
+  EXPECT_PRED2(StringNotEquals, string, String::AllocFromAscii("and"));
+  EXPECT_PRED2(StringNotEquals, string, String::AllocFromAscii("androids"));
 
-  String* empty = class_linker_->AllocStringFromModifiedUtf8(0, "");
-  EXPECT_PRED2(String::Equals, empty, "");
-  EXPECT_PRED2(StringNotEquals, empty, "a");
+  String* empty = String::AllocFromAscii("");
+  EXPECT_PRED2(String::Equals, empty, String::AllocFromAscii(""));
+  EXPECT_PRED2(StringNotEquals, empty, String::AllocFromAscii("a"));
 }
 
 }  // namespace art