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 435579F27 for ; Sat, 22 Oct 2011 01:23:05 +0000 (UTC) Received: (qmail 80452 invoked by uid 500); 22 Oct 2011 01:23:05 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 80378 invoked by uid 500); 22 Oct 2011 01:23:05 -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 80371 invoked by uid 99); 22 Oct 2011 01:23:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Oct 2011 01:23:04 +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; Sat, 22 Oct 2011 01:23:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 53F0623889EA for ; Sat, 22 Oct 2011 01:22:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1187622 [2/2] - in /commons/proper/functor/trunk/src/test/java/org/apache/commons/functor: adapter/ core/ core/collection/ core/comparator/ core/composite/ example/ example/kata/one/ example/kata/two/ example/lines/ example/map/ generator/... Date: Sat, 22 Oct 2011 01:22:37 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111022012242.53F0623889EA@eris.apache.org> Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryPredicate.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryPredicate.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryPredicate.java Sat Oct 22 01:22:33 2011 @@ -33,6 +33,7 @@ public class TestConditionalUnaryPredica // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new ConditionalUnaryPredicate( Constant.TRUE, Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java Sat Oct 22 01:22:33 2011 @@ -34,6 +34,7 @@ public class TestConditionalUnaryProcedu // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new ConditionalUnaryProcedure( Constant.TRUE, Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestDoWhileProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestDoWhileProcedure.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestDoWhileProcedure.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestDoWhileProcedure.java Sat Oct 22 01:22:33 2011 @@ -40,6 +40,7 @@ public class TestDoWhileProcedure extend // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new DoWhileProcedure(NoOp.INSTANCE, Constant.FALSE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestNot.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestNot.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestNot.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestNot.java Sat Oct 22 01:22:33 2011 @@ -35,6 +35,7 @@ public class TestNot extends BaseFunctor // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new Not(Constant.TRUE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java Sat Oct 22 01:22:33 2011 @@ -34,6 +34,7 @@ public class TestOr extends BaseFunctorT // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new Or(Constant.FALSE, Constant.TRUE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java Sat Oct 22 01:22:33 2011 @@ -36,6 +36,7 @@ public class TestSequence extends BaseFu // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new Sequence(new NoOp(),new NoOp()); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedFunction.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedFunction.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedFunction.java Sat Oct 22 01:22:33 2011 @@ -36,6 +36,7 @@ public class TestTransposedFunction exte // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new TransposedFunction(LeftIdentity.FUNCTION); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedPredicate.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedPredicate.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedPredicate.java Sat Oct 22 01:22:33 2011 @@ -36,6 +36,7 @@ public class TestTransposedPredicate ext // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new TransposedPredicate(Constant.TRUE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java Sat Oct 22 01:22:33 2011 @@ -34,6 +34,7 @@ public class TestTransposedProcedure ext // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new TransposedProcedure(NoOp.INSTANCE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java Sat Oct 22 01:22:33 2011 @@ -34,6 +34,7 @@ public class TestUnaryAnd extends BaseFu // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new UnaryAnd(Constant.TRUE, Constant.TRUE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryCompositeBinaryFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryCompositeBinaryFunction.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryCompositeBinaryFunction.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryCompositeBinaryFunction.java Sat Oct 22 01:22:33 2011 @@ -36,6 +36,7 @@ public class TestUnaryCompositeBinaryFun // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new UnaryCompositeBinaryFunction( RightIdentity.FUNCTION, Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryCompositeBinaryPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryCompositeBinaryPredicate.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryCompositeBinaryPredicate.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryCompositeBinaryPredicate.java Sat Oct 22 01:22:33 2011 @@ -35,6 +35,7 @@ public class TestUnaryCompositeBinaryPre // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new UnaryCompositeBinaryPredicate( RightIdentity.PREDICATE, Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryNot.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryNot.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryNot.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryNot.java Sat Oct 22 01:22:33 2011 @@ -35,6 +35,7 @@ public class TestUnaryNot extends BaseFu // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new UnaryNot(Constant.TRUE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java Sat Oct 22 01:22:33 2011 @@ -33,6 +33,7 @@ public class TestUnaryOr extends BaseFun // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new UnaryOr(Constant.FALSE,Constant.TRUE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java Sat Oct 22 01:22:33 2011 @@ -36,6 +36,7 @@ public class TestUnarySequence extends B // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new UnarySequence(new NoOp(),new NoOp()); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestWhileDoProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestWhileDoProcedure.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestWhileDoProcedure.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestWhileDoProcedure.java Sat Oct 22 01:22:33 2011 @@ -40,6 +40,7 @@ public class TestWhileDoProcedure extend // Functor Testing Framework // ------------------------------------------------------------------------ + @Override protected Object makeFunctor() { return new WhileDoProcedure(Constant.FALSE, NoOp.INSTANCE); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java Sat Oct 22 01:22:33 2011 @@ -575,12 +575,14 @@ public class FlexiMapExample { } private UniversalFunctor throwNPE = new UniversalFunctor() { + @Override public void run() { throw new NullPointerException(); } }; private UniversalFunctor throwCCE = new UniversalFunctor() { + @Override public void run() { throw new ClassCastException(); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/QuicksortExample.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/QuicksortExample.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/QuicksortExample.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/QuicksortExample.java Sat Oct 22 01:22:33 2011 @@ -344,6 +344,7 @@ public class QuicksortExample { new Constant(Collections.EMPTY_LIST), /* ...else, apply the following function... */ new ListFunction() { + @Override public Object evaluate(List list) { /* Create a list to contain the results. */ List result = new ArrayList(list.size()); @@ -434,6 +435,7 @@ public class QuicksortExample { */ private UnaryFunction head = new ListFunction() { + @Override public Object evaluate(List list) { return list.get(0); } @@ -443,6 +445,7 @@ public class QuicksortExample { * and its tail: */ private UnaryFunction tail = new ListFunction() { + @Override public Object evaluate(List list) { return list.size() < 2 ? Collections.EMPTY_LIST : @@ -457,6 +460,7 @@ public class QuicksortExample { * a predicate identifying elements less than the head. */ private BinaryFunction lesserTail = new ObjectListFunction() { + @Override public Object evaluate(Object head, List tail) { return new FilteredGenerator( IteratorToGeneratorAdapter.adapt(tail.iterator()), @@ -470,6 +474,7 @@ public class QuicksortExample { * is similar to the lesserTail approach. */ private BinaryFunction greaterTail = new ObjectListFunction() { + @Override public Object evaluate(Object head, List tail) { return new FilteredGenerator( IteratorToGeneratorAdapter.adapt(tail.iterator()), Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Money.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Money.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Money.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/Money.java Sat Oct 22 01:22:33 2011 @@ -29,6 +29,7 @@ public class Money { return cents; } + @Override public boolean equals(Object obj) { if (obj instanceof Money) { Money that = (Money) obj; @@ -38,10 +39,12 @@ public class Money { } } + @Override public int hashCode() { return getValueAsCents(); } + @Override public String toString() { return getValueAsCents() + " cents"; } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java Sat Oct 22 01:22:33 2011 @@ -121,6 +121,7 @@ public class TestBinaryChop { @Test public void testBuiltIn() { chopTest(new BaseBinaryChop() { + @Override public int find(Object seeking, List list) { int result = Collections.binarySearch(list,seeking); // @@ -151,6 +152,7 @@ public class TestBinaryChop { @Test public void testIterative() { chopTest(new BaseBinaryChop() { + @Override public int find(Object seeking, List list) { int high = list.size(); int low = 0; @@ -276,6 +278,7 @@ public class TestBinaryChop { public void testIterativeWithInvariants() { chopTest(new BaseBinaryChop() { + @Override public int find(final Object seeking, final List list) { Loop loop = new Loop() { int high = list.size(); @@ -393,6 +396,7 @@ public class TestBinaryChop { @Test public void testIterativeWithInvariantsAndAssertions() { chopTest(new BaseBinaryChop() { + @Override public int find(Object seeking, List list) { BinarySearchLoop loop = new BinarySearchLoop(seeking,list); loop.run(); @@ -408,6 +412,7 @@ public class TestBinaryChop { @Test public void testRecursive() { chopTest(new BaseBinaryChop() { + @Override public int find(Object seeking, List list) { return find(seeking, list, 0, list.size()); } @@ -442,6 +447,7 @@ public class TestBinaryChop { @Test public void testTailRecursive() { chopTest(new BaseBinaryChop() { + @Override public int find(final Object seeking, final List list) { return ((Number) new RecursiveEvaluation(new Function() { public Object evaluate() { @@ -488,6 +494,7 @@ public class TestBinaryChop { @Test public void testRecursive2() { chopTest(new BaseBinaryChop() { + @Override public int find(Object seeking, List list) { return find(seeking,list,0); } @@ -518,6 +525,7 @@ public class TestBinaryChop { @Test public void testTailRecursive2() { chopTest(new BaseBinaryChop() { + @Override public int find(final Object seeking, final List list) { return ((Number) new RecursiveEvaluation(new Function() { public Object evaluate() { Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/Lines.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/Lines.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/Lines.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/Lines.java Sat Oct 22 01:22:33 2011 @@ -60,6 +60,7 @@ public class Lines extends BaseGenerator } } + @Override public void stop() { super.stop(); try { @@ -83,6 +84,7 @@ public class Lines extends BaseGenerator /** * Get the cause of this TunneledException */ + @Override public Throwable getCause() { return exception; } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/TestLines.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/TestLines.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/TestLines.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/TestLines.java Sat Oct 22 01:22:33 2011 @@ -49,11 +49,13 @@ public class TestLines extends TestCase private Reader reader = null; + @Override public void setUp() throws Exception { super.setUp(); reader = new StringReader(DOCUMENT); } + @Override public void tearDown() throws Exception { super.tearDown(); reader = null; Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/FunctoredMap.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/FunctoredMap.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/FunctoredMap.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/FunctoredMap.java Sat Oct 22 01:22:33 2011 @@ -37,10 +37,12 @@ public class FunctoredMap implements Map this.map = map; } + @Override public int hashCode() { return map.hashCode(); } + @Override public String toString() { return map.toString(); } @@ -89,6 +91,7 @@ public class FunctoredMap implements Map return onremove.evaluate(map,key); } + @Override public boolean equals(Object obj) { return map.equals(obj); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestFixedSizeMap.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestFixedSizeMap.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestFixedSizeMap.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestFixedSizeMap.java Sat Oct 22 01:22:33 2011 @@ -42,6 +42,7 @@ public class TestFixedSizeMap extends Te private Map baseMap = null; private Map fixedMap = null; + @Override public void setUp() throws Exception { super.setUp(); baseMap = new HashMap(); @@ -54,6 +55,7 @@ public class TestFixedSizeMap extends Te fixedMap = new FixedSizeMap(baseMap); } + @Override public void tearDown() throws Exception { super.tearDown(); baseMap = null; Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestLazyMap.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestLazyMap.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestLazyMap.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestLazyMap.java Sat Oct 22 01:22:33 2011 @@ -46,6 +46,7 @@ public class TestLazyMap extends TestCas private Map lazyMap = null; private Map expectedMap = null; + @Override public void setUp() throws Exception { super.setUp(); expectedMap = new HashMap(); @@ -59,6 +60,7 @@ public class TestLazyMap extends TestCas lazyMap = new LazyMap(baseMap,Size.instance()); } + @Override public void tearDown() throws Exception { super.tearDown(); baseMap = null; Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestPredicatedMap.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestPredicatedMap.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestPredicatedMap.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/TestPredicatedMap.java Sat Oct 22 01:22:33 2011 @@ -43,12 +43,14 @@ public class TestPredicatedMap extends T private Map baseMap = null; private Map predicatedMap = null; + @Override public void setUp() throws Exception { super.setUp(); baseMap = new HashMap(); predicatedMap = new PredicatedMap(baseMap,IsInstance.of(String.class),IsInstance.of(Integer.class)); } + @Override public void tearDown() throws Exception { super.tearDown(); baseMap = null; Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/TestIteratorToGeneratorAdapter.java Sat Oct 22 01:22:33 2011 @@ -37,6 +37,7 @@ import org.junit.Test; @SuppressWarnings("unchecked") public class TestIteratorToGeneratorAdapter extends BaseFunctorTest { + @Override public Object makeFunctor() { List list = new ArrayList(); list.add("1"); Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestEachElement.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestEachElement.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestEachElement.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestEachElement.java Sat Oct 22 01:22:33 2011 @@ -46,6 +46,7 @@ public class TestEachElement extends Bas private Map map = null; private Object[] array = null; + @Override protected Object makeFunctor() throws Exception { return EachElement.from(new ArrayList()); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestIntegerRange.java Sat Oct 22 01:22:33 2011 @@ -33,6 +33,7 @@ import org.junit.Test; @SuppressWarnings("unchecked") public class TestIntegerRange extends BaseFunctorTest { + @Override protected Object makeFunctor() throws Exception { return new IntegerRange(10, 20); } Modified: commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java?rev=1187622&r1=1187621&r2=1187622&view=diff ============================================================================== --- commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java (original) +++ commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/generator/util/TestLongRange.java Sat Oct 22 01:22:33 2011 @@ -33,6 +33,7 @@ import org.junit.Test; @SuppressWarnings("unchecked") public class TestLongRange extends BaseFunctorTest { + @Override protected Object makeFunctor() throws Exception { return new LongRange(10, 20); }