harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r727683 [11/11] - in /harmony/enhanced/classlib/branches/java6: ./ doc/ make/ modules/accessibility/src/main/java/javax/accessibility/ modules/archive/src/main/java/java/util/jar/ modules/archive/src/main/java/java/util/zip/ modules/archive...
Date Thu, 18 Dec 2008 09:46:26 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java Thu Dec 18 01:46:12 2008
@@ -19,6 +19,7 @@
 
 import java.security.KeyStore;
 import java.security.KeyStoreException;
+import java.security.KeyStore.Builder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,13 +32,30 @@
  * methods.
  */
 public class KeyStoreBuilderParametersTest extends TestCase {
+    
+    class EmptyBuilder extends KeyStore.Builder {
+        @Override
+        public KeyStore getKeyStore() throws KeyStoreException {
+            return null;
+        }
+
+        @Override
+        public KeyStore.ProtectionParameter getProtectionParameter(String alias)
+                throws KeyStoreException {
+            return null;
+        }
+    }
 
     /*
      * Class under test for void KeyStoreBuilderParameters(KeyStore.Builder)
      */
     public final void testKeyStoreBuilderParametersBuilder() {
-        // should not throw NullPointerException
-        new KeyStoreBuilderParameters((KeyStore.Builder) null);
+        try {
+            new KeyStoreBuilderParameters((KeyStore.Builder) null);
+        } catch (NullPointerException e) {
+            // javadoc says this should throw NPE, but it doesn't
+            fail("no NPE expected");
+        }
     }
 
     /*
@@ -45,36 +63,37 @@
      */
     public final void testKeyStoreBuilderParametersList() {
         try {
-            new KeyStoreBuilderParameters((List) null);
-            fail("No expected NullPointerException");
+            new KeyStoreBuilderParameters((List<?>) null);
+            fail("expected a NPE");
         } catch (NullPointerException e) {
         }
 
         try {
-            new KeyStoreBuilderParameters(new ArrayList());
-            fail("No expected IllegalArgumentException");
+            new KeyStoreBuilderParameters(new ArrayList<Builder>());
+            fail("expected a IAE");
         } catch (IllegalArgumentException e) {
         }
 
     }
 
+    @SuppressWarnings("unchecked")
     public final void testGetParameters() {
-        List ksbuilders;
-        KeyStore.Builder builder = new myBuilder();
-        List result;
+        List<Builder> ksbuilders;
+        KeyStore.Builder builder = new EmptyBuilder();
+        List<Object> result;
         KeyStoreBuilderParameters param = new KeyStoreBuilderParameters(builder);
         result = param.getParameters();
         try {
-            result.add(new myBuilder());
+            result.add(new EmptyBuilder());
             fail("The list is modifiable");
         } catch (UnsupportedOperationException e) {
         }
         assertEquals("incorrect size", 1, result.size());
         assertTrue("incorrect list", result.contains(builder));
         
-        ksbuilders = new ArrayList();
+        ksbuilders = new ArrayList<Builder>();
         ksbuilders.add(builder);
-        ksbuilders.add(new myBuilder());  
+        ksbuilders.add(new EmptyBuilder());  
         param = new KeyStoreBuilderParameters(ksbuilders);
         result = param.getParameters();
         try {
@@ -86,14 +105,3 @@
         assertTrue("incorrect list", result.containsAll(ksbuilders));
     }
 }
-
-class myBuilder extends KeyStore.Builder {
-    public KeyStore getKeyStore() throws KeyStoreException {
-        return null;
-    }
-
-    public KeyStore.ProtectionParameter getProtectionParameter(String alias)
-            throws KeyStoreException {
-        return null;
-    }
-}

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext1Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext1Test.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext1Test.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext1Test.java Thu Dec 18 01:46:12 2008
@@ -42,7 +42,7 @@
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.harmony.security.fortress.Services;
-import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.xnet.tests.support.SpiEngUtils;
 import org.apache.harmony.xnet.tests.support.MySSLContextSpi;
 import junit.framework.TestCase;
 
@@ -505,4 +505,4 @@
     public MySSLContext(){
         super(null, null, null);
     }
-}
\ No newline at end of file
+}

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext2Test.java Thu Dec 18 01:46:12 2008
@@ -29,7 +29,7 @@
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.TrustManager;
 
-import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.xnet.tests.support.SpiEngUtils;
 import org.apache.harmony.xnet.tests.support.MySSLContextSpi;
 import junit.framework.TestCase;
 
