directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r895161 - /directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
Date Sat, 02 Jan 2010 09:54:10 GMT
Author: kayyagari
Date: Sat Jan  2 09:54:09 2010
New Revision: 895161

URL: http://svn.apache.org/viewvc?rev=895161&view=rev
Log:
fixed the failing tests

Modified:
    directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java

Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=895161&r1=895160&r2=895161&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
Sat Jan  2 09:54:09 2010
@@ -56,6 +56,8 @@
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
 
+import org.apache.directory.server.annotations.CreateLdapServer;
+import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
@@ -63,6 +65,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.security.TlsKeyGenerator;
 import org.apache.directory.server.integ.ServerIntegrationUtils;
+import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.junit.After;
 import org.junit.Before;
@@ -84,6 +87,14 @@
  * @version $Rev: 639006 $
  */
 @RunWith ( FrameworkRunner.class ) 
+@CreateLdapServer ( 
+    transports = 
+    {
+        @CreateTransport( protocol = "LDAP" ),
+        @CreateTransport( protocol = "LDAPS" )
+    },
+    extendedOpHandlers={ StartTlsHandler.class }
+    )
 public class StartTlsIT extends AbstractLdapTestUnit
 {
     private static final Logger LOG = LoggerFactory.getLogger( StartTlsIT.class );
@@ -115,7 +126,6 @@
         }
         
         ksFile = File.createTempFile( "testStore", "ks" );
-        
         CoreSession session = ldapServer.getDirectoryService().getAdminSession();
         ClonedServerEntry entry = session.lookup( new LdapDN( "uid=admin,ou=system" ), CERT_IDS
);
         byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();



Mime
View raw message