harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r726511 [3/3] - in /harmony/enhanced/classlib/trunk/modules/x-net/src: main/java/javax/net/ main/java/javax/net/ssl/ main/java/org/apache/harmony/xnet/provider/jsse/ test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/ test/api/java/o...
Date Sun, 14 Dec 2008 18:30:19 GMT
Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.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/SSLSocketImplTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java
Sun Dec 14 10:30:16 2008
@@ -42,6 +42,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() throws Exception {
         if (doLog) {
             System.out.println("");
@@ -77,6 +78,7 @@
             server.start();
             final SSLSocket s = socket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.startHandshake();
@@ -134,6 +136,7 @@
             server.start();
             final SSLSocket s = socket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.startHandshake();
@@ -194,6 +197,7 @@
             server.start();
             final SSLSocket s = socket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.startHandshake();
@@ -253,6 +257,7 @@
             server.start();
             final SSLSocket s = socket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.startHandshake();
@@ -313,6 +318,7 @@
             server.start();
             final SSLSocket s = socket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.startHandshake();
@@ -588,6 +594,7 @@
             return server.getLocalPort();
         }
 
+        @Override
         public void run() {
             while (!closed) {
                 try {
@@ -644,6 +651,7 @@
             server.start();
             final SSLSocket s = socket;
             new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.startHandshake();
@@ -753,6 +761,7 @@
             final SSLSocket s = socket;
             final SSLSession[] session = new SSLSession[1];
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         session[0] = s.getSession();
@@ -857,6 +866,7 @@
             final SSLSocket s = socket;
             final Exception[] exception = new Exception[1];
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.startHandshake();
@@ -914,6 +924,7 @@
             server.start();
             final SSLSocket s = socket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.getInputStream().read(); // should start handshake
@@ -969,6 +980,7 @@
             server.start();
             final SSLSocket s = socket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.getOutputStream().write(0); // should start handshake

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.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/ServerHandshakeImplTest.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java
Sun Dec 14 10:30:16 2008
@@ -39,7 +39,8 @@
   private SSLParameters sslParameters;
   private ServerHandshakeImpl server;
 
-  public void setUp() throws Exception {
+  @Override
+public void setUp() throws Exception {
         char[] pwd = JSSETestData.KS_PASSWORD;
         KeyStore ks = JSSETestData.getKeyStore();
 

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=726511&r1=726510&r2=726511&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
Sun Dec 14 10:30:16 2008
@@ -60,6 +60,7 @@
 
     private X509Certificate[] untrustedChain;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         CertificateFactory certFactory = CertificateFactory.getInstance("X509");

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=726511&r1=726510&r2=726511&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
Sun Dec 14 10:30:16 2008
@@ -86,23 +86,28 @@
         @SuppressWarnings("serial")
         Certificate cert = new Certificate("myType") {
 
+            @Override
             public PublicKey getPublicKey() {
                 return publicKey;
             }
 
+            @Override
             public byte[] getEncoded() {
                 return null;
             }
 
+            @Override
             public String toString() {
                 return null;
             }
 
+            @Override
             public void verify(PublicKey key) throws CertificateException,
                     NoSuchAlgorithmException, InvalidKeyException,
                     NoSuchProviderException, SignatureException {
             }
 
+            @Override
             public void verify(PublicKey key, String sigProvider)
                     throws CertificateException, NoSuchAlgorithmException,
                     InvalidKeyException, NoSuchProviderException,

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java
Sun Dec 14 10:30:16 2008
@@ -36,6 +36,7 @@
 
 public class MyKeyManagerFactorySpi extends KeyManagerFactorySpi {
     
+    @Override
     protected void engineInit(KeyStore ks, char[] password)
             throws KeyStoreException, NoSuchAlgorithmException,
             UnrecoverableKeyException {
@@ -47,6 +48,7 @@
         }
     }
 
+    @Override
     protected void engineInit(ManagerFactoryParameters spec)
             throws InvalidAlgorithmParameterException {
         if (spec == null) {
@@ -64,6 +66,7 @@
         }
     }
 
+    @Override
     protected KeyManager[] engineGetKeyManagers() {
         return null;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
Sun Dec 14 10:30:16 2008
@@ -34,6 +34,7 @@
 
 public class MySSLContextSpi extends SSLContextSpi {
     private boolean init = false;
+    @Override
     protected void engineInit(KeyManager[] km, TrustManager[] tm,
             SecureRandom sr) throws KeyManagementException {
         if (sr == null) {
@@ -43,6 +44,7 @@
         init = true;
     }
 
+    @Override
     protected SSLSocketFactory engineGetSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -50,6 +52,7 @@
         return null;
     }
 
+    @Override
     protected SSLServerSocketFactory engineGetServerSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -57,6 +60,7 @@
         return null;
     }
 
+    @Override
     protected SSLSessionContext engineGetServerSessionContext() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -64,6 +68,7 @@
         return null;
     }
 
+    @Override
     protected SSLSessionContext engineGetClientSessionContext() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -74,6 +79,7 @@
     /*
      * FIXME: add these methods
      */   
+    @Override
     protected SSLEngine engineCreateSSLEngine(String host, int port) {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -81,6 +87,7 @@
         return new tmpSSLEngine(host, port);
     }
 
+    @Override
     protected SSLEngine engineCreateSSLEngine() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -99,38 +106,64 @@
             tmpHost = host;
             tmpPort = port;        
         }
+        @Override
         public String getPeerHost() {
             return tmpHost;        
         }
+        @Override
         public int getPeerPort() {
             return tmpPort;
         }
+        @Override
         public void beginHandshake() throws SSLException { }
+        @Override
         public void closeInbound() throws SSLException { }
+        @Override
         public void closeOutbound() {}
+        @Override
         public Runnable getDelegatedTask() { return null; }
+        @Override
         public String[] getEnabledCipherSuites() { return null; }
+        @Override
         public String[] getEnabledProtocols() {return null; }
+        @Override
         public boolean getEnableSessionCreation() { return true; }
+        @Override
         public SSLEngineResult.HandshakeStatus getHandshakeStatus() { return null; }
+        @Override
         public boolean getNeedClientAuth() { return true; }
+        @Override
         public SSLSession getSession() { return null; }
+        @Override
         public String[] getSupportedCipherSuites()  { return null; }
+        @Override
         public String[] getSupportedProtocols()  { return null; }
+        @Override
         public boolean getUseClientMode()  { return true; }
+        @Override
         public boolean getWantClientAuth()  { return true; }
+        @Override
         public boolean isInboundDone()  { return true; }
+        @Override
         public boolean isOutboundDone()  { return true; }
+        @Override
         public void setEnabledCipherSuites(String[] suites) { }
+        @Override
         public void setEnabledProtocols(String[] protocols) { }
+        @Override
         public void setEnableSessionCreation(boolean flag) { }
+        @Override
         public void setNeedClientAuth(boolean need) { }
+        @Override
         public void setUseClientMode(boolean mode) { }
+        @Override
         public void setWantClientAuth(boolean want) { }        
+        @Override
         public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts,
                 int offset, int length) throws SSLException {
             return null;
         }        
+        @Override
         public SSLEngineResult wrap(ByteBuffer[] srcs, int offset,
                 int length, ByteBuffer dst) throws SSLException { 
             return null;

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java
Sun Dec 14 10:30:16 2008
@@ -33,12 +33,14 @@
  */
 
 public class MyTrustManagerFactorySpi extends TrustManagerFactorySpi {
+    @Override
     protected void engineInit(KeyStore ks) throws KeyStoreException {
         if (ks == null) {
             throw new KeyStoreException("Not supported operation for null KeyStore");
         }
     }
 
+    @Override
     protected void engineInit(ManagerFactoryParameters spec)
             throws InvalidAlgorithmParameterException {
         if (spec == null) {
@@ -55,6 +57,7 @@
         }
     }
 
+    @Override
     protected TrustManager[] engineGetTrustManagers() {
         return null;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
Sun Dec 14 10:30:16 2008
@@ -35,6 +35,7 @@
 
 public class MyKeyManagerFactorySpi extends KeyManagerFactorySpi {
     
+    @Override
     protected void engineInit(KeyStore ks, char[] password)
             throws KeyStoreException, NoSuchAlgorithmException,
             UnrecoverableKeyException {
@@ -46,6 +47,7 @@
         }
     }
 
+    @Override
     protected void engineInit(ManagerFactoryParameters spec)
             throws InvalidAlgorithmParameterException {
         if (spec == null) {
@@ -63,6 +65,7 @@
         }
     }
 
+    @Override
     protected KeyManager[] engineGetKeyManagers() {
         return null;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
Sun Dec 14 10:30:16 2008
@@ -40,6 +40,7 @@
 
 public class MySSLContextSpi extends SSLContextSpi {
     private boolean init = false;
+    @Override
     protected void engineInit(KeyManager[] km, TrustManager[] tm,
             SecureRandom sr) throws KeyManagementException {
         if (sr == null) {
@@ -49,6 +50,7 @@
         init = true;
     }
 
+    @Override
     protected SSLSocketFactory engineGetSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -56,6 +58,7 @@
         return null;
     }
 
+    @Override
     protected SSLServerSocketFactory engineGetServerSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -63,6 +66,7 @@
         return null;
     }
 
+    @Override
     protected SSLSessionContext engineGetServerSessionContext() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -70,6 +74,7 @@
         return null;
     }
 
+    @Override
     protected SSLSessionContext engineGetClientSessionContext() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -80,6 +85,7 @@
     /*
      * FIXME: add these methods
      */   
+    @Override
     protected SSLEngine engineCreateSSLEngine(String host, int port) {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -87,6 +93,7 @@
         return new tmpSSLEngine(host, port);
     }
 
+    @Override
     protected SSLEngine engineCreateSSLEngine() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -105,38 +112,64 @@
             tmpHost = host;
             tmpPort = port;        
         }
+        @Override
         public String getPeerHost() {
             return tmpHost;        
         }
+        @Override
         public int getPeerPort() {
             return tmpPort;
         }
+        @Override
         public void beginHandshake() throws SSLException { }
+        @Override
         public void closeInbound() throws SSLException { }
+        @Override
         public void closeOutbound() {}
+        @Override
         public Runnable getDelegatedTask() { return null; }
+        @Override
         public String[] getEnabledCipherSuites() { return null; }
+        @Override
         public String[] getEnabledProtocols() {return null; }
+        @Override
         public boolean getEnableSessionCreation() { return true; }
+        @Override
         public SSLEngineResult.HandshakeStatus getHandshakeStatus() { return null; };
+        @Override
         public boolean getNeedClientAuth() { return true; }
+        @Override
         public SSLSession getSession() { return null; }
+        @Override
         public String[] getSupportedCipherSuites()  { return null; }
+        @Override
         public String[] getSupportedProtocols()  { return null; }
+        @Override
         public boolean getUseClientMode()  { return true; }
+        @Override
         public boolean getWantClientAuth()  { return true; }
+        @Override
         public boolean isInboundDone()  { return true; }
+        @Override
         public boolean isOutboundDone()  { return true; }
+        @Override
         public void setEnabledCipherSuites(String[] suites) { }
+        @Override
         public void setEnabledProtocols(String[] protocols) { }
+        @Override
         public void setEnableSessionCreation(boolean flag) { }
+        @Override
         public void setNeedClientAuth(boolean need) { }
+        @Override
         public void setUseClientMode(boolean mode) { }
+        @Override
         public void setWantClientAuth(boolean want) { }        
+        @Override
         public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts,
                 int offset, int length) throws SSLException {
             return null;
         }        
+        @Override
         public SSLEngineResult wrap(ByteBuffer[] srcs, int offset,
                 int length, ByteBuffer dst) throws SSLException { 
             return null;

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java
Sun Dec 14 10:30:16 2008
@@ -32,12 +32,14 @@
  */
 
 public class MyTrustManagerFactorySpi extends TrustManagerFactorySpi {
+    @Override
     protected void engineInit(KeyStore ks) throws KeyStoreException {
         if (ks == null) {
             throw new KeyStoreException("Not supported operation for null KeyStore");
         }
     }
 
+    @Override
     protected void engineInit(ManagerFactoryParameters spec)
             throws InvalidAlgorithmParameterException {
         if (spec == null) {
@@ -54,6 +56,7 @@
         }
     }
 
+    @Override
     protected TrustManager[] engineGetTrustManagers() {
         return null;
     }

Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/SpiEngUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/SpiEngUtils.java?rev=726511&r1=726510&r2=726511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/SpiEngUtils.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/SpiEngUtils.java
Sun Dec 14 10:30:16 2008
@@ -59,6 +59,8 @@
 
     public class MyProvider extends Provider {
 
+        private static final long serialVersionUID = 1L;
+
         public MyProvider(String name, String info, String key, String clName) {
             super(name, 1.0, info);
             put(key, clName);



Mime
View raw message