From 7ff645482d5d10f2c15955ed812de183dead5557 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Thu, 1 Dec 2016 17:47:47 +0000 Subject: [PATCH] Switch Base64 decoder implementation used in harmony SSL tests These tests were using libcore.io.Base64.decode() for test data. Since that class is deprecated and the tests weren't depending on the subtle behavioral differences relative java.util.Base64.getDecoder().decode(), this CL converts them to the latter implementation. Bug: 31292683 Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a Change-Id: I635625ceae9d6a33a4909101e65363d7052263d9 --- .../tests/javax/net/ssl/HandshakeCompletedEventTest.java | 4 ++-- .../harmony/tests/javax/net/ssl/SSLServerSocketTest.java | 5 ++--- .../apache/harmony/tests/javax/net/ssl/SSLSessionTest.java | 4 ++-- .../apache/harmony/tests/javax/net/ssl/SSLSocketTest.java | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java index bb2265fb7..74c3a7faf 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java @@ -25,6 +25,7 @@ import java.security.KeyStore; import java.security.cert.Certificate; import java.security.cert.CertificateException; +import java.util.Base64; import javax.net.ssl.HandshakeCompletedEvent; import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.KeyManager; @@ -39,7 +40,6 @@ import javax.net.ssl.X509TrustManager; import javax.security.cert.X509Certificate; import junit.framework.TestCase; -import libcore.io.Base64; import org.apache.harmony.xnet.tests.support.mySSLSession; /** @@ -535,7 +535,7 @@ public X509Certificate[] getChain() { * for the result. */ private KeyManager[] getKeyManagers(String keys) throws Exception { - byte[] bytes = Base64.decode(keys.getBytes()); + byte[] bytes = Base64.getDecoder().decode(keys.getBytes()); InputStream inputStream = new ByteArrayInputStream(bytes); KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java index 5a0cf6f84..117a1a078 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java @@ -18,8 +18,6 @@ import junit.framework.TestCase; -import libcore.io.Base64; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -27,6 +25,7 @@ import java.security.KeyStore; import java.security.SecureRandom; import java.util.Arrays; +import java.util.Base64; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; @@ -391,7 +390,7 @@ public void test_WantClientAuth() throws Exception { */ private KeyManager[] getKeyManagers() throws Exception { String keys = (useBKS ? SERVER_KEYS_BKS : SERVER_KEYS_JKS); - byte[] bytes = Base64.decode(keys.getBytes()); + byte[] bytes = Base64.getDecoder().decode(keys.getBytes()); InputStream inputStream = new ByteArrayInputStream(bytes); KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java index 018de8ce6..fde1ff809 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java @@ -26,6 +26,7 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.Arrays; +import java.util.Base64; import javax.net.ssl.ExtendedSSLSession; import javax.net.ssl.KeyManager; @@ -42,7 +43,6 @@ import org.apache.harmony.tests.javax.net.ssl.HandshakeCompletedEventTest.TestTrustManager; import junit.framework.TestCase; -import libcore.io.Base64; import libcore.java.security.StandardNames; public class SSLSessionTest extends TestCase { @@ -643,7 +643,7 @@ public KeyStore getStore() { * for the result. */ private KeyStore getKeyStore(String keys) throws Exception { - byte[] bytes = Base64.decode(keys.getBytes()); + byte[] bytes = Base64.getDecoder().decode(keys.getBytes()); InputStream inputStream = new ByteArrayInputStream(bytes); KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java index a791a7715..5712a48bd 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java @@ -24,6 +24,7 @@ import java.security.KeyStore; import java.security.SecureRandom; import java.util.Arrays; +import java.util.Base64; import javax.net.ssl.HandshakeCompletedEvent; import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.KeyManager; @@ -35,7 +36,6 @@ import javax.net.ssl.TrustManager; import javax.security.cert.X509Certificate; import junit.framework.TestCase; -import libcore.io.Base64; import libcore.java.security.StandardNames; import org.apache.harmony.tests.javax.net.ssl.HandshakeCompletedEventTest.TestTrustManager; @@ -587,7 +587,7 @@ public X509Certificate[] getChain() { * for the result. */ private KeyManager[] getKeyManagers(String keys) throws Exception { - byte[] bytes = Base64.decode(keys.getBytes()); + byte[] bytes = Base64.getDecoder().decode(keys.getBytes()); InputStream inputStream = new ByteArrayInputStream(bytes); KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());