Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 96742 invoked from network); 25 Aug 2008 13:50:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Aug 2008 13:50:39 -0000 Received: (qmail 34643 invoked by uid 500); 25 Aug 2008 13:50:37 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 34617 invoked by uid 500); 25 Aug 2008 13:50:37 -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 34608 invoked by uid 99); 25 Aug 2008 13:50:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Aug 2008 06:50:37 -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; Mon, 25 Aug 2008 13:49:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7B8C42388988; Mon, 25 Aug 2008 06:49:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r688724 - /directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java Date: Mon, 25 Aug 2008 13:49:47 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080825134948.7B8C42388988@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Mon Aug 25 06:49:47 2008 New Revision: 688724 URL: http://svn.apache.org/viewvc?rev=688724&view=rev Log: Fixed size limit test for admin/non-admin user Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java?rev=688724&r1=688723&r2=688724&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java Mon Aug 25 06:49:47 2008 @@ -292,17 +292,31 @@ getActorsWithLimit( "(objectClass=*)", 0, 1 ); } - + + /** + * Sets up the server with shorter search size limit than the request's + * which constrains size by using server max limit value. Should work + * just fine for the administrative user. + */ + @Test + public void testRequestConstrainedGreaterThanConfigurationSize() throws Exception + { + ldapServer.setMaxSizeLimit( 1 ); + Set set = getActorsWithLimit( "(objectClass=*)", 0, 100000 ); + assertEquals( 4, set.size() ); + } + + /** * Sets up the server with shorter search size limit than the request's * which constrains size by using server max limit value to cause a size * limit exceeded exception on the client. */ @Test ( expected = SizeLimitExceededException.class ) - public void testRequestConstrainedGreaterThanConfigurationSize() throws Exception + public void testNonAdminRequestConstrainedGreaterThanConfigurationSize() throws Exception { ldapServer.setMaxSizeLimit( 1 ); - getActorsWithLimit( "(objectClass=*)", 0, 100000 ); + getActorsWithLimitNonAdmin( "(objectClass=*)", 0, 100000 ); }