diff options
Diffstat (limited to 'src/object_test.cc')
| -rw-r--r-- | src/object_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/object_test.cc b/src/object_test.cc index e5bdd35bf9..cf597760f1 100644 --- a/src/object_test.cc +++ b/src/object_test.cc @@ -16,12 +16,12 @@ namespace art { class ObjectTest : public RuntimeTest { protected: - void AssertString(int32_t length, + void AssertString(size_t length, const char* utf8_in, const char* utf16_expected_le, - int32_t hash_expected) { + uint32_t hash_expected) { uint16_t utf16_expected[length]; - for (int32_t i = 0; i < length; i++) { + for (size_t i = 0; i < length; i++) { uint16_t ch = (((utf16_expected_le[i*2 + 0] & 0xff) << 8) | ((utf16_expected_le[i*2 + 1] & 0xff) << 0)); utf16_expected[i] = ch; @@ -32,8 +32,8 @@ class ObjectTest : public RuntimeTest { ASSERT_TRUE(string->GetCharArray() != NULL); ASSERT_TRUE(string->GetCharArray()->GetData() != NULL); // strlen is necessary because the 1-character string "\0" is interpreted as "" - ASSERT_TRUE(string->Equals(utf8_in) || length != static_cast<int32_t>(strlen(utf8_in))); - for (int32_t i = 0; i < length; i++) { + ASSERT_TRUE(string->Equals(utf8_in) || length != strlen(utf8_in)); + for (size_t i = 0; i < length; i++) { EXPECT_EQ(utf16_expected[i], string->CharAt(i)); } EXPECT_EQ(hash_expected, string->GetHashCode()); @@ -164,9 +164,9 @@ TEST_F(ObjectTest, DescriptorCompare) { TEST_F(ObjectTest, StringHashCode) { - EXPECT_EQ(0, String::AllocFromAscii("")->GetHashCode()); - EXPECT_EQ(65, String::AllocFromAscii("A")->GetHashCode()); - EXPECT_EQ(64578, String::AllocFromAscii("ABC")->GetHashCode()); + EXPECT_EQ(0U, String::AllocFromAscii("")->GetHashCode()); + EXPECT_EQ(65U, String::AllocFromAscii("A")->GetHashCode()); + EXPECT_EQ(64578U, String::AllocFromAscii("ABC")->GetHashCode()); } } // namespace art |