@@ -59,6 +59,7 @@
 
     Provider mProv;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MySSLContextProvider", "Provider for testing",
@@ -70,6 +71,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         Security.removeProvider(mProv.getName());

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java Thu Dec 18 01:46:12 2008
@@ -373,6 +373,7 @@
         super(host, port);
     }
 
+    @Override
     public void beginHandshake() throws SSLException {
         String host = super.getPeerHost();
         if ((host == null) || (host.length() == 0)) {
@@ -380,94 +381,117 @@
         }
     }
 
+    @Override
     public void closeInbound() throws SSLException {
     }
 
+    @Override
     public void closeOutbound() {
     }
 
+    @Override
     public Runnable getDelegatedTask() {
         return null;
     }
 
+    @Override
     public String[] getEnabledCipherSuites() {
         return enabledCipherSuites;
     }
 
+    @Override
     public String[] getEnabledProtocols() {
         return enabledProtocols;
     }
 
+    @Override
     public boolean getEnableSessionCreation() {
         return enableSessionCreation;
     }
 
+    @Override
     public SSLEngineResult.HandshakeStatus getHandshakeStatus() {
         return SSLEngineResult.HandshakeStatus.FINISHED;
     }
 
+    @Override
     public boolean getNeedClientAuth() {
         return needClientAuth;
     }
 
+    @Override
     public SSLSession getSession() {
         return null;
     }
 
+    @Override
     public String[] getSupportedCipherSuites() {
         return new String[0];
     }
 
+    @Override
     public String[] getSupportedProtocols() {
         return new String[0];
     }
 
+    @Override
     public boolean getUseClientMode() {
         return useClientMode;
     }
 
+    @Override
     public boolean getWantClientAuth() {
         return wantClientAuth;
     }
 
+    @Override
     public boolean isInboundDone() {
         return false;
     }
 
+    @Override
     public boolean isOutboundDone() {
         return false;
     }
 
+    @Override
     public void setEnabledCipherSuites(String[] suites) {
         enabledCipherSuites = suites;
     }
 
+    @Override
     public void setEnabledProtocols(String[] protocols) {
         enabledProtocols = protocols;
     }
 
+    @Override
     public void setEnableSessionCreation(boolean flag) {
         enableSessionCreation = flag;
     }
 
+    @Override
     public void setNeedClientAuth(boolean need) {
         needClientAuth = need;
     }
 
+    @Override
     public void setUseClientMode(boolean mode) {
         useClientMode = mode;
     }
 
+    @Override
     public void setWantClientAuth(boolean want) {
         wantClientAuth = want;
     }
 
+    @Override
     public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts,
             int offset, int length) throws SSLException {
         return new SSLEngineResult(SSLEngineResult.Status.OK,
                 SSLEngineResult.HandshakeStatus.FINISHED, 1, 2);
     }
 
