Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 65082 invoked from network); 6 Jul 2010 17:26:25 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Jul 2010 17:26:25 -0000 Received: (qmail 80533 invoked by uid 500); 6 Jul 2010 17:26:25 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 80470 invoked by uid 500); 6 Jul 2010 17:26:24 -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 80463 invoked by uid 99); 6 Jul 2010 17:26:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jul 2010 17:26:24 +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; Tue, 06 Jul 2010 17:26:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 893302388A36; Tue, 6 Jul 2010 17:25:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r960948 - /directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java Date: Tue, 06 Jul 2010 17:25:29 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100706172529.893302388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Jul 6 17:25:29 2010 New Revision: 960948 URL: http://svn.apache.org/viewvc?rev=960948&view=rev Log: Test that we can have extra chars at the end of the filter Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java?rev=960948&r1=960947&r2=960948&view=diff ============================================================================== --- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java (original) +++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/FilterParserTest.java Tue Jul 6 17:25:29 2010 @@ -1053,4 +1053,19 @@ public class FilterParserTest String str = "(objectguid=\\29\\4C\\04\\B5\\D4\\ED\\38\\46\\87\\EE\\77\\58\\5C\\32\\AD\\91)"; FilterParser.parse( str ); } + + + @Test + public void testAndFilterFollowed() throws ParseException + { + String str = "(&(ou~=people)(age>=30))} some more text"; + BranchNode node = ( BranchNode ) FilterParser.parse( str ); + assertEquals( 2, node.getChildren().size() ); + assertTrue( node instanceof AndNode ); + String str2 = node.toString(); + assertTrue( str.startsWith( str2 ) ); + assertEquals( "(&(ou~=people)(age>=30))", str2 ); + } + + }