Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Exclude all directories instead of only known ones"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-13 20:14:55 +00:00
committed by Android (Google) Code Review
parent 7de784c1eb 116b91c2c1
commit 651cb0c674
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/ApkVerityTest/src/com/android/apkverity/ApkVerityTest.java
View File

@@ -430,10 +430,9 @@ public class ApkVerityTest extends BaseHostJUnit4Test {
private void verifyInstalledFiles(String... filenames) throws DeviceNotAvailableException {
String apkPath = getApkPath(TARGET_PACKAGE);
String appDir = apkPath.substring(0, apkPath.lastIndexOf("/"));
// Exclude directories since we only care about files.
HashSet<String> actualFiles = new HashSet<>(Arrays.asList(
expectRemoteCommandToSucceed("ls " + appDir).split("\n")));
assertTrue(actualFiles.remove("lib"));
assertTrue(actualFiles.remove("oat"));
expectRemoteCommandToSucceed("ls -p " + appDir + " | grep -v '/'").split("\n")));
HashSet<String> expectedFiles = new HashSet<>(Arrays.asList(filenames));
assertEquals(expectedFiles, actualFiles);