+    @Override
     public SSLEngineResult wrap(ByteBuffer[] srcs, int offset, int length,
             ByteBuffer dst) throws SSLException {
         return new SSLEngineResult(SSLEngineResult.Status.OK,
@@ -496,6 +520,7 @@
         super(host, port);
     }
 
+    @Override
     public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer dst)
             throws SSLException {
         if (src.limit() > dst.limit()) {
@@ -504,6 +529,7 @@
         return super.unwrap(src, dst);
     }
 
+    @Override
     public SSLEngineResult unwrap(ByteBuffer src, ByteBuffer[] dsts)
             throws SSLException {
         if (src.limit() > dsts[0].limit()) {
@@ -512,6 +538,7 @@
         return super.unwrap(src, dsts);
     }
 
+    @Override
     public SSLEngineResult wrap(ByteBuffer[] srcs, ByteBuffer dst)
             throws SSLException {
         if (srcs[0].limit() > dst.limit()) {
@@ -520,6 +547,7 @@
         return super.wrap(srcs, dst);
     }
 
+    @Override
     public SSLEngineResult wrap(ByteBuffer src, ByteBuffer dst)
             throws SSLException {
         if (src.limit() > dst.limit()) {

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java Thu Dec 18 01:46:12 2008
@@ -31,19 +31,13 @@
      * Class under test for void SSLPermission(String)
      */
     public void testSSLPermissionString() {
-        SSLPermission p = new SSLPermission("name");
-        if (p == null) {
-            fail("null permission");
-        }
+       new SSLPermission("name");
     }
 
     /*
      * Class under test for void SSLPermission(String, String)
      */
     public void testSSLPermissionStringString() {
-        SSLPermission p = new SSLPermission("name", "action");
-        if (p == null) {
-            fail("null permission");
-        }
+        new SSLPermission("name", "action");
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java Thu Dec 18 01:46:12 2008
@@ -96,52 +96,66 @@
         super(port, backlog, address);
     }
 
+    @Override
     public String[] getEnabledCipherSuites() {
         return null;
     }
 
+    @Override
     public void setEnabledCipherSuites(String[] suites) {
     }
 
+    @Override
     public String[] getSupportedCipherSuites() {
         return null;
     }
 
+    @Override
     public String[] getSupportedProtocols() {
         return null;
     }
 
+    @Override
     public String[] getEnabledProtocols() {
         return null;
     }
 
+    @Override
     public void setEnabledProtocols(String[] protocols) {
     }
 
+    @Override
     public void setNeedClientAuth(boolean need) {
     }
 
+    @Override
     public boolean getNeedClientAuth() {
         return false;
     }
 
+    @Override
     public void setWantClientAuth(boolean want) {
     }
 
+    @Override
     public boolean getWantClientAuth() {
         return false;
     }
 
+    @Override
     public void setUseClientMode(boolean mode) {
     }
 
+    @Override
     public boolean getUseClientMode() {
         return false;
     }
 
+    @Override
     public void setEnableSessionCreation(boolean flag) {
     }
 
+    @Override
     public boolean getEnableSessionCreation() {
         return false;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java Thu Dec 18 01:46:12 2008
@@ -127,67 +127,85 @@
         super(host, port, clientAddress, clientPort);
     }
 
+    @Override
     public String[] getSupportedCipherSuites() {
         return null;
     }
 
+    @Override
     public String[] getEnabledCipherSuites() {
         return null;
     }
 
+    @Override
     public void setEnabledCipherSuites(String[] suites) {
     }
 
+    @Override
     public String[] getSupportedProtocols() {
         return null;
     }
 
+    @Override
     public String[] getEnabledProtocols() {
         return null;
     }
 
+    @Override
     public void setEnabledProtocols(String[] protocols) {
     }
 
+    @Override
     public SSLSession getSession() {
         return null;
     }
 
+    @Override
     public void addHandshakeCompletedListener(
             HandshakeCompletedListener listener) {
     }
 
+    @Override
     public void removeHandshakeCompletedListener(
             HandshakeCompletedListener listener) {
     }
 
+    @Override
     public void startHandshake() throws IOException {
     }
 
+    @Override
     public void setUseClientMode(boolean mode) {
     }
 
+    @Override
     public boolean getUseClientMode() {
         return false;
     }
 
+    @Override
     public void setNeedClientAuth(boolean need) {
     }
 
+    @Override
     public boolean getNeedClientAuth() {
         return false;
     }
 
+    @Override
     public void setWantClientAuth(boolean want) {
     }
 
+    @Override
     public boolean getWantClientAuth() {
         return false;
     }
 
+    @Override
     public void setEnableSessionCreation(boolean flag) {
     }
 
+    @Override
     public boolean getEnableSessionCreation() {
         return false;
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java Thu Dec 18 01:46:12 2008
@@ -30,7 +30,7 @@
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.TrustManagerFactorySpi;
 
-import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.xnet.tests.support.SpiEngUtils;
 import org.apache.harmony.xnet.tests.support.MyTrustManagerFactorySpi;
 import junit.framework.TestCase;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory2Test.java Thu Dec 18 01:46:12 2008
@@ -28,7 +28,7 @@
 import javax.net.ssl.ManagerFactoryParameters;
 import javax.net.ssl.TrustManagerFactory;
 
-import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.xnet.tests.support.SpiEngUtils;
 import org.apache.harmony.xnet.tests.support.MyTrustManagerFactorySpi;
 import junit.framework.TestCase;
 
@@ -56,6 +56,7 @@
 
     Provider mProv;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         mProv = (new SpiEngUtils()).new MyProvider("MyTMFProvider",
@@ -67,6 +68,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         Security.removeProvider(mProv.getName());

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java Thu Dec 18 01:46:12 2008
@@ -33,6 +33,7 @@
 public class HandshakeCompletedEventTest extends SerializationTest implements
         SerializationTest.SerializableAssert {
 
+    @Override
     protected Object[] getData() {
         try {
             SSLContext cont = SSLContext.getInstance("TLS");

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java Thu Dec 18 01:46:12 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         String msg = null;
         Exception cause = new Exception(msgs[1]);

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java Thu Dec 18 01:46:12 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         return new Object[] { new SSLHandshakeException(null),
                 new SSLHandshakeException(msgs[0]), new SSLHandshakeException(msgs[1]) };

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java Thu Dec 18 01:46:12 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         return new Object[] { new SSLKeyException(null),
                 new SSLKeyException(msgs[0]), new SSLKeyException(msgs[1]) };

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java Thu Dec 18 01:46:12 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         return new Object[] { new SSLPeerUnverifiedException(null),
                 new SSLPeerUnverifiedException(msgs[0]), new SSLPeerUnverifiedException(msgs[1]) };

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java Thu Dec 18 01:46:12 2008
@@ -38,6 +38,7 @@
             "New message",
             "Long message for Exception. Long message for Exception. Long message for Exception." };
 
+    @Override
     protected Object[] getData() {
         return new Object[] { new SSLProtocolException(null),
                 new SSLProtocolException(msgs[0]), new SSLProtocolException(msgs[1]) };

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java Thu Dec 18 01:46:12 2008
@@ -33,6 +33,7 @@
 public class SSLSessionBindingEventTest extends SerializationTest implements
         SerializationTest.SerializableAssert {
 
+    @Override
     protected Object[] getData() {
         try {
             SSLContext cont = SSLContext.getInstance("TLS");

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java Thu Dec 18 01:46:12 2008
@@ -77,15 +77,18 @@
     }
 }
 class MyServerSocketFactory extends ServerSocketFactory {
+    @Override
     public ServerSocket createServerSocket(int port) throws IOException, UnknownHostException {
         throw new IOException();
     }
     
+    @Override
     public ServerSocket createServerSocket(int port, int backlog)
             throws IOException, UnknownHostException {
         throw new IOException();
     }
     
+    @Override
     public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress) throws IOException {
         throw new IOException();
      }

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java Thu Dec 18 01:46:12 2008
@@ -82,19 +82,23 @@
     }
 }
 class MySocketFactory extends SocketFactory {
+    @Override
     public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
         throw new IOException();
     }
     
+    @Override
     public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
             throws IOException, UnknownHostException {
         throw new IOException();
     }
     
+    @Override
     public Socket createSocket(InetAddress host, int port) throws IOException {
         throw new IOException();
      }
     
+    @Override
     public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
             throws IOException {
         throw new IOException();

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java Thu Dec 18 01:46:12 2008
@@ -15,10 +15,7 @@
  *  limitations under the License.
  */
 
-/**
- * @author Boris V. Kuznetsov
- * @version $Revision$
- */
+
 package javax.net.ssl;
 
 import java.io.IOException;

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLSocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLSocketFactoryTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLSocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLSocketFactoryTest.java Thu Dec 18 01:46:12 2008
@@ -15,10 +15,7 @@
  *  limitations under the License.
  */
 
-/**
- * @author Boris V. Kuznetsov
- * @version $Revision$
- */
+
 package javax.net.ssl;
 
 import java.io.IOException;

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java Thu Dec 18 01:46:12 2008
@@ -62,6 +62,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getCipherSuite()
      */
+    @Override
     public String getCipherSuite() {
         return null;
     }
@@ -69,6 +70,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getLocalCertificates()
      */
+    @Override
     public Certificate[] getLocalCertificates() {
         return null;
     }
@@ -76,6 +78,7 @@
     /*
      * @see javax.net.ssl.HttpsURLConnection#getServerCertificates()
      */
+    @Override
     public Certificate[] getServerCertificates()
             throws SSLPeerUnverifiedException {
         return null;
@@ -84,12 +87,14 @@
     /*
      * @see java.net.HttpURLConnection#disconnect()
      */
+    @Override
     public void disconnect() {
     }
 
     /*
      * @see java.net.HttpURLConnection#usingProxy()
      */
+    @Override
     public boolean usingProxy() {
         return false;
     }
@@ -97,6 +102,7 @@
     /*
      * @see java.net.URLConnection#connect()
      */
+    @Override
     public void connect() throws IOException {
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java Thu Dec 18 01:46:12 2008
@@ -40,6 +40,7 @@
     /*
      * @see TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         String defaultName = Security.getProperty("ssl.ServerSocketFactory.provider");
@@ -62,6 +63,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java Thu Dec 18 01:46:12 2008
@@ -40,6 +40,7 @@
     /*
      * @see TestCase#setUp()
      */
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
         String defaultName = Security.getProperty("ssl.SocketFactory.provider");
@@ -62,6 +63,7 @@
     /*
      * @see TestCase#tearDown()
      */
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java Thu Dec 18 01:46:12 2008
@@ -33,6 +33,7 @@
     private PrivateKey key;
     private Certificate cert;
     
+    @Override
     public void setUp() throws Exception {
 
         char[] pwd = JSSETestData.KS_PASSWORD;

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java Thu Dec 18 01:46:12 2008
@@ -50,6 +50,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() throws Exception {
         if (doLog) {
             System.out.println("");

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java Thu Dec 18 01:46:12 2008
@@ -36,6 +36,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() {
         if (doLog) {
             System.out.println("");
@@ -61,6 +62,7 @@
 
             final SSLServerSocket s = ssocket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.accept().close();
@@ -118,6 +120,7 @@
 
             final SSLServerSocket s = ssocket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.accept().close();
@@ -175,6 +178,7 @@
 
             final SSLServerSocket s = ssocket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.accept().close();
@@ -232,6 +236,7 @@
 
             final SSLServerSocket s = ssocket;
             Thread thread = new Thread() {
+                @Override
                 public void run() {
                     try {
                         s.accept().close();
@@ -598,6 +603,7 @@
             return client.getLocalPort();
         }
 
+        @Override
         public void run() {
             while (!closed) {
                 try {

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java Thu Dec 18 01:46:12 2008
@@ -44,6 +44,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         if (doLog) {
@@ -53,6 +54,7 @@
         }
     }
 
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
     }
@@ -293,6 +295,7 @@
             final SSLServerSocket ss = ssocket;
             final SSLSocket s = csocket;
             server = new Thread() {
+                @Override
                 public void run() {
                     InputStream is = null;
                     OutputStream os = null;
@@ -362,6 +365,7 @@
             };
 
             client = new Thread() {
+                @Override
                 public void run() {
                     InputStream is = null;
                     OutputStream os = null;

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java Thu Dec 18 01:46:12 2008
@@ -51,6 +51,7 @@
     /**
      * Sets up the test case.
      */
+    @Override
     public void setUp() throws Exception {
         if (doLog) {
             System.out.println("========================");
@@ -187,6 +188,7 @@
             final SSLServerSocket ss = ssocket;
             final SSLSocket s = csocket;
             server = new Thread() {
+                @Override
                 public void run() {
                     InputStream is = null;
                     OutputStream os = null;
@@ -256,6 +258,7 @@
             };
 
             client = new Thread() {
+                @Override
                 public void run() {
                     InputStream is = null;
                     OutputStream os = null;

Modified: harmony/enhanced/classlib/branches/java6/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/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java Thu Dec 18 01:46:12 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/branches/java6/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/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java Thu Dec 18 01:46:12 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/branches/java6/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/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java Thu Dec 18 01:46:12 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/branches/java6/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/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java Thu Dec 18 01:46:12 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/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java Thu Dec 18 01:46:12 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/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java Thu Dec 18 01:46:12 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/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java Thu Dec 18 01:46:12 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/branches/java6/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/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java Thu Dec 18 01:46:12 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/branches/java6/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/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java Thu Dec 18 01:46:12 2008
@@ -41,6 +41,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) {
@@ -50,6 +51,7 @@
         init = true;
     }
 
+    @Override
     protected SSLSocketFactory engineGetSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -57,6 +59,7 @@
         return null;
     }
 
+    @Override
     protected SSLServerSocketFactory engineGetServerSocketFactory() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -64,6 +67,7 @@
         return null;
     }
 
+    @Override
     protected SSLSessionContext engineGetServerSessionContext() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -71,6 +75,7 @@
         return null;
     }
 
+    @Override
     protected SSLSessionContext engineGetClientSessionContext() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -81,6 +86,7 @@
     /*
      * FIXME: add these methods
      */   
+    @Override
     protected SSLEngine engineCreateSSLEngine(String host, int port) {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -88,6 +94,7 @@
         return new tmpSSLEngine(host, port);
     }
 
+    @Override
     protected SSLEngine engineCreateSSLEngine() {
         if (!init) {
             throw new RuntimeException("Not initialiazed");
@@ -106,38 +113,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/branches/java6/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/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java?rev=727683&r1=727682&r2=727683&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java Thu Dec 18 01:46:12 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;
     }



Mime
View raw message