diff options
Diffstat (limited to 'runtime/utils_test.cc')
| -rw-r--r-- | runtime/utils_test.cc | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc index d2100d16d4..0a01cdb4ec 100644 --- a/runtime/utils_test.cc +++ b/runtime/utils_test.cc @@ -322,18 +322,24 @@ TEST_F(UtilsTest, EndsWith) { EXPECT_FALSE(EndsWith("oo", "foo")); } -TEST_F(UtilsTest, GetDalvikCacheFilenameOrDie) { - EXPECT_STREQ("/foo/system@app@Foo.apk@classes.dex", - GetDalvikCacheFilenameOrDie("/system/app/Foo.apk", "/foo").c_str()); - - EXPECT_STREQ("/foo/data@app@foo-1.apk@classes.dex", - GetDalvikCacheFilenameOrDie("/data/app/foo-1.apk", "/foo").c_str()); - EXPECT_STREQ("/foo/system@framework@core.jar@classes.dex", - GetDalvikCacheFilenameOrDie("/system/framework/core.jar", "/foo").c_str()); - EXPECT_STREQ("/foo/system@framework@boot.art", - GetDalvikCacheFilenameOrDie("/system/framework/boot.art", "/foo").c_str()); - EXPECT_STREQ("/foo/system@framework@boot.oat", - GetDalvikCacheFilenameOrDie("/system/framework/boot.oat", "/foo").c_str()); +TEST_F(UtilsTest, GetDalvikCacheFilename) { + std::string name; + std::string error; + + EXPECT_TRUE(GetDalvikCacheFilename("/system/app/Foo.apk", "/foo", &name, &error)) << error; + EXPECT_EQ("/foo/system@app@Foo.apk@classes.dex", name); + + EXPECT_TRUE(GetDalvikCacheFilename("/data/app/foo-1.apk", "/foo", &name, &error)) << error; + EXPECT_EQ("/foo/data@app@foo-1.apk@classes.dex", name); + + EXPECT_TRUE(GetDalvikCacheFilename("/system/framework/core.jar", "/foo", &name, &error)) << error; + EXPECT_EQ("/foo/system@framework@core.jar@classes.dex", name); + + EXPECT_TRUE(GetDalvikCacheFilename("/system/framework/boot.art", "/foo", &name, &error)) << error; + EXPECT_EQ("/foo/system@framework@boot.art", name); + + EXPECT_TRUE(GetDalvikCacheFilename("/system/framework/boot.oat", "/foo", &name, &error)) << error; + EXPECT_EQ("/foo/system@framework@boot.oat", name); } TEST_F(UtilsTest, GetDalvikCache) { |