Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8259814: test/jdk/tools/jlink/plugins/CompressorPluginTest.java has c…
…ompilation issues

Reviewed-by: alanb
  • Loading branch information
sundararajana committed Feb 1, 2021
1 parent aec0377 commit c0cde7d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
1 change: 0 additions & 1 deletion test/jdk/ProblemList.txt
Expand Up @@ -776,7 +776,6 @@ sanity/client/SwingSet/src/ScrollPaneDemoTest.java 8225013 linux-all

tools/jlink/JLinkReproducibleTest.java 8217166 windows-all,linux-aarch64
tools/jlink/JLinkReproducible3Test.java 8253688 linux-aarch64
tools/jlink/plugins/CompressorPluginTest.java 8247407 generic-all

############################################################################

Expand Down
27 changes: 16 additions & 11 deletions test/jdk/tools/jlink/plugins/CompressorPluginTest.java
Expand Up @@ -95,17 +95,19 @@ public void test() throws Exception {

// compress level 0 == no compression
Properties options0 = new Properties();
options0.setProperty(DefaultCompressPlugin.NAME,
"0");
checkCompress(classes, new DefaultCompressPlugin(),
DefaultCompressPlugin compressPlugin = new DefaultCompressPlugin();
options0.setProperty(compressPlugin.getName(),
DefaultCompressPlugin.LEVEL_0);
checkCompress(classes, compressPlugin,
options0,
new ResourceDecompressorFactory[]{
});

// compress level 1 == String sharing
Properties options1 = new Properties();
options1.setProperty(DefaultCompressPlugin.NAME, "1");
checkCompress(classes, new DefaultCompressPlugin(),
compressPlugin = new DefaultCompressPlugin();
options1.setProperty(compressPlugin.getName(), DefaultCompressPlugin.LEVEL_1);
checkCompress(classes, compressPlugin,
options1,
new ResourceDecompressorFactory[]{
new StringSharingDecompressorFactory()
Expand All @@ -114,8 +116,9 @@ public void test() throws Exception {
// compress level 1 == String sharing + filter
options1.setProperty(DefaultCompressPlugin.FILTER,
"**Exception.class");
options1.setProperty(DefaultCompressPlugin.NAME, "1");
checkCompress(classes, new DefaultCompressPlugin(),
compressPlugin = new DefaultCompressPlugin();
options1.setProperty(compressPlugin.getName(), DefaultCompressPlugin.LEVEL_1);
checkCompress(classes, compressPlugin,
options1,
new ResourceDecompressorFactory[]{
new StringSharingDecompressorFactory()
Expand All @@ -125,8 +128,9 @@ public void test() throws Exception {
Properties options2 = new Properties();
options2.setProperty(DefaultCompressPlugin.FILTER,
"**Exception.class");
options2.setProperty(DefaultCompressPlugin.NAME, "2");
checkCompress(classes, new DefaultCompressPlugin(),
compressPlugin = new DefaultCompressPlugin();
options2.setProperty(compressPlugin.getName(), DefaultCompressPlugin.LEVEL_2);
checkCompress(classes, compressPlugin,
options2,
new ResourceDecompressorFactory[]{
new ZipDecompressorFactory()
Expand All @@ -135,8 +139,9 @@ public void test() throws Exception {
// compress level 2 == ZIP + filter
options2.setProperty(DefaultCompressPlugin.FILTER,
"**Exception.class");
options2.setProperty(DefaultCompressPlugin.NAME, "2");
checkCompress(classes, new DefaultCompressPlugin(),
compressPlugin = new DefaultCompressPlugin();
options2.setProperty(compressPlugin.getName(), DefaultCompressPlugin.LEVEL_2);
checkCompress(classes, compressPlugin,
options2,
new ResourceDecompressorFactory[]{
new ZipDecompressorFactory(),
Expand Down

1 comment on commit c0cde7d

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.