You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by zh...@apache.org on 2009/08/12 10:02:14 UTC
svn commit: r803405 - in
/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl:
java.injected/org/apache/harmony/xnet/provider/jsse/
java/org/apache/harmony/xnet/tests/provider/jsse/
Author: zhoukevin
Date: Wed Aug 12 08:02:13 2009
New Revision: 803405
URL: http://svn.apache.org/viewvc?rev=803405&view=rev
Log:
Fix test failures of CertificateMessageTest, CertificateRequestTest, TrustManagerImplTest and DigitalSignatureTest in x-net module for zOS
Modified:
harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java
harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java
harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java?rev=803405&r1=803404&r2=803405&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateMessageTest.java Wed Aug 12 08:02:13 2009
@@ -84,7 +84,7 @@
CertificateFactory certFactory = CertificateFactory.getInstance("X509");
ByteArrayInputStream bais = new ByteArrayInputStream(base64certEncoding
- .getBytes());
+ .getBytes("UTF-8"));
X509Certificate cert = (X509Certificate) certFactory.generateCertificate(bais);
CertificateMessage message = new CertificateMessage(
new X509Certificate[] { cert });
Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java?rev=803405&r1=803404&r2=803405&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CertificateRequestTest.java Wed Aug 12 08:02:13 2009
@@ -57,7 +57,7 @@
CertificateFactory certFactory = CertificateFactory.getInstance("X509");
ByteArrayInputStream bais = new ByteArrayInputStream(base64certEncoding
- .getBytes());
+ .getBytes("UTF-8"));
X509Certificate cert = (X509Certificate) certFactory.generateCertificate(bais);
X509Certificate[] accepted = {cert};
X500Principal[] certificate_authorities = {cert.getIssuerX500Principal()};
Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java?rev=803405&r1=803404&r2=803405&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java Wed Aug 12 08:02:13 2009
@@ -65,7 +65,7 @@
super.setUp();
CertificateFactory certFactory = CertificateFactory.getInstance("X509");
ByteArrayInputStream bais = new ByteArrayInputStream(base64certEncoding
- .getBytes());
+ .getBytes("UTF-8"));
X509Certificate cert = (X509Certificate) certFactory
.generateCertificate(bais);
untrustedChain = new X509Certificate[] { cert };
Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java?rev=803405&r1=803404&r2=803405&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java Wed Aug 12 08:02:13 2009
@@ -49,7 +49,7 @@
+ "0piKwYmLXtqi7BTgpgoDXtYi6VJYzvBxLhe050vi1lUNe2iCl/jsU4IcBCcOjV4CwbTDRhq6PzT7"
+ "70uWtMhAV28E/jcszlyxHYZ5qK0wp8BoBdcNQf3tihBuQkrsv57z94tbEJxg5JeMOl1aWVtw6LLR"
+ "K2GQBaDrwvy7R4FA2oOc/JS9PsiT0ieKO1dhPGmqJDaVMlZMFeUY41hTzU3BAmcjYBWQI2oNqHRv"
- + "ya9tUQIDAQAB").getBytes();
+ + "ya9tUQIDAQAB").getBytes("UTF-8");
byte[] b64PrivateKeySpec = ("MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCTur+p5srr+1IvJ1FQIC/BypGV"
+ "L3lpq7nGPZ8WktFhgbRq+47SpefXgc2agLyTO2TrpD7ihlL1KRBjCvbjH72J17Sz3F+NDmiEOljo"
@@ -72,7 +72,7 @@
+ "LZRbOXEAR4abQ4g0IDeLNZAFfHttdKTesIrCH54R/tP2Eq/8w3U+hvhxltjqd9keKUBJFvlVSJAI"
+ "6qJhAoGBAJU8ET4NHv4/AS3SiTcg65TE4ktrTsVZixNYVORE32bFZCZClWLI2aUattiIk8UqvG74"
+ "wugnxUGk8tJMcw1J/gh+UlnGrX7HqiWTCzEyepOiDQV3NkOQ+9z9WeQNNUtQyIFZZB4wQHaH21BB"
- + "a1kmrzyqihpAVWrpBOJCipel8S0X").getBytes();
+ + "a1kmrzyqihpAVWrpBOJCipel8S0X").getBytes("UTF-8");
// Create public/private keys and certificate
KeyFactory keyFactory = KeyFactory.getInstance("RSA");