Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 87700 invoked from network); 1 May 2010 09:18:04 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 May 2010 09:18:04 -0000 Received: (qmail 50609 invoked by uid 500); 1 May 2010 09:18:03 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 50554 invoked by uid 500); 1 May 2010 09:18:02 -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 50547 invoked by uid 99); 1 May 2010 09:18:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 May 2010 09:18:01 +0000 X-ASF-Spam-Status: No, hits=-1295.1 required=10.0 tests=ALL_TRUSTED,AWL 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; Sat, 01 May 2010 09:18:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD80623889B8; Sat, 1 May 2010 09:17:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r939958 - /directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java Date: Sat, 01 May 2010 09:17:10 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100501091710.CD80623889B8@eris.apache.org> Author: seelmann Date: Sat May 1 09:17:10 2010 New Revision: 939958 URL: http://svn.apache.org/viewvc?rev=939958&view=rev Log: Removed System.out, added assertion for person OC, formatting Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java?rev=939958&r1=939957&r2=939958&view=diff ============================================================================== --- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java (original) +++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java Sat May 1 09:17:10 2010 @@ -333,23 +333,29 @@ public class SchemaSearchIT extends Abst public void testSubSchemaSubEntrySearch() throws Exception { DirContext ctx = getWiredContext( ldapServer ); - + SearchControls searchControls = new SearchControls(); searchControls.setSearchScope( SearchControls.OBJECT_SCOPE ); - searchControls.setReturningAttributes( new String[]{ "objectClasses" } ); + searchControls.setReturningAttributes( new String[] + { "objectClasses" } ); NamingEnumeration results = ctx.search( "cn=schema", "(ObjectClass=*)", searchControls ); assertTrue( results.hasMore() ); SearchResult result = results.next(); Attributes entry = result.getAttributes(); - Attribute objectClasses = entry.get( "objectClasses" ); + Attribute objectClasses = entry.get( "objectClasses" ); NamingEnumeration ocs = objectClasses.getAll(); while ( ocs.hasMore() ) { - String oc = (String)ocs.nextElement(); - System.out.println( oc ); + String oc = ( String ) ocs.nextElement(); + if ( oc.contains( "2.5.6.6" ) ) + { + assertEquals( + "( 2.5.6.6 NAME 'person' DESC 'RFC2256: a person' SUP top STRUCTURAL MUST ( sn $ cn ) MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) X-SCHEMA 'core' )", + oc ); + } } results.close();