stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8198379: tools/jimage/JImageListTest.java failing

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Michal Vala 2018-02-19 18:43:28 +00:00 committed by Alan Bateman
parent 04b8b8deff
commit 9e4f91707b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/jdk/ProblemList.txt
View File

@ -465,7 +465,6 @@ tools/pack200/CommandLineTests.java 8059906 generic-
tools/launcher/FXLauncherTest.java 8068049 linux-all,macosx-all tools/launcher/FXLauncherTest.java 8068049 linux-all,macosx-all
tools/jimage/JImageExtractTest.java 8170120 generic-all tools/jimage/JImageExtractTest.java 8170120 generic-all
tools/jimage/JImageListTest.java 8170120 generic-all
############################################################################ ############################################################################

4
test/jdk/tools/jimage/JImageListTest.java
View File

@ -57,7 +57,7 @@ public class JImageListTest extends JImageCliTest {
.map(s -> s.substring(s.indexOf(':') + 1).trim()) .map(s -> s.substring(s.indexOf(':') + 1).trim())
.collect(Collectors.toList()); .collect(Collectors.toList());
assertTrue(modules.size() > 0, "Image contains at least one module."); assertTrue(modules.size() > 0, "Image contains at least one module.");
assertTrue(modules.indexOf("java.base") > 0, "Module java.base found."); assertTrue(modules.contains("java.base"), "Module java.base found.");
}); });
} }
@ -88,7 +88,7 @@ public class JImageListTest extends JImageCliTest {
.map(s -> s.substring(s.indexOf(':') + 1).trim()) .map(s -> s.substring(s.indexOf(':') + 1).trim())
.collect(Collectors.toList()); .collect(Collectors.toList());
assertTrue(modules.size() > 0, "Image contains at least one module."); assertTrue(modules.size() > 0, "Image contains at least one module.");
assertTrue(modules.indexOf("java.base") > 0, "Module java.base found."); assertTrue(modules.contains("java.base"), "Module java.base found.");
Set<String> entries = Stream.of(lines) Set<String> entries = Stream.of(lines)
.filter(s -> { return !s.startsWith("Module: ") && !s.startsWith("Offset"); }) .filter(s -> { return !s.startsWith("Module: ") && !s.startsWith("Offset"); })