diff options
author | Elliott Hughes <enh@google.com> | 2019-05-06 23:45:16 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-06 23:45:16 +0000 |
commit | eb975070bee4aaf4cad85c229d5c462d3ce733b6 (patch) | |
tree | d050b8e464643c975b35c020c43ed34700cacfe2 | |
parent | a753a334e2bfcfe5065f813f7f3c0995c45d7ba2 (diff) | |
parent | a727b830c19de17800730b7c97280a1b72cf84b4 (diff) | |
download | native-eb975070bee4aaf4cad85c229d5c462d3ce733b6.tar.gz |
Merge "dumpstate: track libziparchive API change."android-o-mr1-iot-release-1.0.12oreo-mr1-iot-release
-rw-r--r-- | cmds/dumpstate/tests/dumpstate_smoke_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/dumpstate/tests/dumpstate_smoke_test.cpp b/cmds/dumpstate/tests/dumpstate_smoke_test.cpp index fc3642c912..5bde7db287 100644 --- a/cmds/dumpstate/tests/dumpstate_smoke_test.cpp +++ b/cmds/dumpstate/tests/dumpstate_smoke_test.cpp @@ -208,7 +208,7 @@ class ZippedBugReportContentsTest : public Test { void FileExists(const char* filename, uint32_t minsize, uint32_t maxsize) { ZipEntry entry; - EXPECT_EQ(FindEntry(handle, ZipString(filename), &entry), 0); + EXPECT_EQ(FindEntry(handle, filename, &entry), 0); EXPECT_GT(entry.uncompressed_length, minsize); EXPECT_LT(entry.uncompressed_length, maxsize); } @@ -217,7 +217,7 @@ class ZippedBugReportContentsTest : public Test { TEST_F(ZippedBugReportContentsTest, ContainsMainEntry) { ZipEntry mainEntryLoc; // contains main entry name file - EXPECT_EQ(FindEntry(handle, ZipString("main_entry.txt"), &mainEntryLoc), 0); + EXPECT_EQ(FindEntry(handle, "main_entry.txt", &mainEntryLoc), 0); char* buf = new char[mainEntryLoc.uncompressed_length]; ExtractToMemory(handle, &mainEntryLoc, (uint8_t*)buf, mainEntryLoc.uncompressed_length); @@ -230,7 +230,7 @@ TEST_F(ZippedBugReportContentsTest, ContainsMainEntry) { TEST_F(ZippedBugReportContentsTest, ContainsVersion) { ZipEntry entry; // contains main entry name file - EXPECT_EQ(FindEntry(handle, ZipString("version.txt"), &entry), 0); + EXPECT_EQ(FindEntry(handle, "version.txt", &entry), 0); char* buf = new char[entry.uncompressed_length + 1]; ExtractToMemory(handle, &entry, (uint8_t*)buf, entry.uncompressed_length); |