Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 1285 invoked from network); 18 Aug 2010 00:29:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 Aug 2010 00:29:11 -0000 Received: (qmail 61271 invoked by uid 500); 18 Aug 2010 00:29:11 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61231 invoked by uid 500); 18 Aug 2010 00:29:11 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 61224 invoked by uid 99); 18 Aug 2010 00:29:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Aug 2010 00:29:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Aug 2010 00:29:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8CFBC2388B46; Wed, 18 Aug 2010 00:27:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r986534 [7/7] - in /directory: apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/event/ apacheds/br... Date: Wed, 18 Aug 2010 00:27:23 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100818002726.8CFBC2388B46@eris.apache.org> Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Wed Aug 18 00:27:16 2010 @@ -39,8 +39,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalMessage; -import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest; +import org.apache.directory.shared.ldap.message.internal.Message; +import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Test; import org.junit.runner.RunWith; @@ -105,7 +105,7 @@ public class ModifyDNRequestTest fail( de.getMessage() ); } - InternalModifyDnRequest modifyDnRequest = ( ( LdapMessageContainer ) ldapMessageContainer ) + ModifyDnRequest modifyDnRequest = ( ( LdapMessageContainer ) ldapMessageContainer ) .getModifyDnRequest(); assertEquals( 1, modifyDnRequest.getMessageId() ); @@ -176,7 +176,7 @@ public class ModifyDNRequestTest catch ( DecoderException de ) { assertTrue( de instanceof ResponseCarryingException ); - InternalMessage response = ( ( ResponseCarryingException ) de ).getResponse(); + Message response = ( ( ResponseCarryingException ) de ).getResponse(); assertTrue( response instanceof ModifyDnResponseImpl ); assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ( ( ModifyDnResponseImpl ) response ).getLdapResult() .getResultCode() ); @@ -229,7 +229,7 @@ public class ModifyDNRequestTest catch ( DecoderException de ) { assertTrue( de instanceof ResponseCarryingException ); - InternalMessage response = ( ( ResponseCarryingException ) de ).getResponse(); + Message response = ( ( ResponseCarryingException ) de ).getResponse(); assertTrue( response instanceof ModifyDnResponseImpl ); assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ( ( ModifyDnResponseImpl ) response ).getLdapResult() .getResultCode() ); @@ -282,7 +282,7 @@ public class ModifyDNRequestTest catch ( DecoderException de ) { assertTrue( de instanceof ResponseCarryingException ); - InternalMessage response = ( ( ResponseCarryingException ) de ).getResponse(); + Message response = ( ( ResponseCarryingException ) de ).getResponse(); assertTrue( response instanceof ModifyDnResponseImpl ); assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ( ( ModifyDnResponseImpl ) response ).getLdapResult() .getResultCode() ); @@ -344,7 +344,7 @@ public class ModifyDNRequestTest fail( de.getMessage() ); } - InternalModifyDnRequest modifyDnRequest = ( ( LdapMessageContainer ) ldapMessageContainer ) + ModifyDnRequest modifyDnRequest = ( ( LdapMessageContainer ) ldapMessageContainer ) .getModifyDnRequest(); assertEquals( 1, modifyDnRequest.getMessageId() ); @@ -426,7 +426,7 @@ public class ModifyDNRequestTest fail( de.getMessage() ); } - InternalModifyDnRequest modifyDnRequest = ( ( LdapMessageContainer ) ldapMessageContainer ) + ModifyDnRequest modifyDnRequest = ( ( LdapMessageContainer ) ldapMessageContainer ) .getModifyDnRequest(); assertEquals( 1, modifyDnRequest.getMessageId() ); @@ -505,7 +505,7 @@ public class ModifyDNRequestTest fail( de.getMessage() ); } - InternalModifyDnRequest modifyDnRequest = ( ( LdapMessageContainer ) ldapMessageContainer ) + ModifyDnRequest modifyDnRequest = ( ( LdapMessageContainer ) ldapMessageContainer ) .getModifyDnRequest(); assertEquals( 1, modifyDnRequest.getMessageId() ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Wed Aug 18 00:27:16 2010 @@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.AliasDerefMode; import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; import org.apache.directory.shared.ldap.util.StringTools; @@ -184,7 +184,7 @@ public class SearchRequestMatchingRuleAs fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "dc=example,dc=com", searchRequest.getBase().toString() ); @@ -396,7 +396,7 @@ public class SearchRequestMatchingRuleAs fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 4, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -696,7 +696,7 @@ public class SearchRequestMatchingRuleAs fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 4, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Wed Aug 18 00:27:16 2010 @@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; import org.apache.directory.shared.ldap.message.SearchRequestImpl; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; import org.apache.directory.shared.ldap.util.StringTools; @@ -164,7 +164,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -310,7 +310,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -438,7 +438,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -560,7 +560,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -683,7 +683,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -805,7 +805,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -930,7 +930,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -1053,7 +1053,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -1175,7 +1175,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -1318,7 +1318,7 @@ public class SearchRequestSubstringTest fail( de.getMessage() ); } - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Wed Aug 18 00:27:16 2010 @@ -51,8 +51,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.SearchRequestImpl; import org.apache.directory.shared.ldap.message.SearchResultDoneImpl; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalMessage; -import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest; +import org.apache.directory.shared.ldap.message.internal.Message; +import org.apache.directory.shared.ldap.message.internal.SearchRequest; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; import org.apache.directory.shared.ldap.util.StringTools; @@ -186,7 +186,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -353,7 +353,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -528,7 +528,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -673,7 +673,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 3, searchRequest.getMessageId() ); assertEquals( "ou=users,ou=system", searchRequest.getBase().toString() ); @@ -777,7 +777,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 3, searchRequest.getMessageId() ); assertEquals( "ou=users,ou=system", searchRequest.getBase().toString() ); @@ -863,7 +863,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 3, searchRequest.getMessageId() ); assertEquals( "ou=users,ou=system", searchRequest.getBase().toString() ); @@ -951,7 +951,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 33, searchRequest.getMessageId() ); assertEquals( "dc=example,dc=com", searchRequest.getBase().toString() ); @@ -1098,7 +1098,7 @@ public class SearchRequestTest } assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 4, searchRequest.getMessageId() ); assertEquals( 2, searchRequest.getControls().size() ); @@ -1274,7 +1274,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -1398,7 +1398,7 @@ public class SearchRequestTest } assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 4, searchRequest.getMessageId() ); assertEquals( 1, searchRequest.getControls().size() ); @@ -1586,7 +1586,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "", searchRequest.getBase().toString() ); @@ -1748,7 +1748,7 @@ public class SearchRequestTest catch ( DecoderException de ) { assertTrue( de instanceof ResponseCarryingException ); - InternalMessage response = ( ( ResponseCarryingException ) de ).getResponse(); + Message response = ( ( ResponseCarryingException ) de ).getResponse(); assertTrue( response instanceof SearchResultDoneImpl ); assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ( ( SearchResultDoneImpl ) response ).getLdapResult() .getResultCode() ); @@ -2617,7 +2617,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 4, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -2709,7 +2709,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 4, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -2801,7 +2801,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 4, searchRequest.getMessageId() ); assertEquals( "uid=akarasulu,dc=example,dc=com", searchRequest.getBase().toString() ); @@ -3050,7 +3050,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 2, searchRequest.getMessageId() ); assertEquals( "dc=pgpkeys", searchRequest.getBase().toString() ); @@ -3164,7 +3164,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -3268,7 +3268,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -3384,7 +3384,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -3504,7 +3504,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -3627,7 +3627,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -3759,7 +3759,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -3895,7 +3895,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -4041,7 +4041,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -4184,7 +4184,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -4328,7 +4328,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -4477,7 +4477,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "a=b", searchRequest.getBase().toString() ); @@ -4586,7 +4586,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 1, searchRequest.getMessageId() ); assertEquals( "", searchRequest.getBase().toString() ); @@ -4649,7 +4649,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 3, searchRequest.getMessageId() ); assertEquals( "ou=users,ou=system", searchRequest.getBase().toString() ); @@ -4764,7 +4764,7 @@ public class SearchRequestTest assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() ); - InternalSearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); + SearchRequest searchRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getSearchRequest(); assertEquals( 6, searchRequest.getMessageId() ); assertEquals( "ou=system", searchRequest.getBase().toString() ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Wed Aug 18 00:27:16 2010 @@ -39,7 +39,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.SearchResultReference; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Test; @@ -138,7 +138,7 @@ public class SearchResultReferenceTest ldapUrlsSet.add( StringTools.utf8ToString( ldapUrls[i].getBytes() ) ); } - InternalReferral referral = searchResultReference.getReferral(); + Referral referral = searchResultReference.getReferral(); assertNotNull( referral ); @@ -269,7 +269,7 @@ public class SearchResultReferenceTest ldapUrlsSet.add( StringTools.utf8ToString( ldapUrls[i].getBytes() ) ); } - InternalReferral referral = searchResultReference.getReferral(); + Referral referral = searchResultReference.getReferral(); assertNotNull( referral ); @@ -403,7 +403,7 @@ public class SearchResultReferenceTest assertEquals( 1, searchResultReference.getMessageId() ); - InternalReferral referral = searchResultReference.getReferral(); + Referral referral = searchResultReference.getReferral(); assertNotNull( referral ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Wed Aug 18 00:27:16 2010 @@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.LdapProtocolEncoder; import org.apache.directory.shared.ldap.message.UnbindRequestImpl; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest; +import org.apache.directory.shared.ldap.message.internal.UnbindRequest; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Test; import org.junit.runner.RunWith; @@ -86,12 +86,12 @@ public class UnBindRequestTest fail( de.getMessage() ); } - InternalUnbindRequest unbindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getUnbindRequest(); + UnbindRequest unbindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getUnbindRequest(); assertEquals( 1, unbindRequest.getMessageId() ); // Check the encoding - InternalUnbindRequest internalUnbindRequest = new UnbindRequestImpl( unbindRequest.getMessageId() ); + UnbindRequest internalUnbindRequest = new UnbindRequestImpl( unbindRequest.getMessageId() ); try { @@ -150,7 +150,7 @@ public class UnBindRequestTest fail( de.getMessage() ); } - InternalUnbindRequest unbindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getUnbindRequest(); + UnbindRequest unbindRequest = ( ( LdapMessageContainer ) ldapMessageContainer ).getUnbindRequest(); assertEquals( 1, unbindRequest.getMessageId() ); @@ -164,7 +164,7 @@ public class UnBindRequestTest assertEquals( "", StringTools.dumpBytes( ( byte[] ) control.getValue() ) ); // Check the encoding - InternalUnbindRequest internalUnbindRequest = new UnbindRequestImpl( unbindRequest.getMessageId() ); + UnbindRequest internalUnbindRequest = new UnbindRequestImpl( unbindRequest.getMessageId() ); internalUnbindRequest.addControl( control ); try Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java Wed Aug 18 00:27:16 2010 @@ -27,7 +27,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.codec.controls.ControlImpl; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractMessage; +import org.apache.directory.shared.ldap.message.internal.AbstractMessage; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,8 +48,8 @@ public class AbstractMessageTest @Test public void testEqualsSameObj() { - InternalAbstractMessage msg; - msg = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractMessage msg; + msg = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -63,13 +63,13 @@ public class AbstractMessageTest @Test public void testEqualsExactCopy() { - InternalAbstractMessage msg0; - InternalAbstractMessage msg1; - msg0 = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractMessage msg0; + AbstractMessage msg1; + msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; - msg1 = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) + msg1 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -84,13 +84,13 @@ public class AbstractMessageTest @Test public void testNotEqualsDiffId() { - InternalAbstractMessage msg0; - InternalAbstractMessage msg1; - msg0 = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractMessage msg0; + AbstractMessage msg1; + msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; - msg1 = new InternalAbstractMessage( 6, MessageTypeEnum.BIND_REQUEST ) + msg1 = new AbstractMessage( 6, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -105,13 +105,13 @@ public class AbstractMessageTest @Test public void testNotEqualsDiffType() { - InternalAbstractMessage msg0; - InternalAbstractMessage msg1; - msg0 = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractMessage msg0; + AbstractMessage msg1; + msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; - msg1 = new InternalAbstractMessage( 5, MessageTypeEnum.UNBIND_REQUEST ) + msg1 = new AbstractMessage( 5, MessageTypeEnum.UNBIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -126,10 +126,10 @@ public class AbstractMessageTest @Test public void testNotEqualsDiffControls() { - InternalAbstractMessage msg0; - InternalAbstractMessage msg1; + AbstractMessage msg0; + AbstractMessage msg1; - msg0 = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) + msg0 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -162,7 +162,7 @@ public class AbstractMessageTest } } ); - msg1 = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) + msg1 = new AbstractMessage( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java Wed Aug 18 00:27:16 2010 @@ -28,8 +28,8 @@ import org.apache.directory.junit.tools. import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.codec.controls.ControlImpl; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.internal.InternalAbstractResultResponse; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.AbstractResultResponse; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.LdapResult; import org.apache.directory.shared.ldap.name.DN; import org.junit.Test; @@ -51,8 +51,8 @@ public class AbstractResultResponseTest @Test public void testEqualsSameObj() { - InternalAbstractResultResponse msg; - msg = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractResultResponse msg; + msg = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -66,11 +66,11 @@ public class AbstractResultResponseTest @Test public void testEqualsExactCopy() throws LdapException { - InternalAbstractResultResponse msg0 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractResultResponse msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; - InternalAbstractResultResponse msg1 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractResultResponse msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -86,11 +86,11 @@ public class AbstractResultResponseTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); @@ -105,11 +105,11 @@ public class AbstractResultResponseTest @Test public void testNotEqualsDiffResult() throws LdapException { - InternalAbstractResultResponse msg0 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractResultResponse msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; - InternalAbstractResultResponse msg1 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractResultResponse msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -125,11 +125,11 @@ public class AbstractResultResponseTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); @@ -144,13 +144,13 @@ public class AbstractResultResponseTest @Test public void testNotEqualsDiffId() { - InternalAbstractResultResponse msg0; - InternalAbstractResultResponse msg1; - msg0 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractResultResponse msg0; + AbstractResultResponse msg1; + msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; - msg1 = new InternalAbstractResultResponse( 6, MessageTypeEnum.BIND_REQUEST ) + msg1 = new AbstractResultResponse( 6, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -165,13 +165,13 @@ public class AbstractResultResponseTest @Test public void testNotEqualsDiffType() { - InternalAbstractResultResponse msg0; - InternalAbstractResultResponse msg1; - msg0 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + AbstractResultResponse msg0; + AbstractResultResponse msg1; + msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; - msg1 = new InternalAbstractResultResponse( 5, MessageTypeEnum.UNBIND_REQUEST ) + msg1 = new AbstractResultResponse( 5, MessageTypeEnum.UNBIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -186,10 +186,10 @@ public class AbstractResultResponseTest @Test public void testNotEqualsDiffControls() { - InternalAbstractResultResponse msg0; - InternalAbstractResultResponse msg1; + AbstractResultResponse msg0; + AbstractResultResponse msg1; - msg0 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + msg0 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; @@ -222,7 +222,7 @@ public class AbstractResultResponseTest } } ); - msg1 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) + msg1 = new AbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST ) { private static final long serialVersionUID = 1L; }; Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java Wed Aug 18 00:27:16 2010 @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalAddRequest; +import org.apache.directory.shared.ldap.message.internal.AddRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.junit.Test; @@ -198,7 +198,7 @@ public class AddRequestImplTest @Test public void testEqualsDiffImpl() { - InternalAddRequest req0 = new InternalAddRequest() + AddRequest req0 = new AddRequest() { public Entry getEntry() { Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java Wed Aug 18 00:27:16 2010 @@ -31,7 +31,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalBindRequest; +import org.apache.directory.shared.ldap.message.internal.BindRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.junit.Test; @@ -200,7 +200,7 @@ public class BindRequestImplTest @Test public void testEqualsDiffImpl() { - InternalBindRequest req0 = new InternalBindRequest() + BindRequest req0 = new BindRequest() { public boolean isSimple() { Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java Wed Aug 18 00:27:16 2010 @@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.message.LdapResultImpl; import org.apache.directory.shared.ldap.message.ReferralImpl; import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.name.DN; import org.junit.Test; import org.junit.runner.RunWith; @@ -142,11 +142,11 @@ public class BindResponseImplTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); @@ -179,11 +179,11 @@ public class BindResponseImplTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java Wed Aug 18 00:27:16 2010 @@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Value; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest; +import org.apache.directory.shared.ldap.message.internal.CompareRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.junit.Test; @@ -180,7 +180,7 @@ public class CompareRequestImplTest @Test public void testEqualsDiffImpl() { - InternalCompareRequest req0 = new InternalCompareRequest() + CompareRequest req0 = new CompareRequest() { public Value getAssertionValue() { Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java Wed Aug 18 00:27:16 2010 @@ -31,7 +31,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest; +import org.apache.directory.shared.ldap.message.internal.DeleteRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.junit.Test; @@ -143,7 +143,7 @@ public class DeleteRequestImplTest @Test public void testEqualsDiffImpl() { - InternalDeleteRequest req0 = new InternalDeleteRequest() + DeleteRequest req0 = new DeleteRequest() { public DN getName() { Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java Wed Aug 18 00:27:16 2010 @@ -33,7 +33,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest; +import org.apache.directory.shared.ldap.message.internal.ExtendedRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.junit.Test; import org.junit.runner.RunWith; @@ -169,7 +169,7 @@ public class ExtendedRequestImplTest @Test public void testEqualsDiffImpl() { - InternalExtendedRequest req0 = new InternalExtendedRequest() + ExtendedRequest req0 = new ExtendedRequest() { private static final long serialVersionUID = 1L; Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java Wed Aug 18 00:27:16 2010 @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTru import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.LdapResult; import org.apache.directory.shared.ldap.name.DN; import org.junit.Test; @@ -132,13 +132,13 @@ public class LdapResultImplTest } - public InternalReferral getReferral() + public Referral getReferral() { return null; } - public void setReferral( InternalReferral referral ) + public void setReferral( Referral referral ) { } }; @@ -166,11 +166,11 @@ public class LdapResultImplTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); @@ -235,11 +235,11 @@ public class LdapResultImplTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); @@ -265,11 +265,11 @@ public class LdapResultImplTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); @@ -296,11 +296,11 @@ public class LdapResultImplTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); @@ -327,11 +327,11 @@ public class LdapResultImplTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.SIZE_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); refs1.addLdapUrl( "ldap://someserver.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); @@ -358,12 +358,12 @@ public class LdapResultImplTest r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED ); - InternalReferral refs0 = new ReferralImpl(); + Referral refs0 = new ReferralImpl(); r0.setReferral( refs0 ); refs0.addLdapUrl( "ldap://someserver.com" ); refs0.addLdapUrl( "ldap://anotherserver.org" ); - InternalReferral refs1 = new ReferralImpl(); + Referral refs1 = new ReferralImpl(); r1.setReferral( refs1 ); refs1.addLdapUrl( "ldap://abc.com" ); refs1.addLdapUrl( "ldap://anotherserver.org" ); Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java Wed Aug 18 00:27:16 2010 @@ -31,7 +31,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest; +import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.name.RDN; @@ -239,7 +239,7 @@ public class ModifyDnRequestImplTest @Test public void testEqualsDiffImpl() { - InternalModifyDnRequest req0 = new InternalModifyDnRequest() + ModifyDnRequest req0 = new ModifyDnRequest() { public DN getName() { Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java Wed Aug 18 00:27:16 2010 @@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.ModificationOperation; import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest; +import org.apache.directory.shared.ldap.message.internal.ModifyRequest; import org.apache.directory.shared.ldap.message.internal.ResultResponse; import org.apache.directory.shared.ldap.name.DN; import org.junit.Test; @@ -288,7 +288,7 @@ public class ModifyRequestImplTest @Test public void testEqualsDiffImpl() { - InternalModifyRequest req0 = new InternalModifyRequest() + ModifyRequest req0 = new ModifyRequest() { public Collection getModifications() { Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java Wed Aug 18 00:27:16 2010 @@ -28,7 +28,7 @@ import java.util.Collections; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.junit.Test; import org.junit.runner.RunWith; @@ -193,7 +193,7 @@ public class ReferralImplTest @Test public void testEqualsDifferentImpls() { - InternalReferral refs0 = new InternalReferral() + Referral refs0 = new Referral() { public Collection getLdapUrls() { Modified: directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java?rev=986534&r1=986533&r2=986534&view=diff ============================================================================== --- directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java (original) +++ directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java Wed Aug 18 00:27:16 2010 @@ -30,7 +30,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.shared.ldap.codec.MessageTypeEnum; import org.apache.directory.shared.ldap.message.control.Control; -import org.apache.directory.shared.ldap.message.internal.InternalReferral; +import org.apache.directory.shared.ldap.message.internal.Referral; import org.apache.directory.shared.ldap.message.internal.SearchResultReference; import org.junit.Test; import org.junit.runner.RunWith; @@ -56,7 +56,7 @@ public class SearchResponseReferenceImpl * the parent lockable * @return the newly created referral for testing */ - private InternalReferral getReferral( SearchResultReference resp ) + private Referral getReferral( SearchResultReference resp ) { ReferralImpl ref = new ReferralImpl(); resp.setReferral( ref ); @@ -103,13 +103,13 @@ public class SearchResponseReferenceImpl { SearchResultReference resp0 = new SearchResultReference() { - public InternalReferral getReferral() + public Referral getReferral() { return SearchResponseReferenceImplTest.this.getReferral( this ); } - public void setReferral( InternalReferral referral ) + public void setReferral( Referral referral ) { }