directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1296256 - in /directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc: AbstractKerberosITest.java KerberosTcpITest.java KerberosUdpITest.java
Date Fri, 02 Mar 2012 15:43:32 GMT
Author: elecharny
Date: Fri Mar  2 15:43:32 2012
New Revision: 1296256

URL: http://svn.apache.org/viewvc?rev=1296256&view=rev
Log:
Fixed a port conflict in kerberos tests

Modified:
    directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
    directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java
    directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java

Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java?rev=1296256&r1=1296255&r2=1296256&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
(original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
Fri Mar  2 15:43:32 2012
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEqu
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.Collections;
 
 import javax.security.auth.Subject;
@@ -125,6 +124,7 @@ public class AbstractKerberosITest exten
 
         assertEquals( 2, subject.getPrivateCredentials().size() );
         assertEquals( 0, subject.getPublicCredentials().size() );
+        
         for ( KerberosTicket kt : subject.getPrivateCredentials( KerberosTicket.class ) )
         {
             // System.out.println( kt.getClient() );
@@ -206,7 +206,7 @@ public class AbstractKerberosITest exten
         data += "permitted_enctypes = " + encryptionType.getName() + SystemUtils.LINE_SEPARATOR;
         //        data += "default_checksum = " + checksumType.getName() + SystemUtils.LINE_SEPARATOR;
         //        data += "ap_req_checksum_type = " + checksumType.getName() + SystemUtils.LINE_SEPARATOR;
-        data += "checksum_type = " + checksumType + SystemUtils.LINE_SEPARATOR;
+        data += "default-checksum_type = " + checksumType.getName() + SystemUtils.LINE_SEPARATOR;
         
         if ( isTcp )
         {

Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java?rev=1296256&r1=1296255&r2=1296256&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java
(original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java
Fri Mar  2 15:43:32 2012
@@ -40,8 +40,8 @@ import org.junit.runner.RunWith;
  * Tests to obtain TGTs and Service Tickets from KDCs via TCP.
  * 
  * We use some internal knowledge of the Sun/Oracle implementation here to force
- * the usage of TCP and checksum: 
- * <li>In sun.security.krb5.KrbKdcReq the static field udpPrefLimit is set to 1 
+ * the usage of TCP and checksum:
+ * <li>In sun.security.krb5.KrbKdcReq the static field udpPrefLimit is set to 1
  * which means that TCP is always used.
  * <li>In sun.security.krb5.Checksum the static field CKSUMTYPE_DEFAULT is set
  * to the appropriate checksum value.
@@ -69,7 +69,7 @@ Project</a>
 @CreateKdcServer(
     transports =
         {
-            @CreateTransport(protocol = "TCP")
+            @CreateTransport(protocol = "TCP", port = 6086)
     })
 @ApplyLdifFiles("org/apache/directory/server/kerberos/kdc/KerberosIT.ldif")
 public class KerberosTcpITest extends AbstractKerberosITest
@@ -82,7 +82,7 @@ public class KerberosTcpITest extends Ab
     @Test
     public void testObtainTickets_DES_CBC_MD5() throws Exception
     {
-        // TODO: rsa-md5-des 
+        // TODO: rsa-md5-des
         // RFC3961, Section 6.2.1: des-cbc-md5 + rsa-md5-des
         ObtainTicketParameters parameters = new ObtainTicketParameters( TcpTransport.class,
             EncryptionType.DES_CBC_MD5, ChecksumType.RSA_MD5 );

Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java?rev=1296256&r1=1296255&r2=1296256&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java
(original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java
Fri Mar  2 15:43:32 2012
@@ -63,12 +63,13 @@ import org.junit.runner.RunWith;
 @CreateLdapServer(
     transports =
         {
-            @CreateTransport(protocol = "LDAP")
+            @CreateTransport(protocol = "LDAP" )
     })
 @CreateKdcServer(
     transports =
         {
-            @CreateTransport(protocol = "UDP")
+            @CreateTransport(protocol = "TCP", port = 6087),
+            @CreateTransport(protocol = "UDP", port = 6087)
     })
 @ApplyLdifFiles("org/apache/directory/server/kerberos/kdc/KerberosIT.ldif")
 public class KerberosUdpITest extends AbstractKerberosITest



Mime
View raw message