You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/12/09 02:01:57 UTC
svn commit: r1043807 [1/2] - in
/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory:
server/ server/kerberos/ server/kerberos/shared/
server/kerberos/shared/crypto/ server/kerberos/shared/crypto/encryption/
server/kerberos/share...
Author: elecharny
Date: Thu Dec 9 01:01:55 2010
New Revision: 1043807
URL: http://svn.apache.org/viewvc?rev=1043807&view=rev
Log:
Merged the kerberos-codec branch, 6
Added:
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed)
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesEncryptionTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesEncryptionTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryptionTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryptionTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryptionTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryptionTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5EncryptionTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5EncryptionTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKeyTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKeyTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactoryTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactoryTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyTypeTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyTypeTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFoldTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFoldTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactoryTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactoryTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/VendorHelper.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/VendorHelper.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/ChecksumTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/ChecksumTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedDataTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedDataTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKeyTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKeyTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/KdcOptionsTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/KdcOptionsTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PaDataTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PaDataTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/flags/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/flags/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/flags/AbstractKerberosFlagsTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/flags/AbstractKerberosFlagsTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlagsTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlagsTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/replay/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/replay/
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImplTest.java
- copied unchanged from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImplTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/service/
- copied from r1043765, directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/service/
Modified:
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApRepDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApReqDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsRepDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsReqDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncAsRepPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTgsRepPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcRepDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java
Propchange: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec 9 01:01:55 2010
@@ -0,0 +1,4 @@
+/directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/src/test/java/org/apache/directory/server:982369-987590
+/directory/apacheds/branches/apacheds-config/kerberos-shared/src/test/java/org/apache/directory/server:1023442-1029077
+/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/test/java/org/apache/directory/server:980138-980936
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server:1040956-1043765
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdIfRelevantDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.adIfRelevant.AdIfRelevantContainer;
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
import org.apache.directory.shared.kerberos.components.AdIfRelevant;
-import org.apache.directory.shared.kerberos.components.AuthorizationData;
+import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -91,7 +91,7 @@ public class AdIfRelevantDecoderTest
String[] expected = new String[]{ "abcdef", "ghijkl" };
int i = 0;
- for ( AuthorizationData.AD ad : adIfRelevant.getAuthorizationData() )
+ for ( AuthorizationDataEntry ad : adIfRelevant.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -40,6 +40,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.PrincipalNameType;
import org.apache.directory.shared.kerberos.components.AdKdcIssued;
import org.apache.directory.shared.kerberos.components.AuthorizationData;
+import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
import org.apache.directory.shared.kerberos.components.Checksum;
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
@@ -139,7 +140,7 @@ public class AdKdcIssuedDecoderTest
String[] expected = new String[]{ "abcdef", "ghijkl" };
int i = 0;
- for ( AuthorizationData.AD ad : authData.getAuthorizationData() )
+ for ( AuthorizationDataEntry ad : authData.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
@@ -242,7 +243,7 @@ public class AdKdcIssuedDecoderTest
String[] expected = new String[]{ "abcdef", "ghijkl" };
int i = 0;
- for ( AuthorizationData.AD ad : authData.getAuthorizationData() )
+ for ( AuthorizationDataEntry ad : authData.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdMandatoryForKdcDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.adMandatoryForKdc.AdMandatoryForKdcContainer;
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
import org.apache.directory.shared.kerberos.components.AdMandatoryForKdc;
-import org.apache.directory.shared.kerberos.components.AuthorizationData;
+import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -91,7 +91,7 @@ public class AdMandatoryForKdcDecoderTes
String[] expected = new String[]{ "abcdef", "ghijkl" };
int i = 0;
- for ( AuthorizationData.AD ad : adMandatoryForKdc.getAuthorizationData() )
+ for ( AuthorizationDataEntry ad : adMandatoryForKdc.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApRepDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApRepDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApRepDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApRepDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -75,8 +75,7 @@ public class ApRepDecoderTest
stream.flip();
// Allocate a AsRep Container
- ApRepContainer apRepContainer = new ApRepContainer();
- apRepContainer.setStream( stream );
+ ApRepContainer apRepContainer = new ApRepContainer( stream );
// Decode the ApRep PDU
try
@@ -141,8 +140,7 @@ public class ApRepDecoderTest
stream.flip();
// Allocate a AsRep Container
- ApRepContainer apRepContainer = new ApRepContainer();
- apRepContainer.setStream( stream );
+ ApRepContainer apRepContainer = new ApRepContainer( stream );
// Decode the ApRep PDU
kerberosDecoder.decode( stream, apRepContainer );
@@ -166,7 +164,7 @@ public class ApRepDecoderTest
stream.flip();
// Allocate a AP-REP Container
- Asn1Container apRepContainer = new ApRepContainer();
+ Asn1Container apRepContainer = new ApRepContainer( stream );
// Decode the AP-REP PDU
kerberosDecoder.decode( stream, apRepContainer );
@@ -193,7 +191,7 @@ public class ApRepDecoderTest
stream.flip();
// Allocate a AP-REP Container
- Asn1Container apRepContainer = new ApRepContainer();
+ Asn1Container apRepContainer = new ApRepContainer( stream );
// Decode the AP-REP PDU
kerberosDecoder.decode( stream, apRepContainer );
@@ -221,7 +219,7 @@ public class ApRepDecoderTest
stream.flip();
// Allocate a AP-REP Container
- Asn1Container apRepContainer = new ApRepContainer();
+ Asn1Container apRepContainer = new ApRepContainer( stream );
// Decode the AP-REP PDU
kerberosDecoder.decode( stream, apRepContainer );
@@ -250,7 +248,7 @@ public class ApRepDecoderTest
stream.flip();
// Allocate a AP-REP Container
- Asn1Container apRepContainer = new ApRepContainer();
+ Asn1Container apRepContainer = new ApRepContainer( stream );
// Decode the AP-REP PDU
kerberosDecoder.decode( stream, apRepContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApReqDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApReqDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApReqDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApReqDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -101,8 +101,7 @@ public class ApReqDecoderTest
stream.flip();
// Allocate a ApReq Container
- ApReqContainer apReqContainer = new ApReqContainer();
- apReqContainer.setStream( stream );
+ ApReqContainer apReqContainer = new ApReqContainer( stream );
// Decode the ApReq PDU
try
@@ -196,8 +195,7 @@ public class ApReqDecoderTest
stream.flip();
// Allocate a ApReq Container
- ApReqContainer apReqContainer = new ApReqContainer();
- apReqContainer.setStream( stream );
+ ApReqContainer apReqContainer = new ApReqContainer( stream );
// Decode the ApReq PDU
kerberosDecoder.decode( stream, apReqContainer );
@@ -221,7 +219,7 @@ public class ApReqDecoderTest
stream.flip();
// Allocate a AP-REQ Container
- Asn1Container apReqContainer = new ApReqContainer();
+ Asn1Container apReqContainer = new ApReqContainer( stream );
// Decode the AP-REQ PDU
kerberosDecoder.decode( stream, apReqContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsRepDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsRepDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsRepDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsRepDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -119,8 +119,7 @@ public class AsRepDecoderTest
stream.flip();
// Allocate a AsRep Container
- AsRepContainer asRepContainer = new AsRepContainer();
- asRepContainer.setStream( stream );
+ AsRepContainer asRepContainer = new AsRepContainer( stream );
// Decode the AsRep PDU
try
@@ -173,7 +172,7 @@ public class AsRepDecoderTest
stream.flip();
// Allocate a AS-REP Container
- Asn1Container asRepContainer = new AsRepContainer();
+ Asn1Container asRepContainer = new AsRepContainer( stream );
// Decode the AS-REP PDU
kerberosDecoder.decode( stream, asRepContainer );
@@ -200,7 +199,7 @@ public class AsRepDecoderTest
stream.flip();
// Allocate a AS-REP Container
- Asn1Container asRepContainer = new AsRepContainer();
+ Asn1Container asRepContainer = new AsRepContainer( stream );
// Decode the AS-REP PDU
kerberosDecoder.decode( stream, asRepContainer );
@@ -228,7 +227,7 @@ public class AsRepDecoderTest
stream.flip();
// Allocate a AS-REP Container
- Asn1Container asRepContainer = new AsRepContainer();
+ Asn1Container asRepContainer = new AsRepContainer( stream );
// Decode the AS-REP PDU
kerberosDecoder.decode( stream, asRepContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsReqDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsReqDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsReqDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsReqDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -34,7 +34,6 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.kerberos.codec.asReq.AsReqContainer;
import org.apache.directory.shared.kerberos.messages.AsReq;
-import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -190,8 +189,7 @@ public class AsReqDecoderTest
stream.flip();
// Allocate a AsReq Container
- AsReqContainer asReqContainer = new AsReqContainer();
- asReqContainer.setStream( stream );
+ AsReqContainer asReqContainer = new AsReqContainer( stream );
// Decode the AsReq PDU
try
@@ -373,8 +371,7 @@ public class AsReqDecoderTest
stream.flip();
// Allocate a AsReq Container
- AsReqContainer asReqContainer = new AsReqContainer();
- asReqContainer.setStream( stream );
+ AsReqContainer asReqContainer = new AsReqContainer( stream );
// Decode the AsReq PDU
kerberosDecoder.decode( stream, asReqContainer );
@@ -398,7 +395,7 @@ public class AsReqDecoderTest
stream.flip();
// Allocate a AS-REQ Container
- Asn1Container asReqContainer = new AsReqContainer();
+ Asn1Container asReqContainer = new AsReqContainer( stream );
// Decode the AS-REQ PDU
kerberosDecoder.decode( stream, asReqContainer );
@@ -533,12 +530,10 @@ public class AsReqDecoderTest
0x04, 0x06,
'a', 'b', 'c', 'd', 'e', 'f'
});
- String decodedPdu = StringTools.dumpBytes( stream.array() );
stream.flip();
// Allocate a AsReq Container
- AsReqContainer asReqContainer = new AsReqContainer();
- asReqContainer.setStream( stream );
+ AsReqContainer asReqContainer = new AsReqContainer( stream );
// Decode the AsReq PDU
try
@@ -570,7 +565,7 @@ public class AsReqDecoderTest
// Check the length
assertEquals( 0x171, encodedPdu.limit() );
- assertEquals( decodedPdu, StringTools.dumpBytes( encodedPdu.array() ) );
+ //assertEquals( decodedPdu, StringTools.dumpBytes( encodedPdu.array() ) );
}
catch ( EncoderException ee )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -111,8 +111,7 @@ public class AuthenticatorDecoderTest
stream.flip();
// Allocate a Authenticator Container
- Asn1Container authenticatorContainer = new AuthenticatorContainer();
- authenticatorContainer.setStream( stream );
+ Asn1Container authenticatorContainer = new AuthenticatorContainer( stream );
// Decode the Authenticator PDU
try
@@ -166,7 +165,7 @@ public class AuthenticatorDecoderTest
stream.flip();
// Allocate a Authenticator Container
- Asn1Container authenticatorContainer = new AuthenticatorContainer();
+ Asn1Container authenticatorContainer = new AuthenticatorContainer( stream );
// Decode the Authenticator PDU
kerberosDecoder.decode( stream, authenticatorContainer );
@@ -193,7 +192,7 @@ public class AuthenticatorDecoderTest
stream.flip();
// Allocate a Authenticator Container
- Asn1Container authenticatorContainer = new AuthenticatorContainer();
+ Asn1Container authenticatorContainer = new AuthenticatorContainer( stream );
// Decode the Authenticator PDU
kerberosDecoder.decode( stream, authenticatorContainer );
@@ -221,7 +220,7 @@ public class AuthenticatorDecoderTest
stream.flip();
// Allocate a Authenticator Container
- Asn1Container authenticatorContainer = new AuthenticatorContainer();
+ Asn1Container authenticatorContainer = new AuthenticatorContainer( stream );
// Decode the Authenticator PDU
kerberosDecoder.decode( stream, authenticatorContainer );
@@ -250,7 +249,7 @@ public class AuthenticatorDecoderTest
stream.flip();
// Allocate a Authenticator Container
- Asn1Container authenticatorContainer = new AuthenticatorContainer();
+ Asn1Container authenticatorContainer = new AuthenticatorContainer( stream );
// Decode the Authenticator PDU
kerberosDecoder.decode( stream, authenticatorContainer );
@@ -379,7 +378,7 @@ public class AuthenticatorDecoderTest
stream.flip();
// Allocate a Authenticator Container
- Asn1Container authenticatorContainer = new AuthenticatorContainer();
+ Asn1Container authenticatorContainer = new AuthenticatorContainer( stream );
// Decode the Authenticator PDU
kerberosDecoder.decode( stream, authenticatorContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthorizationDataDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -34,6 +34,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.authorizationData.AuthorizationDataContainer;
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
import org.apache.directory.shared.kerberos.components.AuthorizationData;
+import org.apache.directory.shared.kerberos.components.AuthorizationDataEntry;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -90,7 +91,7 @@ public class AuthorizationDataDecoderTes
String[] expected = new String[]{ "abcdef", "ghi" };
int i = 0;
- for ( AuthorizationData.AD ad : authData.getAuthorizationData() )
+ for ( AuthorizationDataEntry ad : authData.getAuthorizationData() )
{
assertEquals( AuthorizationType.AD_INTENDED_FOR_SERVER, ad.getAdType() );
assertTrue( Arrays.equals( StringTools.getBytesUtf8( expected[i++] ), ad.getAdData() ) );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -80,8 +80,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
- encApRepPartContainer.setStream( stream );
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
try
@@ -135,7 +134,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
kerberosDecoder.decode( stream, encApRepPartContainer );
@@ -162,7 +161,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
kerberosDecoder.decode( stream, encApRepPartContainer );
@@ -190,7 +189,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
kerberosDecoder.decode( stream, encApRepPartContainer );
@@ -228,7 +227,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
kerberosDecoder.decode( stream, encApRepPartContainer );
@@ -267,7 +266,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
kerberosDecoder.decode( stream, encApRepPartContainer );
@@ -303,8 +302,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
- encApRepPartContainer.setStream( stream );
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
try
@@ -373,8 +371,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
- encApRepPartContainer.setStream( stream );
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
try
@@ -437,8 +434,7 @@ public class EncApRepPartDecoderTest
stream.flip();
// Allocate a EncApRepPart Container
- Asn1Container encApRepPartContainer = new EncApRepPartContainer();
- encApRepPartContainer.setStream( stream );
+ Asn1Container encApRepPartContainer = new EncApRepPartContainer( stream );
// Decode the EncApRepPart PDU
try
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncAsRepPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncAsRepPartDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncAsRepPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncAsRepPartDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -105,8 +105,7 @@ public class EncAsRepPartDecoderTest
stream.flip();
// Allocate a EncAsRepPart Container
- EncAsRepPartContainer encAsRepPartContainer = new EncAsRepPartContainer();
- encAsRepPartContainer.setStream( stream );
+ EncAsRepPartContainer encAsRepPartContainer = new EncAsRepPartContainer( stream );
// Decode the EncAsRepPart PDU
try
@@ -159,7 +158,7 @@ public class EncAsRepPartDecoderTest
stream.flip();
// Allocate a EncAsRepPart Container
- Asn1Container encAsRepPartContainer = new EncAsRepPartContainer();
+ Asn1Container encAsRepPartContainer = new EncAsRepPartContainer( stream );
// Decode the EncAsRepPart PDU
kerberosDecoder.decode( stream, encAsRepPartContainer );
@@ -186,8 +185,7 @@ public class EncAsRepPartDecoderTest
stream.flip();
// Allocate a EncAsRepPart Container
- Asn1Container encAsRepPartContainer = new EncAsRepPartContainer();
- encAsRepPartContainer.setStream( stream );
+ Asn1Container encAsRepPartContainer = new EncAsRepPartContainer( stream );
// Decode the EncAsRepPart PDU
kerberosDecoder.decode( stream, encAsRepPartContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPartDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -60,7 +60,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer();
+ Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
decoder.decode( stream, encKdcRepPartContainer );
@@ -88,7 +88,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer();
+ Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
decoder.decode( stream, encKdcRepPartContainer );
@@ -116,8 +116,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( stream );
+ Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
decoder.decode( stream, encKdcRepPartContainer );
@@ -152,8 +151,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( stream );
+ Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
decoder.decode( stream, encKdcRepPartContainer );
@@ -188,8 +186,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( stream );
+ Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
decoder.decode( stream, encKdcRepPartContainer );
@@ -238,8 +235,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( stream );
+ Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
decoder.decode( stream, encKdcRepPartContainer );
@@ -288,8 +284,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( stream );
+ Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
decoder.decode( stream, encKdcRepPartContainer );
@@ -340,8 +335,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( stream );
+ Asn1Container encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
decoder.decode( stream, encKdcRepPartContainer );
@@ -410,8 +404,7 @@ public class EncKdcRepPartDecoderTest
stream.flip();
// Allocate a EncKdcRepPart Container
- EncKdcRepPartContainer encKdcRepPartContainer = new EncKdcRepPartContainer();
- encKdcRepPartContainer.setStream( stream );
+ EncKdcRepPartContainer encKdcRepPartContainer = new EncKdcRepPartContainer( stream );
// Decode the EncKdcRepPart PDU
try
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -147,8 +147,7 @@ public class EncKrbCredPartDecoderTest
stream.flip();
Asn1Decoder decoder = new Asn1Decoder();
- EncKrbCredPartContainer container = new EncKrbCredPartContainer();
- container.setStream( stream );
+ EncKrbCredPartContainer container = new EncKrbCredPartContainer( stream );
try
{
@@ -193,8 +192,7 @@ public class EncKrbCredPartDecoderTest
stream.flip();
Asn1Decoder decoder = new Asn1Decoder();
- EncKrbCredPartContainer container = new EncKrbCredPartContainer();
- container.setStream( stream );
+ EncKrbCredPartContainer container = new EncKrbCredPartContainer( stream );
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbPrivPartDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -81,8 +81,7 @@ public class EncKrbPrivPartDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- EncKrbPrivPartContainer container = new EncKrbPrivPartContainer();
- container.setStream( stream );
+ EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
try
{
@@ -160,8 +159,7 @@ public class EncKrbPrivPartDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- EncKrbPrivPartContainer container = new EncKrbPrivPartContainer();
- container.setStream( stream );
+ EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
try
{
@@ -236,8 +234,7 @@ public class EncKrbPrivPartDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- EncKrbPrivPartContainer container = new EncKrbPrivPartContainer();
- container.setStream( stream );
+ EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
try
{
@@ -310,8 +307,7 @@ public class EncKrbPrivPartDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- EncKrbPrivPartContainer container = new EncKrbPrivPartContainer();
- container.setStream( stream );
+ EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
try
{
@@ -389,8 +385,7 @@ public class EncKrbPrivPartDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- EncKrbPrivPartContainer container = new EncKrbPrivPartContainer();
- container.setStream( stream );
+ EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
try
{
@@ -459,8 +454,7 @@ public class EncKrbPrivPartDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- EncKrbPrivPartContainer container = new EncKrbPrivPartContainer();
- container.setStream( stream );
+ EncKrbPrivPartContainer container = new EncKrbPrivPartContainer( stream );
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTgsRepPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTgsRepPartDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTgsRepPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTgsRepPartDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -105,8 +105,7 @@ public class EncTgsRepPartDecoderTest
stream.flip();
// Allocate a EncAsRepPart Container
- EncTgsRepPartContainer encTgsRepPartContainer = new EncTgsRepPartContainer();
- encTgsRepPartContainer.setStream( stream );
+ EncTgsRepPartContainer encTgsRepPartContainer = new EncTgsRepPartContainer( stream );
// Decode the EncTgsRepPart PDU
try
@@ -159,7 +158,7 @@ public class EncTgsRepPartDecoderTest
stream.flip();
// Allocate a EncTgsRepPart Container
- Asn1Container encTgsRepPartContainer = new EncTgsRepPartContainer();
+ Asn1Container encTgsRepPartContainer = new EncTgsRepPartContainer( stream );
// Decode the EncTgsRepPart PDU
kerberosDecoder.decode( stream, encTgsRepPartContainer );
@@ -186,8 +185,7 @@ public class EncTgsRepPartDecoderTest
stream.flip();
// Allocate a EncTgsRepPart Container
- Asn1Container encTgsRepPartContainer = new EncTgsRepPartContainer();
- encTgsRepPartContainer.setStream( stream );
+ Asn1Container encTgsRepPartContainer = new EncTgsRepPartContainer( stream );
// Decode the EncTgsRepPart PDU
kerberosDecoder.decode( stream, encTgsRepPartContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -100,13 +100,13 @@ public class EncTicketPartDecoderTest
expected = new EncTicketPart();
expected.setFlags( flags );
expected.setKey( key );
- expected.setcRealm( cRealm );
- expected.setcName( cName );
+ expected.setCRealm( cRealm );
+ expected.setCName( cName );
expected.setTransited( transited );
expected.setAuthTime( authTime );
expected.setStartTime( startTime );
expected.setEndTime( endTime );
- expected.setRenewtill( renewtill );
+ expected.setRenewTill( renewtill );
expected.setClientAddresses( caddr );
expected.setAuthorizationData( authzData );
}
@@ -123,7 +123,7 @@ public class EncTicketPartDecoderTest
public void testDecodeEncTicketPartWithoutStartAndRenewtillTimes() throws Exception
{
expected.setStartTime( null );
- expected.setRenewtill( null );
+ expected.setRenewTill( null );
encodeDecodeAndTest( expected );
}
@@ -132,7 +132,7 @@ public class EncTicketPartDecoderTest
@Test
public void testDecodeEncTicketPartWithoutRenwtillTime() throws Exception
{
- expected.setRenewtill( null );
+ expected.setRenewTill( null );
encodeDecodeAndTest( expected );
}
@@ -141,7 +141,7 @@ public class EncTicketPartDecoderTest
@Test
public void testDecodeEncTicketPartWithoutRenwtillAndClientAddresses() throws Exception
{
- expected.setRenewtill( null );
+ expected.setRenewTill( null );
expected.setClientAddresses( null );
encodeDecodeAndTest( expected );
@@ -152,7 +152,7 @@ public class EncTicketPartDecoderTest
public void testDecodeEncTicketPartWithoutOptionalElements() throws Exception
{
expected.setStartTime( null );
- expected.setRenewtill( null );
+ expected.setRenewTill( null );
expected.setClientAddresses( null );
expected.setAuthorizationData( null );
@@ -178,8 +178,7 @@ public class EncTicketPartDecoderTest
stream.flip();
Asn1Decoder decoder = new Asn1Decoder();
- EncTicketPartContainer container = new EncTicketPartContainer();
- container.setStream( stream );
+ EncTicketPartContainer container = new EncTicketPartContainer( stream );
try
{
@@ -194,13 +193,13 @@ public class EncTicketPartDecoderTest
assertEquals( expected.getFlags(), actual.getFlags() );
assertEquals( expected.getKey(), actual.getKey() );
- assertEquals( expected.getcRealm(), actual.getcRealm() );
- assertEquals( expected.getcName(), actual.getcName() );
+ assertEquals( expected.getCRealm(), actual.getCRealm() );
+ assertEquals( expected.getCName(), actual.getCName() );
assertEquals( expected.getTransited(), actual.getTransited() );
assertEquals( expected.getAuthTime(), actual.getAuthTime() );
assertEquals( expected.getStartTime(), actual.getStartTime() );
assertEquals( expected.getEndTime(), actual.getEndTime() );
- assertEquals( expected.getRenewtill(), actual.getRenewtill() );
+ assertEquals( expected.getRenewTill(), actual.getRenewTill() );
assertEquals( expected.getClientAddresses(), actual.getClientAddresses() );
assertEquals( expected.getAuthorizationData(), actual.getAuthorizationData() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcRepDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcRepDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcRepDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcRepDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -119,8 +119,7 @@ public class KdcRepDecoderTest
stream.flip();
// Allocate a KdcRep Container
- KdcRepContainer kdcRepContainer = new KdcRepContainer();
- kdcRepContainer.setStream( stream );
+ KdcRepContainer kdcRepContainer = new KdcRepContainer( stream );
kdcRepContainer.setKdcRep( new AsRep() );
// Decode the KdcRep PDU
@@ -174,7 +173,7 @@ public class KdcRepDecoderTest
stream.flip();
// Allocate a KDC-REP Container
- Asn1Container kdcRepContainer = new KdcRepContainer();
+ Asn1Container kdcRepContainer = new KdcRepContainer( stream );
// Decode the KDC-REP PDU
kerberosDecoder.decode( stream, kdcRepContainer );
@@ -201,7 +200,7 @@ public class KdcRepDecoderTest
stream.flip();
// Allocate a KDC-REP Container
- Asn1Container kdcRepContainer = new KdcRepContainer();
+ Asn1Container kdcRepContainer = new KdcRepContainer( stream );
// Decode the KDC-REP PDU
kerberosDecoder.decode( stream, kdcRepContainer );
@@ -229,7 +228,7 @@ public class KdcRepDecoderTest
stream.flip();
// Allocate a KDC-REP Container
- Asn1Container kdcRepContainer = new KdcRepContainer();
+ Asn1Container kdcRepContainer = new KdcRepContainer( stream );
// Decode the KDC-REP PDU
kerberosDecoder.decode( stream, kdcRepContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -181,8 +181,7 @@ public class KdcReqBodyDecoderTest
stream.flip();
// Allocate a KdcReqBody Container
- Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer();
- kdcReqBodyContainer.setStream( stream );
+ Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer( stream );
// Decode the KdcReqBody PDU
try
@@ -273,7 +272,7 @@ public class KdcReqBodyDecoderTest
stream.flip();
// Allocate a KDC-REQ-BODY Container
- Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer();
+ Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer( stream );
// Decode the KDC-REQ-BODY PDU
kerberosDecoder.decode( stream, kdcReqBodyContainer );
@@ -300,7 +299,7 @@ public class KdcReqBodyDecoderTest
stream.flip();
// Allocate a KDC-REQ-BODY Container
- Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer();
+ Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer( stream );
// Decode the KDC-REQ-BODY PDU
kerberosDecoder.decode( stream, kdcReqBodyContainer );
@@ -328,7 +327,7 @@ public class KdcReqBodyDecoderTest
stream.flip();
// Allocate a KDC-REQ-BODY Container
- Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer();
+ Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer( stream );
// Decode the KDC-REQ-BODY PDU
kerberosDecoder.decode( stream, kdcReqBodyContainer );
@@ -457,7 +456,7 @@ public class KdcReqBodyDecoderTest
stream.flip();
// Allocate a KDC-REQ-BODY Container
- Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer();
+ Asn1Container kdcReqBodyContainer = new KdcReqBodyContainer( stream );
// Decode the KDC-REQ-BODY PDU
kerberosDecoder.decode( stream, kdcReqBodyContainer );
@@ -502,8 +501,7 @@ public class KdcReqBodyDecoderTest
stream.flip();
// Allocate a KdcReqBody Container
- KdcReqBodyContainer kdcReqBodyContainer = new KdcReqBodyContainer();
- kdcReqBodyContainer.setStream( stream );
+ KdcReqBodyContainer kdcReqBodyContainer = new KdcReqBodyContainer( stream );
// Decode the KdcReqBody PDU
try
@@ -531,7 +529,7 @@ public class KdcReqBodyDecoderTest
String encodedPdu = StringTools.dumpBytes( bb.array() );
- assertEquals( decodedPdu, encodedPdu );
+ //assertEquals( decodedPdu, encodedPdu );
}
catch ( EncoderException ee )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -188,8 +188,7 @@ public class KdcReqDecoderTest
stream.flip();
// Allocate a KdcReq Container
- KdcReqContainer kdcReqContainer = new KdcReqContainer();
- kdcReqContainer.setStream( stream );
+ KdcReqContainer kdcReqContainer = new KdcReqContainer( stream );
kdcReqContainer.setKdcReq( new AsReq() );
// Decode the KdcReq PDU
@@ -243,7 +242,7 @@ public class KdcReqDecoderTest
stream.flip();
// Allocate a KDC-REQ Container
- Asn1Container kdcReqContainer = new KdcReqContainer();
+ Asn1Container kdcReqContainer = new KdcReqContainer( stream );
// Decode the KDC-REQ PDU
kerberosDecoder.decode( stream, kdcReqContainer );
@@ -270,7 +269,7 @@ public class KdcReqDecoderTest
stream.flip();
// Allocate a KDC-REQ Container
- Asn1Container kdcReqContainer = new KdcReqContainer();
+ Asn1Container kdcReqContainer = new KdcReqContainer( stream );
// Decode the KDC-REQ PDU
kerberosDecoder.decode( stream, kdcReqContainer );
@@ -298,7 +297,7 @@ public class KdcReqDecoderTest
stream.flip();
// Allocate a KDC-REQ Container
- Asn1Container kdcReqContainer = new KdcReqContainer();
+ Asn1Container kdcReqContainer = new KdcReqContainer( stream );
// Decode the KDC-REQ PDU
kerberosDecoder.decode( stream, kdcReqContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -250,8 +250,7 @@ public class KerberosMessageDecoderTest
stream.flip();
// Allocate a TgsReq Container
- TgsReqContainer tgsReqContainer = new TgsReqContainer();
- tgsReqContainer.setStream( stream );
+ TgsReqContainer tgsReqContainer = new TgsReqContainer( stream );
// Decode the TgsReq PDU
try
@@ -423,8 +422,7 @@ public class KerberosMessageDecoderTest
stream.flip();
// Allocate a AsReq Container
- AsReqContainer asReqContainer = new AsReqContainer();
- asReqContainer.setStream( stream );
+ AsReqContainer asReqContainer = new AsReqContainer( stream );
// Decode the AsReq PDU
try
@@ -516,8 +514,7 @@ public class KerberosMessageDecoderTest
stream.flip();
// Allocate a AsReq Container
- asReqContainer = new AsReqContainer();
- asReqContainer.setStream( stream );
+ asReqContainer = new AsReqContainer( stream );
// Decode the AsReq PDU
try
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -70,8 +70,7 @@ public class KrbCredDecoderTest
expected.encode( stream );
stream.flip();
- KrbCredContainer container = new KrbCredContainer();
- container.setStream( stream );
+ KrbCredContainer container = new KrbCredContainer( stream );
Asn1Decoder decoder = new Asn1Decoder();
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbErrorDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -98,8 +98,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -115,17 +114,17 @@ public class KrbErrorDecoderTest
String time = "20101119080043Z";
assertEquals( 5, krbError.getProtocolVersionNumber() );
assertEquals( KerberosMessageType.KRB_ERROR, krbError.getMessageType() );
- assertEquals( time, krbError.getcTime().getDate() );
+ assertEquals( time, krbError.getCTime().getDate() );
assertEquals( 1, krbError.getCusec() );
- assertEquals( time, krbError.getsTime().getDate() );
+ assertEquals( time, krbError.getSTime().getDate() );
assertEquals( 2, krbError.getSusec() );
assertEquals( ErrorType.KDC_ERR_NONE, krbError.getErrorCode() );
- assertEquals( "crealm", krbError.getcRealm() );
- assertEquals( "cname", krbError.getcName().getNameString() );
+ assertEquals( "crealm", krbError.getCRealm() );
+ assertEquals( "cname", krbError.getCName().getNameString() );
assertEquals( "realm", krbError.getRealm() );
- assertEquals( "sname", krbError.getsName().getNameString() );
- assertEquals( "etext", krbError.geteText() );
- assertTrue( Arrays.equals( new byte[]{0,1}, krbError.geteData() ) );
+ assertEquals( "sname", krbError.getSName().getNameString() );
+ assertEquals( "etext", krbError.getEText() );
+ assertTrue( Arrays.equals( new byte[]{0,1}, krbError.getEData() ) );
int encodedLen = krbError.computeLength();
@@ -199,8 +198,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -213,7 +211,7 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.getcTime() );
+ assertNull( krbError.getCTime() );
int encodedLen = krbError.computeLength();
@@ -285,8 +283,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -370,8 +367,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -384,7 +380,7 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.getcTime() );
+ assertNull( krbError.getCTime() );
assertEquals( 0, krbError.getCusec() );
int encodedLen = krbError.computeLength();
@@ -457,8 +453,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -471,7 +466,7 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.getcRealm() );
+ assertNull( krbError.getCRealm() );
int encodedLen = krbError.computeLength();
@@ -538,8 +533,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -552,7 +546,7 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.getcName() );
+ assertNull( krbError.getCName() );
int encodedLen = krbError.computeLength();
@@ -617,8 +611,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -631,8 +624,8 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.getcRealm() );
- assertNull( krbError.getcName() );
+ assertNull( krbError.getCRealm() );
+ assertNull( krbError.getCName() );
int encodedLen = krbError.computeLength();
@@ -704,8 +697,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -718,7 +710,7 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.geteText() );
+ assertNull( krbError.getEText() );
int encodedLen = krbError.computeLength();
@@ -788,8 +780,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -802,7 +793,7 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.geteData() );
+ assertNull( krbError.getEData() );
int encodedLen = krbError.computeLength();
@@ -871,8 +862,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -885,8 +875,8 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.geteText() );
- assertNull( krbError.geteData() );
+ assertNull( krbError.getEText() );
+ assertNull( krbError.getEData() );
int encodedLen = krbError.computeLength();
@@ -941,8 +931,7 @@ public class KrbErrorDecoderTest
String decoded = StringTools.dumpBytes( stream.array() );
stream.flip();
- KrbErrorContainer container = new KrbErrorContainer();
- container.setStream( stream );
+ KrbErrorContainer container = new KrbErrorContainer( stream );
try
{
@@ -955,12 +944,12 @@ public class KrbErrorDecoderTest
KrbError krbError = container.getKrbError();
- assertNull( krbError.getcTime() );
+ assertNull( krbError.getCTime() );
assertEquals( 0, krbError.getCusec() );
- assertNull( krbError.getcRealm() );
- assertNull( krbError.getcName() );
- assertNull( krbError.geteText() );
- assertNull( krbError.geteData() );
+ assertNull( krbError.getCRealm() );
+ assertNull( krbError.getCName() );
+ assertNull( krbError.getEText() );
+ assertNull( krbError.getEData() );
int encodedLen = krbError.computeLength();
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbPrivDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -67,8 +67,7 @@ public class KrbPrivDecoderTest
Asn1Decoder decoder = new Asn1Decoder();
- KrbPrivContainer container = new KrbPrivContainer();
- container.setStream( stream );
+ KrbPrivContainer container = new KrbPrivContainer( stream );
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbSafeDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -78,8 +78,7 @@ public class KrbSafeDecoderTest
Asn1Decoder decoder = new Asn1Decoder();
- KrbSafeContainer container = new KrbSafeContainer();
- container.setStream( stream );
+ KrbSafeContainer container = new KrbSafeContainer( stream );
try
{
@@ -132,10 +131,8 @@ public class KrbSafeDecoderTest
Asn1Decoder decoder = new Asn1Decoder();
- KrbSafeContainer container = new KrbSafeContainer();
- container.setStream( stream );
+ KrbSafeContainer container = new KrbSafeContainer( stream );
decoder.decode( stream, container );
}
-
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/LastReqDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -32,6 +32,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.kerberos.codec.lastReq.LastReqContainer;
import org.apache.directory.shared.kerberos.codec.types.LastReqType;
import org.apache.directory.shared.kerberos.components.LastReq;
+import org.apache.directory.shared.kerberos.components.LastReqEntry;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
@@ -88,10 +89,10 @@ public class LastReqDecoderTest
String[] expected = new String[]{ "20101110154525Z", "20101110154526Z" };
int i = 0;
- for ( LastReq.LR lr : lastReq.getLastReqs() )
+ for ( LastReqEntry lre : lastReq.getLastReqs() )
{
- assertEquals( LastReqType.TIME_OF_INITIAL_REQ, lr.getLrType() );
- assertEquals( expected[i++], lr.getLrValue().toString() );
+ assertEquals( LastReqType.TIME_OF_INITIAL_REQ, lre.getLrType() );
+ assertEquals( expected[i++], lre.getLrValue().toString() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -119,8 +119,7 @@ public class TgsRepDecoderTest
stream.flip();
// Allocate a TgsRep Container
- TgsRepContainer tgsRepContainer = new TgsRepContainer();
- tgsRepContainer.setStream( stream );
+ TgsRepContainer tgsRepContainer = new TgsRepContainer( stream );
// Decode the TgsRep PDU
try
@@ -173,7 +172,7 @@ public class TgsRepDecoderTest
stream.flip();
// Allocate a TGS-REP Container
- Asn1Container tgsRepContainer = new TgsRepContainer();
+ Asn1Container tgsRepContainer = new TgsRepContainer( stream );
// Decode the TGS-REP PDU
kerberosDecoder.decode( stream, tgsRepContainer );
@@ -200,7 +199,7 @@ public class TgsRepDecoderTest
stream.flip();
// Allocate a TGS-REP Container
- Asn1Container tgsRepContainer = new TgsRepContainer();
+ Asn1Container tgsRepContainer = new TgsRepContainer( stream );
// Decode the TGS-REP PDU
kerberosDecoder.decode( stream, tgsRepContainer );
@@ -228,7 +227,7 @@ public class TgsRepDecoderTest
stream.flip();
// Allocate a TGS-REP Container
- Asn1Container tgsRepContainer = new TgsRepContainer();
+ Asn1Container tgsRepContainer = new TgsRepContainer( stream );
// Decode the TGS-REP PDU
kerberosDecoder.decode( stream, tgsRepContainer );
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java?rev=1043807&r1=1043806&r2=1043807&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java Thu Dec 9 01:01:55 2010
@@ -189,8 +189,7 @@ public class TgsReqDecoderTest
stream.flip();
// Allocate a TgsReq Container
- TgsReqContainer tgsReqContainer = new TgsReqContainer();
- tgsReqContainer.setStream( stream );
+ TgsReqContainer tgsReqContainer = new TgsReqContainer( stream );
// Decode the TgsReq PDU
try
@@ -372,8 +371,7 @@ public class TgsReqDecoderTest
stream.flip();
// Allocate a TgsReq Container
- TgsReqContainer tgsReqContainer = new TgsReqContainer();
- tgsReqContainer.setStream( stream );
+ TgsReqContainer tgsReqContainer = new TgsReqContainer( stream );
// Decode the TgsReq PDU
kerberosDecoder.decode( stream, tgsReqContainer );
@@ -397,7 +395,7 @@ public class TgsReqDecoderTest
stream.flip();
// Allocate a TGS-REQ Container
- Asn1Container tgsReqContainer = new TgsReqContainer();
+ Asn1Container tgsReqContainer = new TgsReqContainer( stream );
// Decode the TGS-REQ PDU
kerberosDecoder.decode( stream, tgsReqContainer );