equal
deleted
inserted
replaced
33 import java.util.function.Supplier; |
33 import java.util.function.Supplier; |
34 import java.util.regex.Matcher; |
34 import java.util.regex.Matcher; |
35 import java.util.regex.Pattern; |
35 import java.util.regex.Pattern; |
36 import java.util.stream.Collectors; |
36 import java.util.stream.Collectors; |
37 import java.util.stream.Stream; |
37 import java.util.stream.Stream; |
38 import jdk.jpackage.internal.ApplicationLayout; |
38 import jdk.incubator.jpackage.internal.ApplicationLayout; |
39 import jdk.jpackage.test.Functional.ThrowingConsumer; |
39 import jdk.jpackage.test.Functional.ThrowingConsumer; |
40 import jdk.jpackage.test.Functional.ThrowingFunction; |
40 import jdk.jpackage.test.Functional.ThrowingFunction; |
41 |
41 |
42 /** |
42 /** |
43 * jpackage command line with prerequisite actions. Prerequisite actions can be |
43 * jpackage command line with prerequisite actions. Prerequisite actions can be |
684 } |
684 } |
685 return path; |
685 return path; |
686 } |
686 } |
687 |
687 |
688 public static Stream<String> filterOutput(Stream<String> jpackageOutput) { |
688 public static Stream<String> filterOutput(Stream<String> jpackageOutput) { |
689 // Skip "WARNING: Using experimental tool jpackage" first line of output |
689 // Skip "WARNING: Using incubator ..." first line of output |
690 return jpackageOutput.skip(1); |
690 return jpackageOutput.skip(1); |
691 } |
691 } |
692 |
692 |
693 public static List<String> filterOutput(List<String> jpackageOutput) { |
693 public static List<String> filterOutput(List<String> jpackageOutput) { |
694 return filterOutput(jpackageOutput.stream()).collect(Collectors.toList()); |
694 return filterOutput(jpackageOutput.stream()).collect(Collectors.toList()); |