diff a/test/jdk/java/security/KeyAgreement/KeySizeTest.java b/test/jdk/java/security/KeyAgreement/KeySizeTest.java --- a/test/jdk/java/security/KeyAgreement/KeySizeTest.java +++ b/test/jdk/java/security/KeyAgreement/KeySizeTest.java @@ -25,11 +25,10 @@ * @test * @bug 8184359 * @summary KeyLength support test for DiffieHellman, EC, XDH. * Arguments order * @library /test/lib - * @build jdk.test.lib.Convert * @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 512 * @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 768 * @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 832 * @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 1024 * @run main KeySizeTest DiffieHellman SunJCE DiffieHellman 2048 @@ -53,14 +52,14 @@ import java.security.interfaces.XECPublicKey; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; import java.security.spec.NamedParameterSpec; import java.util.Arrays; +import java.util.Hex; import javax.crypto.KeyAgreement; import javax.crypto.interfaces.DHPrivateKey; import javax.crypto.interfaces.DHPublicKey; -import jdk.test.lib.Convert; public class KeySizeTest { public static void main(String[] args) throws Exception { @@ -228,11 +227,11 @@ private static boolean equals(byte[] actual, byte[] expected) { boolean equals = Arrays.equals(actual, expected); if (!equals) { throw new RuntimeException(String.format("Actual array: %s, " - + "Expected array:%s", Convert.byteArrayToHexString(actual), - Convert.byteArrayToHexString(expected))); + + "Expected array:%s", Hex.encoder().encode(actual), + Hex.encoder().encode(expected))); } return equals; } }