diff options
Diffstat (limited to 'runtime/dex_file_test.cc')
| -rw-r--r-- | runtime/dex_file_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/dex_file_test.cc b/runtime/dex_file_test.cc index 78d5c5f4ba..1a73062068 100644 --- a/runtime/dex_file_test.cc +++ b/runtime/dex_file_test.cc @@ -535,9 +535,9 @@ TEST_F(DexFileTest, GetMultiDexLocation) { std::string dex_location_str = "/system/app/framework.jar"; const char* dex_location = dex_location_str.c_str(); ASSERT_EQ("/system/app/framework.jar", DexFile::GetMultiDexLocation(0, dex_location)); - ASSERT_EQ("/system/app/framework.jar:classes2.dex", + ASSERT_EQ("/system/app/framework.jar!classes2.dex", DexFile::GetMultiDexLocation(1, dex_location)); - ASSERT_EQ("/system/app/framework.jar:classes101.dex", + ASSERT_EQ("/system/app/framework.jar!classes101.dex", DexFile::GetMultiDexLocation(100, dex_location)); } @@ -563,11 +563,11 @@ TEST_F(DexFileTest, GetDexCanonicalLocation) { TEST(DexFileUtilsTest, GetBaseLocationAndMultiDexSuffix) { EXPECT_EQ("/foo/bar/baz.jar", DexFile::GetBaseLocation("/foo/bar/baz.jar")); - EXPECT_EQ("/foo/bar/baz.jar", DexFile::GetBaseLocation("/foo/bar/baz.jar:classes2.dex")); - EXPECT_EQ("/foo/bar/baz.jar", DexFile::GetBaseLocation("/foo/bar/baz.jar:classes8.dex")); + EXPECT_EQ("/foo/bar/baz.jar", DexFile::GetBaseLocation("/foo/bar/baz.jar!classes2.dex")); + EXPECT_EQ("/foo/bar/baz.jar", DexFile::GetBaseLocation("/foo/bar/baz.jar!classes8.dex")); EXPECT_EQ("", DexFile::GetMultiDexSuffix("/foo/bar/baz.jar")); - EXPECT_EQ(":classes2.dex", DexFile::GetMultiDexSuffix("/foo/bar/baz.jar:classes2.dex")); - EXPECT_EQ(":classes8.dex", DexFile::GetMultiDexSuffix("/foo/bar/baz.jar:classes8.dex")); + EXPECT_EQ("!classes2.dex", DexFile::GetMultiDexSuffix("/foo/bar/baz.jar!classes2.dex")); + EXPECT_EQ("!classes8.dex", DexFile::GetMultiDexSuffix("/foo/bar/baz.jar!classes8.dex")); } TEST_F(DexFileTest, ZipOpenClassesPresent) { |