Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 43704 invoked from network); 20 Dec 2010 18:25:14 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Dec 2010 18:25:14 -0000 Received: (qmail 10259 invoked by uid 500); 20 Dec 2010 18:25:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 10206 invoked by uid 500); 20 Dec 2010 18:25:14 -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 10199 invoked by uid 99); 20 Dec 2010 18:25:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Dec 2010 18:25:14 +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; Mon, 20 Dec 2010 18:25:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2E8C423889EB; Mon, 20 Dec 2010 18:24:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1051233 [2/2] - in /directory: apacheds/branches/alex_refactoring/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/branches/alex_refactoring/core-api/src/test/java/org/apache/directory/server/core/entry/ ap... Date: Mon, 20 Dec 2010 18:24:45 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101220182448.2E8C423889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1051233&r1=1051232&r2=1051233&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Mon Dec 20 18:24:40 2010 @@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.syntaxCheckers.UuidSyntaxChecker; -import org.apache.directory.shared.ldap.util.LdapExceptionUtils; +import org.apache.directory.shared.util.ExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -101,14 +101,14 @@ public class NotCursorTest if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) ); if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } } Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1051233&r1=1051232&r2=1051233&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Mon Dec 20 18:24:40 2010 @@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.LdapExceptionUtils; +import org.apache.directory.shared.util.ExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -96,14 +96,14 @@ public class OneLevelScopeTest if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) ); if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } } Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1051233&r1=1051232&r2=1051233&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Mon Dec 20 18:24:40 2010 @@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.LdapExceptionUtils; +import org.apache.directory.shared.util.ExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -103,14 +103,14 @@ public class OrCursorTest if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) ); if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } } Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1051233&r1=1051232&r2=1051233&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Mon Dec 20 18:24:40 2010 @@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.LdapExceptionUtils; +import org.apache.directory.shared.util.ExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -91,14 +91,14 @@ public class PresenceTest if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) ); if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } } Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1051233&r1=1051232&r2=1051233&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Mon Dec 20 18:24:40 2010 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.LdapExceptionUtils; +import org.apache.directory.shared.util.ExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -87,14 +87,14 @@ public class SubstringTest if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) ); if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } } Modified: directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1051233&r1=1051232&r2=1051233&view=diff ============================================================================== --- directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original) +++ directory/apacheds/branches/alex_refactoring/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Mon Dec 20 18:24:40 2010 @@ -51,7 +51,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.LdapExceptionUtils; +import org.apache.directory.shared.util.ExceptionUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -96,14 +96,14 @@ public class SubtreeScopeTest if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } loaded = schemaManager.loadWithDeps( loader.getSchema( "collective" ) ); if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(schemaManager.getErrors()) ); } } Modified: directory/shared/branches/alex_refactoring/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoaderTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoaderTest.java?rev=1051233&r1=1051232&r2=1051233&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoaderTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoaderTest.java Mon Dec 20 18:24:40 2010 @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; -import org.apache.directory.shared.ldap.util.LdapExceptionUtils; +import org.apache.directory.shared.util.ExceptionUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -90,7 +90,7 @@ public class LdifSchemaLoaderTest if ( !loaded ) { - fail( "Schema load failed : " + LdapExceptionUtils.printErrors( sm.getErrors() ) ); + fail( "Schema load failed : " + ExceptionUtils.printErrors(sm.getErrors()) ); } assertTrue( sm.getRegistries().getAttributeTypeRegistry().contains( "cn" ) ); Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ExceptionUtils.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapExceptionUtils.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ExceptionUtils.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ExceptionUtils.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapExceptionUtils.java&r1=1049962&r2=1051233&rev=1051233&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapExceptionUtils.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ExceptionUtils.java Mon Dec 20 18:24:40 2010 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.util; +package org.apache.directory.shared.util; import java.util.List; @@ -31,12 +31,12 @@ import java.util.List; * * @author Apache Directory Project */ -public final class LdapExceptionUtils +public final class ExceptionUtils { /** * Private constructor */ - private LdapExceptionUtils() + private ExceptionUtils() { } Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/ExceptionUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/JoinIterator.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/JoinIterator.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/JoinIterator.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java&r1=1049962&r2=1051233&rev=1051233&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/JoinIterator.java Mon Dec 20 18:24:40 2010 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.util; +package org.apache.directory.shared.util; import java.util.Iterator; Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/JoinIterator.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryAndOptionalComponentsMonitor.java (from r1051214, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryAndOptionalComponentsMonitor.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryAndOptionalComponentsMonitor.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryAndOptionalComponentsMonitor.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryAndOptionalComponentsMonitor.java&r1=1051214&r2=1051233&rev=1051233&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryAndOptionalComponentsMonitor.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryAndOptionalComponentsMonitor.java Mon Dec 20 18:24:40 2010 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap.util; +package org.apache.directory.shared.util; import java.util.Collections; @@ -26,7 +26,6 @@ import java.util.LinkedList; import java.util.List; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.util.ComponentsMonitor; /** Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryAndOptionalComponentsMonitor.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryComponentsMonitor.java (from r1051214, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryComponentsMonitor.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryComponentsMonitor.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryComponentsMonitor.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryComponentsMonitor.java&r1=1051214&r2=1051233&rev=1051233&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/MandatoryComponentsMonitor.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryComponentsMonitor.java Mon Dec 20 18:24:40 2010 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap.util; +package org.apache.directory.shared.util; import org.apache.directory.shared.util.AbstractSimpleComponentsMonitor; Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/MandatoryComponentsMonitor.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/OptionalComponentsMonitor.java (from r1051214, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/OptionalComponentsMonitor.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/OptionalComponentsMonitor.java?p2=directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/OptionalComponentsMonitor.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/OptionalComponentsMonitor.java&r1=1051214&r2=1051233&rev=1051233&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/util/OptionalComponentsMonitor.java (original) +++ directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/OptionalComponentsMonitor.java Mon Dec 20 18:24:40 2010 @@ -18,7 +18,7 @@ * */ -package org.apache.directory.shared.ldap.util; +package org.apache.directory.shared.util; import org.apache.directory.shared.util.AbstractSimpleComponentsMonitor; Propchange: directory/shared/branches/alex_refactoring/util/src/main/java/org/apache/directory/shared/util/OptionalComponentsMonitor.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java (from r1049962, directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java?p2=directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java&p1=directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java&r1=1049962&r2=1051233&rev=1051233&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/util/JoinIteratorTest.java (original) +++ directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java Mon Dec 20 18:24:40 2010 @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.directory.shared.ldap.util; +package org.apache.directory.shared.util; import static org.junit.Assert.assertEquals; @@ -33,6 +33,7 @@ import java.util.List; import org.apache.directory.junit.tools.Concurrent; import org.apache.directory.junit.tools.ConcurrentJunitRunner; +import org.apache.directory.shared.util.JoinIterator; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,11 +53,11 @@ public class JoinIteratorTest try { new JoinIterator( null ); - fail( "Should not be able to create a JoinIterator with null args" ); + Assert.fail("Should not be able to create a JoinIterator with null args"); } catch ( IllegalArgumentException e ) { - assertNotNull( e ); + Assert.assertNotNull(e); } } @@ -70,11 +71,11 @@ public class JoinIteratorTest try { new JoinIterator( iterators ); - fail( "Should not be able to create a JoinIterator with a single Iterator" ); + Assert.fail("Should not be able to create a JoinIterator with a single Iterator"); } catch ( IllegalArgumentException e ) { - assertNotNull( e ); + Assert.assertNotNull(e); } } @@ -86,11 +87,11 @@ public class JoinIteratorTest { Collections.singleton( "foo" ).iterator(), Collections.singleton( "bar" ).iterator() }; JoinIterator iterator = new JoinIterator( iterators ); - assertTrue( "iterator should have an element", iterator.hasNext() ); - assertEquals( "foo", iterator.next() ); - assertTrue( "iterator should have an element", iterator.hasNext() ); - assertEquals( "bar", iterator.next() ); - assertFalse( "iterator should NOT have an element", iterator.hasNext() ); + Assert.assertTrue("iterator should have an element", iterator.hasNext()); + Assert.assertEquals("foo", iterator.next()); + Assert.assertTrue("iterator should have an element", iterator.hasNext()); + Assert.assertEquals("bar", iterator.next()); + Assert.assertFalse("iterator should NOT have an element", iterator.hasNext()); } @@ -106,16 +107,16 @@ public class JoinIteratorTest Collections.singleton( "bar0" ).iterator(), Collections.singleton( "bar1" ).iterator() }; JoinIterator iterator = new JoinIterator( iterators ); - assertTrue( "iterator should have an element", iterator.hasNext() ); - assertEquals( "foo0", iterator.next() ); - assertTrue( "iterator should have an element", iterator.hasNext() ); - assertEquals( "foo1", iterator.next() ); - assertTrue( "iterator should have an element", iterator.hasNext() ); - assertEquals( "foo2", iterator.next() ); - assertTrue( "iterator should have an element", iterator.hasNext() ); - assertEquals( "bar0", iterator.next() ); - assertTrue( "iterator should have an element", iterator.hasNext() ); - assertEquals( "bar1", iterator.next() ); - assertFalse( "iterator should NOT have an element", iterator.hasNext() ); + Assert.assertTrue("iterator should have an element", iterator.hasNext()); + Assert.assertEquals("foo0", iterator.next()); + Assert.assertTrue("iterator should have an element", iterator.hasNext()); + Assert.assertEquals("foo1", iterator.next()); + Assert.assertTrue("iterator should have an element", iterator.hasNext()); + Assert.assertEquals("foo2", iterator.next()); + Assert.assertTrue("iterator should have an element", iterator.hasNext()); + Assert.assertEquals("bar0", iterator.next()); + Assert.assertTrue("iterator should have an element", iterator.hasNext()); + Assert.assertEquals("bar1", iterator.next()); + Assert.assertFalse("iterator should NOT have an element", iterator.hasNext()); } } Propchange: directory/shared/branches/alex_refactoring/util/src/test/java/org/apache/directory/shared/util/JoinIteratorTest.java ------------------------------------------------------------------------------ svn:eol-style = native