yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

fix path seperators in bundle tests

Browse source
This commit is contained in:
Jason P. Leasure 2020-07-06 08:30:57 -04:00
parent eb5cc0097e
commit 4694639d9a
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/script/BundleHostTest.java
View file

@ -39,17 +39,15 @@ public class BundleHostTest extends AbstractGhidraHeadlessIntegrationTest {
LinkedList<GhidraBundle> bundleStack = new LinkedList<>();
GhidraBundle currentBundle;
protected static void wipe(Path path) throws IOException {
if (Files.exists(path)) {
for (Path p : (Iterable<Path>) Files.walk(path).sorted(
Comparator.reverseOrder())::iterator) {
for (Path p : (Iterable<Path>) Files.walk(path)
.sorted(Comparator.reverseOrder())::iterator) {
Files.deleteIfExists(p);
}
}
}
protected GhidraBundle pushNewBundle() throws IOException {
String dir = String.format("sourcebundle%03d", tempDirs.size());
Path tmpDir = new File(getTestDirectoryPath(), dir).toPath();
@ -104,7 +102,8 @@ public class BundleHostTest extends AbstractGhidraHeadlessIntegrationTest {
assertEquals("unexpected output during build", expectedCompilerOutput,
stringWriter.getBuffer().toString());
assertEquals("wrong summary", expectedSummary, capturingBundleHostListener.lastBuildSummary);
assertEquals("wrong summary", expectedSummary,
capturingBundleHostListener.lastBuildSummary);
}
protected void activate() throws Exception {
@ -223,7 +222,7 @@ public class BundleHostTest extends AbstractGhidraHeadlessIntegrationTest {
"BClass.java:7: error: ';' expected\n" +
" failing java goes here\n" +
" ^\n" +
String.format("skipping %s/apackage/BClass.java\n", currentBundle.getFile().toString())
"skipping "+currentBundle.getFile().toString()+File.separator+"apackage"+File.separator+"BClass.java\n"
,
"1 source file with errors"
);
@ -291,8 +290,8 @@ public class BundleHostTest extends AbstractGhidraHeadlessIntegrationTest {
" return \"lib says \" + Library.sup();\n" +
" ^\n" +
" symbol: variable Library\n" +
" location: class apackage.AClass\n" +
String.format("skipping %s/apackage/AClass.java\n", currentBundle.getFile().toString())
" location: class apackage.AClass\n" +
"skipping "+currentBundle.getFile().toString()+File.separator+"apackage"+File.separator+"AClass.java\n"
,
"1 source file with errors"
);