Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C30CADAEE for ; Fri, 17 Aug 2012 19:12:24 +0000 (UTC) Received: (qmail 50554 invoked by uid 500); 17 Aug 2012 19:12:23 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 50477 invoked by uid 500); 17 Aug 2012 19:12:23 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 50468 invoked by uid 99); 17 Aug 2012 19:12:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Aug 2012 19:12:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 17 Aug 2012 19:12:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 78C90238890D for ; Fri, 17 Aug 2012 19:11:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1374400 - in /commons/proper/collections/trunk/src/test/java/org/apache/commons/collections: ./ functors/ Date: Fri, 17 Aug 2012 19:11:35 -0000 To: commits@commons.apache.org From: tn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120817191136.78C90238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tn Date: Fri Aug 17 19:11:35 2012 New Revision: 1374400 URL: http://svn.apache.org/viewvc?rev=1374400&view=rev Log: Renamed unit tests for functors package. Added: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicClosureTestBase.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestCompositePredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/MockPredicateTestBase.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicPredicateTestBase.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestAllPredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestCatchAndRethrowClosure.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestComparatorPredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestEqualPredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java - copied, changed from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestNullPredicate.java Removed: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestCompositePredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicClosureTestBase.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicPredicateTestBase.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/MockPredicateTestBase.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestAllPredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestCatchAndRethrowClosure.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestComparatorPredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestEqualPredicate.java commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestNullPredicate.java Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java?rev=1374400&r1=1374399&r2=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestPredicateUtils.java Fri Aug 17 19:11:35 2012 @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.collections.functors.AllPredicate; -import org.apache.commons.collections.functors.BasicPredicateTestBase; +import org.apache.commons.collections.functors.AbstractPredicateTest; import org.apache.commons.collections.functors.EqualPredicate; import org.apache.commons.collections.functors.ExceptionPredicate; import org.apache.commons.collections.functors.FalsePredicate; @@ -50,7 +50,7 @@ import org.junit.Test; * @author Matt Benson */ @SuppressWarnings("boxing") -public class TestPredicateUtils extends BasicPredicateTestBase { +public class TestPredicateUtils extends AbstractPredicateTest { /** * Set up instance variables required by this test case. */ Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractAnyAllOnePredicateTest.java Fri Aug 17 19:11:35 2012 @@ -27,19 +27,17 @@ import java.util.Collections; /** * Base class for tests of AnyPredicate, AllPredicate, and OnePredicate. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Edwin Tellman + * @since 3.0 + * @version $Id$ */ -public abstract class AbstractTestAnyAllOnePredicate extends AbstractTestCompositePredicate { +public abstract class AbstractAnyAllOnePredicateTest extends AbstractCompositePredicateTest { /** * Creates a new TestCompositePredicate. * * @param testValue the value which the mock predicates should expect to see (may be null). */ - protected AbstractTestAnyAllOnePredicate(final T testValue) { + protected AbstractAnyAllOnePredicateTest(final T testValue) { super(testValue); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicClosureTestBase.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicClosureTestBase.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicClosureTestBase.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractClosureTest.java Fri Aug 17 19:11:35 2012 @@ -20,7 +20,7 @@ import org.apache.commons.collections.Cl import org.junit.Assert; import org.junit.Test; -public abstract class BasicClosureTestBase { +public abstract class AbstractClosureTest { @Test public void closureSanityTests() throws Exception { Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestCompositePredicate.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestCompositePredicate.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractTestCompositePredicate.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractCompositePredicateTest.java Fri Aug 17 19:11:35 2012 @@ -29,19 +29,17 @@ import java.util.List; /** * Base class for tests of composite predicates. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Edwin Tellman + * @since 3.0 + * @version $Id$ */ -public abstract class AbstractTestCompositePredicate extends MockPredicateTestBase { +public abstract class AbstractCompositePredicateTest extends AbstractMockPredicateTest { /** * Creates a new TestCompositePredicate. * * @param testValue the value which the mock predicates should expect to see (may be null). */ - protected AbstractTestCompositePredicate(final T testValue) { + protected AbstractCompositePredicateTest(final T testValue) { super(testValue); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/MockPredicateTestBase.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/MockPredicateTestBase.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/MockPredicateTestBase.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractMockPredicateTest.java Fri Aug 17 19:11:35 2012 @@ -30,12 +30,10 @@ import java.util.List; * Base class for tests of predicates which delegate to other predicates when evaluating an object. This class * provides methods to create and verify mock predicates to which to delegate. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Edwin Tellman + * @since 3.0 + * @version $Id$ */ -public abstract class MockPredicateTestBase { +public abstract class AbstractMockPredicateTest { /** * Mock predicates created by a single test case which need to be verified after the test completes. */ @@ -51,7 +49,7 @@ public abstract class MockPredicateTestB * * @param testValue the value to pass to mock predicates. */ - protected MockPredicateTestBase(final T testValue) { + protected AbstractMockPredicateTest(final T testValue) { this.testValue = testValue; } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicPredicateTestBase.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicPredicateTestBase.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/BasicPredicateTestBase.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AbstractPredicateTest.java Fri Aug 17 19:11:35 2012 @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public abstract class BasicPredicateTestBase { +public abstract class AbstractPredicateTest { protected Object cObject; protected String cString; protected Integer cInteger; Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestAllPredicate.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestAllPredicate.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestAllPredicate.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/AllPredicateTest.java Fri Aug 17 19:11:35 2012 @@ -13,18 +13,16 @@ import java.util.Collections; /** * Tests the org.apache.commons.collections.functors.AllPredicate class. * - * @since Commons Collections 3.0 - * @version $Revision$ - * - * @author Edwin Tellman + * @since 3.0 + * @version $Id$ */ @SuppressWarnings("boxing") -public class TestAllPredicate extends AbstractTestAnyAllOnePredicate { +public class AllPredicateTest extends AbstractAnyAllOnePredicateTest { /** * Creates a new TestAllPredicate. */ - public TestAllPredicate() { + public AllPredicateTest() { super(42); } Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestCatchAndRethrowClosure.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestCatchAndRethrowClosure.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestCatchAndRethrowClosure.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/CatchAndRethrowClosureTest.java Fri Aug 17 19:11:35 2012 @@ -23,7 +23,7 @@ import org.apache.commons.collections.Fu import org.junit.Assert; import org.junit.Test; -public class TestCatchAndRethrowClosure extends BasicClosureTestBase { +public class CatchAndRethrowClosureTest extends AbstractClosureTest { private static Closure generateIOExceptionClosure() { return new CatchAndRethrowClosure() { Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestComparatorPredicate.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestComparatorPredicate.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestComparatorPredicate.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/ComparatorPredicateTest.java Fri Aug 17 19:11:35 2012 @@ -23,7 +23,7 @@ import org.apache.commons.collections.Pr import org.junit.Test; -public class TestComparatorPredicate extends BasicPredicateTestBase { +public class ComparatorPredicateTest extends AbstractPredicateTest { private class TestComparator> implements Comparator { public int compare(T first, T second) { return first.compareTo(second); Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestEqualPredicate.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestEqualPredicate.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestEqualPredicate.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/EqualPredicateTest.java Fri Aug 17 19:11:35 2012 @@ -24,7 +24,7 @@ import org.apache.commons.collections.Pr import org.junit.Test; -public class TestEqualPredicate extends BasicPredicateTestBase { +public class EqualPredicateTest extends AbstractPredicateTest { private static final EqualsTestObject FALSE_OBJECT = new EqualsTestObject(false); private static final EqualsTestObject TRUE_OBJECT = new EqualsTestObject(true); Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java (from r1361641, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestNullPredicate.java) URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestNullPredicate.java&r1=1361641&r2=1374400&rev=1374400&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/TestNullPredicate.java (original) +++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/functors/NullPredicateTest.java Fri Aug 17 19:11:35 2012 @@ -23,7 +23,7 @@ import org.apache.commons.collections.Pr import org.junit.Test; -public class TestNullPredicate extends BasicPredicateTestBase { +public class NullPredicateTest extends AbstractPredicateTest { @Test public void testNullPredicate() { assertSame(NullPredicate.nullPredicate(), NullPredicate.nullPredicate());