RFR : (XS) 8166432:Bad 8u112 merge of sun/security/tools/jarsigner/warnings/Test.java

[Vincent Ryan]

Looks fine to me.
Thanks.


> On 9 Nov 2016, at 11:26, Seán Coffey <sean.coffey at oracle.com> wrote:
> 
> A bad test code merge occurred when 8u112 and CPU code was being merged a few weeks ago. Some extra functionality added to a helper test was lost. This fix restores it. 8u applicable only.
> 
> diff --git a/test/sun/security/tools/jarsigner/warnings/Test.java b/test/sun/security/tools/jarsigner/warnings/Test.java
> --- a/test/sun/security/tools/jarsigner/warnings/Test.java
> +++ b/test/sun/security/tools/jarsigner/warnings/Test.java
> @@ -22,6 +22,11 @@
>  */
> 
> import jdk.testlibrary.OutputAnalyzer;
> +import jdk.testlibrary.ProcessTools;
> +
> +import java.util.ArrayList;
> +import java.util.Arrays;
> +import java.util.List;
> 
> /**
>  * Base class.
> @@ -175,4 +180,21 @@
>         }
>         analyzer.shouldContain(JAR_SIGNED);
>     }
> +
> +    protected OutputAnalyzer keytool(String... cmd) throws Throwable {
> +        return tool(KEYTOOL, cmd);
> }
> +
> +    protected OutputAnalyzer jarsigner(String... cmd) throws Throwable {
> +        return tool(JARSIGNER, cmd);
> +    }
> +
> +    private OutputAnalyzer tool(String tool, String... args) throws Throwable {
> +        List<String> cmd = new ArrayList<>();
> +        cmd.add(tool);
> +        cmd.add("-J-Duser.language=en");
> +        cmd.add("-J-Duser.country=US");
> +        cmd.addAll(Arrays.asList(args));
> +        return ProcessTools.executeCommand(cmd.toArray(new String[cmd.size()]));
> +    }
> +}
> 
> -- 
> Regards,
> Sean.
>