jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore: fix directory search for smali tests

Browse Source
This commit is contained in:
Skylot
2020-09-17 19:53:18 +03:00
parent 6428f29373
commit e024628d46
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/test/java/jadx/tests/api/SmaliTest.java
+13 -1
View File
@@ -68,7 +68,7 @@ public abstract class SmaliTest extends IntegrationTest {
} else {
smaliFilesDir = pkg + File.separatorChar + testDir + File.separatorChar;
}
File smaliDir = new File(SMALI_TESTS_DIR, smaliFilesDir);
File smaliDir = getSmaliDir(smaliFilesDir);
String[] smaliFileNames = smaliDir.list((dir, name) -> name.endsWith(".smali"));
assertThat("Smali files not found in " + smaliDir, smaliFileNames, notNullValue());
return Stream.of(smaliFileNames)
@@ -87,4 +87,16 @@ public abstract class SmaliTest extends IntegrationTest {
}
throw new AssertionError("Smali file not found: " + smaliFile.getPath());
}
private static File getSmaliDir(String baseName) {
File smaliDir = new File(SMALI_TESTS_DIR, baseName);
if (smaliDir.exists()) {
return smaliDir;
}
File pathFromRoot = new File(SMALI_TESTS_PROJECT, smaliDir.getPath());
if (pathFromRoot.exists()) {
return pathFromRoot;
}
throw new AssertionError("Smali dir not found: " + smaliDir.getPath());
}
}