Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 44856 invoked from network); 24 Jun 2008 09:04:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jun 2008 09:04:04 -0000 Received: (qmail 11400 invoked by uid 500); 24 Jun 2008 09:04:06 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 11355 invoked by uid 500); 24 Jun 2008 09:04:05 -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 11346 invoked by uid 99); 24 Jun 2008 09:04:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 02:04:05 -0700 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; Tue, 24 Jun 2008 09:03:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A953E2388A0C; Tue, 24 Jun 2008 02:03:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r671076 - in /directory/shared/branches/bigbang: ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/ ldap/src/test/java/org/apache/directory/shared/ldap/codec/ ldap/src/test/java/org/apache/directory/shared/ldap/codec/a... Date: Tue, 24 Jun 2008 09:03:10 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080624090312.A953E2388A0C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Jun 24 02:03:08 2008 New Revision: 671076 URL: http://svn.apache.org/viewvc?rev=671076&view=rev Log: o Fixed some typo in javadoc o Added a test for SASL BindRequest decoding o Fixed a bunch of warnings in tests Modified: directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java Modified: directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java (original) +++ directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/AuthenticationLevel.java Tue Jun 24 02:03:08 2008 @@ -39,7 +39,7 @@ SIMPLE( 1, "simple" ), /** - * Strong authentication (bound with encrypted cerdentials) + * Strong authentication (bound with encrypted credentials) */ STRONG( 2, "strong" ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java Tue Jun 24 02:03:08 2008 @@ -99,7 +99,7 @@ assertEquals( 2, abandonRequest.getAbandonedMessageId() ); // Check the Controls - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 4, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java Tue Jun 24 02:03:08 2008 @@ -108,7 +108,7 @@ assertEquals( 2, abandonRequest.getAbandonedMessageId() ); // Check the Controls - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 4, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java Tue Jun 24 02:03:08 2008 @@ -144,7 +144,7 @@ assertTrue( expectedTypes.contains( attributeValue.getID().toLowerCase() ) ); NamingEnumeration values = attributeValue.getAll(); - HashSet vals = ( HashSet ) typesVals.get( attributeValue.getID().toLowerCase() ); + Set vals = ( Set ) typesVals.get( attributeValue.getID().toLowerCase() ); while ( values.hasMore() ) { @@ -160,7 +160,7 @@ assertTrue( expectedTypes.contains( attributeValue.getID().toLowerCase() ) ); values = attributeValue.getAll(); - vals = ( HashSet ) typesVals.get( attributeValue.getID().toLowerCase() ); + vals = ( Set ) typesVals.get( attributeValue.getID().toLowerCase() ); while ( values.hasMore() ) { @@ -720,7 +720,7 @@ assertEquals( 0x51, message.computeLength() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java Tue Jun 24 02:03:08 2008 @@ -203,7 +203,7 @@ assertEquals( 0x2B, message.computeLength() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Tue Jun 24 02:03:08 2008 @@ -116,7 +116,7 @@ .getSimple() ) ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -152,7 +152,6 @@ LdapDN name = new LdapDN( "uid=akarasulu,dc=example,dc=com" ); int nbLoops = 10000; long t0 = System.currentTimeMillis(); - ByteBuffer bb=null; for ( int i = 0; i< nbLoops; i++) { @@ -176,7 +175,7 @@ // Check the encoding try { - bb = message.encode( null ); + message.encode( null ); } catch ( EncoderException ee ) { Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Tue Jun 24 02:03:08 2008 @@ -542,6 +542,89 @@ /** + * Test the decoding of a BindRequest with Sasl authentication, no name, a + * credentials and no controls + */ + public void testDecodeBindRequestSaslNoNameCredsNoControls() + { + Asn1Decoder ldapDecoder = new LdapDecoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x23 ); + stream.put( new byte[] + { + 0x30, 0x21, // LDAPMessage ::=SEQUENCE { + 0x02, 0x01, 0x01, // messageID MessageID + 0x60, 0x1C, // CHOICE { ..., bindRequest BindRequest, ... + // BindRequest ::= APPLICATION[0] SEQUENCE { + 0x02, 0x01, 0x03, // version INTEGER (1..127), + 0x04, 0x00, // name LDAPDN, + ( byte ) 0xA3, 0x15, // authentication AuthenticationChoice + // } + // AuthenticationChoice ::= CHOICE { ... sasl [3] + // SaslCredentials } + // SaslCredentials ::= SEQUENCE { + // mechanism LDAPSTRING, + // ... + 0x04, 0x0B, + 'K', 'E', 'R', 'B', 'E', 'R', 'O', 'S', '_', 'V', '4', + ( byte ) 0x04, 0x06, // SaslCredentials ::= SEQUENCE { + // ... + // credentials OCTET STRING OPTIONAL } + // + 'a', 'b', 'c', 'd', 'e', 'f' + } ); + + + String decodedPdu = StringTools.dumpBytes( stream.array() ); + stream.flip(); + + // Allocate a LdapMessage Container + IAsn1Container ldapMessageContainer = new LdapMessageContainer(); + + // Decode the BindRequest PDU + try + { + ldapDecoder.decode( stream, ldapMessageContainer ); + } + catch ( DecoderException de ) + { + de.printStackTrace(); + fail( de.getMessage() ); + } + + // Check the decoded BindRequest + LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage(); + BindRequest br = message.getBindRequest(); + + assertEquals( 1, message.getMessageId() ); + assertEquals( 3, br.getVersion() ); + assertEquals( "", br.getName().toString() ); + assertEquals( true, ( br.getAuthentication() instanceof SaslCredentials ) ); + assertEquals( "KERBEROS_V4", ( ( SaslCredentials ) br.getAuthentication() ).getMechanism() ); + assertEquals( "abcdef", StringTools.utf8ToString( ( ( SaslCredentials ) br.getAuthentication() ) + .getCredentials() ) ); + + // Check the length + assertEquals( 0x23, message.computeLength() ); + + // Check the encoding + try + { + ByteBuffer bb = message.encode( null ); + + String encodedPdu = StringTools.dumpBytes( bb.array() ); + + assertEquals( encodedPdu, decodedPdu ); + } + catch ( EncoderException ee ) + { + ee.printStackTrace(); + fail( ee.getMessage() ); + } + } + + + /** * Test the decoding of a BindRequest with an empty body */ public void testDecodeBindRequestEmptyBody() @@ -1129,7 +1212,7 @@ assertEquals( 0x2F, message.computeLength() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -1208,7 +1291,7 @@ assertEquals( 0x2D, message.computeLength() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Tue Jun 24 02:03:08 2008 @@ -175,7 +175,7 @@ assertEquals( 0x3C, message.computeLength() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -331,7 +331,7 @@ assertEquals( "", StringTools.utf8ToString( br.getServerSaslCreds() ) ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java Tue Jun 24 02:03:08 2008 @@ -460,7 +460,7 @@ assertEquals( "value", compareRequest.getAssertionValue().toString() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java Tue Jun 24 02:03:08 2008 @@ -170,7 +170,7 @@ assertEquals( "", compareResponse.getLdapResult().getErrorMessage() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Tue Jun 24 02:03:08 2008 @@ -240,7 +240,7 @@ assertEquals( 0x44, message.computeLength() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Tue Jun 24 02:03:08 2008 @@ -212,7 +212,7 @@ assertEquals( 0x4A, message.computeLength() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java Tue Jun 24 02:03:08 2008 @@ -162,7 +162,7 @@ assertEquals( "value", StringTools.utf8ToString( extendedRequest.getRequestValue() ) ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -243,7 +243,7 @@ assertEquals( "", StringTools.utf8ToString( extendedRequest.getRequestValue() ) ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Tue Jun 24 02:03:08 2008 @@ -186,7 +186,7 @@ assertEquals( "value", StringTools.utf8ToString( ( byte[] ) extendedResponse.getResponse() ) ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -339,7 +339,7 @@ assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -617,7 +617,7 @@ assertEquals( "", StringTools.utf8ToString( ( byte[] ) extendedResponse.getResponse() ) ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -777,7 +777,7 @@ assertEquals( "", StringTools.utf8ToString( ( byte[] ) extendedResponse.getResponse() ) ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Tue Jun 24 02:03:08 2008 @@ -1167,7 +1167,7 @@ assertEquals( 0, attributeValue.size() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Tue Jun 24 02:03:08 2008 @@ -168,7 +168,7 @@ assertEquals( "", modifyResponse.getLdapResult().getErrorMessage() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Tue Jun 24 02:03:08 2008 @@ -329,7 +329,7 @@ assertEquals( "ou=system", modifyDNRequest.getNewSuperior().toString() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -483,7 +483,7 @@ assertEquals( "cn=testDNModify", modifyDNRequest.getNewRDN().toString() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Tue Jun 24 02:03:08 2008 @@ -170,7 +170,7 @@ assertEquals( "", modifyDNResponse.getLdapResult().getErrorMessage() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Tue Jun 24 02:03:08 2008 @@ -281,7 +281,7 @@ } // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Tue Jun 24 02:03:08 2008 @@ -167,7 +167,7 @@ assertEquals( "", searchResultDone.getLdapResult().getErrorMessage() ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Tue Jun 24 02:03:08 2008 @@ -115,7 +115,7 @@ assertEquals( "objectClass".toLowerCase(), attributeValue.getID().toLowerCase() ); - NamingEnumeration values = attributeValue.getAll(); + NamingEnumeration values = attributeValue.getAll(); Set expectedValues = new HashSet(); @@ -225,7 +225,7 @@ assertEquals( expectedAttributes[i].toLowerCase(), attributeValue.getID().toLowerCase() ); - NamingEnumeration values = attributeValue.getAll(); + NamingEnumeration values = attributeValue.getAll(); Set expectedValues = new HashSet(); @@ -334,7 +334,7 @@ assertEquals( "objectClass".toLowerCase(), attributeValue.getID().toLowerCase() ); - NamingEnumeration values = attributeValue.getAll(); + NamingEnumeration values = attributeValue.getAll(); Set expectedValues = new HashSet(); @@ -807,7 +807,7 @@ assertEquals( "objectClass".toLowerCase(), attributeValue.getID().toLowerCase() ); - NamingEnumeration values = attributeValue.getAll(); + NamingEnumeration values = attributeValue.getAll(); assertFalse( values.hasMore() ); } @@ -888,7 +888,7 @@ Attribute attributeValue = partialAttributesList.get( "objectclass" ); assertEquals( "objectClass".toLowerCase(), attributeValue.getID().toLowerCase() ); - NamingEnumeration values = attributeValue.getAll(); + NamingEnumeration values = attributeValue.getAll(); assertFalse( values.hasMore() ); attributeValue = partialAttributesList.get( "objectclazz" ); @@ -977,13 +977,13 @@ assertEquals( "objectClass".toLowerCase(), attributeValue.getID().toLowerCase() ); - NamingEnumeration values = attributeValue.getAll(); + NamingEnumeration values = attributeValue.getAll(); assertFalse( values.hasMore() ); } // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); @@ -1071,7 +1071,7 @@ assertEquals( "objectClass".toLowerCase(), attributeValue.getID().toLowerCase() ); - NamingEnumeration values = attributeValue.getAll(); + NamingEnumeration values = attributeValue.getAll(); while ( values.hasMore() ) { @@ -1164,7 +1164,7 @@ assertEquals( "objectClass".toLowerCase(), attributeValue.getID().toLowerCase() ); - NamingEnumeration values = attributeValue.getAll(); + NamingEnumeration values = attributeValue.getAll(); while ( values.hasMore() ) { @@ -1175,7 +1175,7 @@ } // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Tue Jun 24 02:03:08 2008 @@ -22,7 +22,6 @@ import java.nio.ByteBuffer; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; @@ -134,12 +133,8 @@ fail(); } - Iterator iter = searchResultReference.getSearchResultReferences().iterator(); - - while ( iter.hasNext() ) + for ( LdapURL ldapUrl:searchResultReference.getSearchResultReferences() ) { - LdapURL ldapUrl = ( LdapURL ) iter.next(); - if ( ldapUrlsSet.contains( ldapUrl.toString() ) ) { ldapUrlsSet.remove( ldapUrl.toString() ); @@ -270,12 +265,8 @@ fail(); } - Iterator iter = searchResultReference.getSearchResultReferences().iterator(); - - while ( iter.hasNext() ) + for ( LdapURL ldapUrl:searchResultReference.getSearchResultReferences() ) { - LdapURL ldapUrl = ( LdapURL ) iter.next(); - if ( ldapUrlsSet.contains( ldapUrl.toString() ) ) { ldapUrlsSet.remove( ldapUrl.toString() ); @@ -289,7 +280,7 @@ assertTrue( ldapUrlsSet.size() == 0 ); // Check the Control - List controls = message.getControls(); + List controls = message.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Tue Jun 24 02:03:08 2008 @@ -138,7 +138,7 @@ assertEquals( 1, ldapMessage.getMessageId() ); // Check the Control - List controls = ldapMessage.getControls(); + List controls = ldapMessage.getControls(); assertEquals( 1, controls.size() ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterNodeEqualityTest.java Tue Jun 24 02:03:08 2008 @@ -35,22 +35,22 @@ { public void testEqualityEquals() { - EqualityNode eqNode1 = new EqualityNode( "attr1", new ClientStringValue( "test" ) ); - EqualityNode eqNode2 = new EqualityNode( "attr1", new ClientStringValue( "test" ) ); + EqualityNode eqNode1 = new EqualityNode( "attr1", new ClientStringValue( "test" ) ); + EqualityNode eqNode2 = new EqualityNode( "attr1", new ClientStringValue( "test" ) ); assertEquals( "two exact nodes should be equal", eqNode1, eqNode2 ); - eqNode2 = new EqualityNode( "attr2", new ClientStringValue( "test" ) ); + eqNode2 = new EqualityNode( "attr2", new ClientStringValue( "test" ) ); assertFalse( "different attribute in node should return false on equals()", eqNode1.equals( eqNode2 ) ); - eqNode2 = new EqualityNode( "attr2", new ClientStringValue( "foobar" ) ); + eqNode2 = new EqualityNode( "attr2", new ClientStringValue( "foobar" ) ); assertFalse( "different value in node should return false on equals()", eqNode1.equals( eqNode2 ) ); PresenceNode presenceNode = new PresenceNode( "attr1" ); assertFalse( "two different leaf nodes should not be equal", eqNode1.equals( presenceNode ) ); assertFalse( "two different leaf nodes should not be equal", presenceNode.equals( eqNode1 ) ); - GreaterEqNode greaterEqNode = new GreaterEqNode( "attr1", new ClientStringValue( "test" ) ); + GreaterEqNode greaterEqNode = new GreaterEqNode( "attr1", new ClientStringValue( "test" ) ); assertFalse( "two different simple nodes should not be equal", eqNode1.equals( greaterEqNode ) ); assertFalse( "two different simple nodes should not be equal", greaterEqNode.equals( eqNode1 ) ); } @@ -58,47 +58,47 @@ public void testGreaterEqEquals() { - GreaterEqNode greaterEqNode1 = new GreaterEqNode( "attr1", new ClientStringValue( "test" ) ); - GreaterEqNode greaterEqNode2 = new GreaterEqNode( "attr1", new ClientStringValue( "test" ) ); + GreaterEqNode greaterEqNode1 = new GreaterEqNode( "attr1", new ClientStringValue( "test" ) ); + GreaterEqNode greaterEqNode2 = new GreaterEqNode( "attr1", new ClientStringValue( "test" ) ); assertEquals( "two exact nodes should be equal", greaterEqNode1, greaterEqNode2 ); - greaterEqNode2 = new GreaterEqNode( "attr2", new ClientStringValue( "test" ) ); + greaterEqNode2 = new GreaterEqNode( "attr2", new ClientStringValue( "test" ) ); assertFalse( "different attribute in node should return false on equals()", greaterEqNode1 .equals( greaterEqNode2 ) ); - greaterEqNode2 = new GreaterEqNode( "attr2", new ClientStringValue( "foobar" ) ); + greaterEqNode2 = new GreaterEqNode( "attr2", new ClientStringValue( "foobar" ) ); assertFalse( "different value in node should return false on equals()", greaterEqNode1.equals( greaterEqNode2 ) ); } public void testLessEqEquals() { - LessEqNode lessEqNode1 = new LessEqNode( "attr1", new ClientStringValue( "test" ) ); - LessEqNode lessEqNode2 = new LessEqNode( "attr1", new ClientStringValue( "test" ) ); + LessEqNode lessEqNode1 = new LessEqNode( "attr1", new ClientStringValue( "test" ) ); + LessEqNode lessEqNode2 = new LessEqNode( "attr1", new ClientStringValue( "test" ) ); assertEquals( "two exact nodes should be equal", lessEqNode1, lessEqNode2 ); - lessEqNode2 = new LessEqNode( "attr2", new ClientStringValue( "test" ) ); + lessEqNode2 = new LessEqNode( "attr2", new ClientStringValue( "test" ) ); assertFalse( "different attribute in node should return false on equals()", lessEqNode1.equals( lessEqNode2 ) ); - lessEqNode2 = new LessEqNode( "attr2", new ClientStringValue( "foobar" ) ); + lessEqNode2 = new LessEqNode( "attr2", new ClientStringValue( "foobar" ) ); assertFalse( "different value in node should return false on equals()", lessEqNode1.equals( lessEqNode2 ) ); } public void testApproximateEqEquals() { - ApproximateNode approximateNode1 = new ApproximateNode( "attr1", new ClientStringValue( "test" ) ); - ApproximateNode approximateNode2 = new ApproximateNode( "attr1", new ClientStringValue( "test" ) ); + ApproximateNode approximateNode1 = new ApproximateNode( "attr1", new ClientStringValue( "test" ) ); + ApproximateNode approximateNode2 = new ApproximateNode( "attr1", new ClientStringValue( "test" ) ); assertEquals( "two exact nodes should be equal", approximateNode1, approximateNode2 ); - approximateNode2 = new ApproximateNode( "attr2", new ClientStringValue( "test" ) ); + approximateNode2 = new ApproximateNode( "attr2", new ClientStringValue( "test" ) ); assertFalse( "different attribute in node should return false on equals()", approximateNode1 .equals( approximateNode2 ) ); - approximateNode2 = new ApproximateNode( "attr2", new ClientStringValue( "foobar" ) ); + approximateNode2 = new ApproximateNode( "attr2", new ClientStringValue( "foobar" ) ); assertFalse( "different value in node should return false on equals()", approximateNode1 .equals( approximateNode2 ) ); } Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/AttributesImplTest.java Tue Jun 24 02:03:08 2008 @@ -29,7 +29,6 @@ import org.apache.directory.shared.ldap.message.AttributeImpl; import org.apache.directory.shared.ldap.message.AttributesImpl; -import org.apache.directory.shared.ldap.util.ArrayUtils; /** * Test cases for the methods of the LockableAttributeImpl class. Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java Tue Jun 24 02:03:08 2008 @@ -132,18 +132,18 @@ { Referral refs0 = new Referral() { - public Collection getLdapUrls() + public Collection getLdapUrls() { return Collections.EMPTY_LIST; } - public void addLdapUrl( String a_url ) + public void addLdapUrl( String url ) { } - public void removeLdapUrl( String a_url ) + public void removeLdapUrl( String url ) { } }; Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java Tue Jun 24 02:03:08 2008 @@ -1350,8 +1350,8 @@ assertTrue( RdnParser.isValid( "a=\"b\\,c\"" ) ); Rdn rdn = new Rdn( "a=\"b\\,c\"" ); - assertEquals( "a=\"b\\,c\"", new Rdn( "a=\"b\\,c\"" ).getUpName() ); - assertEquals( "a=b\\,c", new Rdn( "a=\"b\\,c\"" ).toString() ); + assertEquals( "a=\"b\\,c\"", rdn.getUpName() ); + assertEquals( "a=b\\,c", rdn.toString() ); } Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java Tue Jun 24 02:03:08 2008 @@ -181,7 +181,6 @@ static class SyntaxImpl extends AbstractSyntax { - @SuppressWarnings ( { "AnalyzingVariableNaming" } ) private static final long serialVersionUID = 1L; protected SyntaxImpl(String oid) @@ -297,7 +296,7 @@ } - public Comparator getComparator() throws NamingException + public Comparator getComparator() throws NamingException { throw new NotImplementedException( "getComparator in org.apache.ldap.common.schema.SchemaUtilsTest.MatchingRuleImpl not implemented!" ); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java Tue Jun 24 02:03:08 2008 @@ -277,16 +277,16 @@ { SubtreeSpecification ss = parser.parse( SPEC_WITH_REFINEMENT ); - SimpleNode n1 = new EqualityNode( "objectClass", new ClientStringValue( "1.2.3" ) ); - SimpleNode n2 = new EqualityNode( "objectClass", new ClientStringValue( "4.5.6" ) ); - SimpleNode n3 = new EqualityNode( "objectClass", new ClientStringValue( "person-7" ) ); + SimpleNode n1 = new EqualityNode( "objectClass", new ClientStringValue( "1.2.3" ) ); + SimpleNode n2 = new EqualityNode( "objectClass", new ClientStringValue( "4.5.6" ) ); + SimpleNode n3 = new EqualityNode( "objectClass", new ClientStringValue( "person-7" ) ); BranchNode n4 = new OrNode(); n4.addNode( n2 ); n4.addNode( n3 ); BranchNode n5 = new AndNode(); n5.addNode( n1 ); n5.addNode( n4 ); - SimpleNode n6 = new EqualityNode( "objectClass", new ClientStringValue( "10.11.12" ) ); + SimpleNode n6 = new EqualityNode( "objectClass", new ClientStringValue( "10.11.12" ) ); BranchNode n7 = new NotNode(); n7.addNode( n6 ); BranchNode n8 = new AndNode(); Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/DirectoryClassUtilsTest.java Tue Jun 24 02:03:08 2008 @@ -42,7 +42,7 @@ } - public static void methodB( Collection c ) + public static void methodB( Collection c ) { } Modified: directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java?rev=671076&r1=671075&r2=671076&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java (original) +++ directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java Tue Jun 24 02:03:08 2008 @@ -54,7 +54,7 @@ public void testSingleArgument() { - Iterator[] iterators = new Iterator[] + Iterator[] iterators = new Iterator[] { Collections.singleton( "foo" ).iterator() }; try @@ -71,7 +71,7 @@ public void testTwoArguments() { - Iterator[] iterators = new Iterator[] + Iterator[] iterators = new Iterator[] { Collections.singleton( "foo" ).iterator(), Collections.singleton( "bar" ).iterator() }; JoinIterator iterator = new JoinIterator( iterators ); @@ -89,7 +89,7 @@ multivalued.add( "foo1" ); multivalued.add( "foo2" ); - Iterator[] iterators = new Iterator[] + Iterator[] iterators = new Iterator[] { Collections.singleton( "foo0" ).iterator(), multivalued.iterator(), Collections.singleton( "bar0" ).iterator(), Collections.singleton( "bar1" ).iterator() };