commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwaldh...@apache.org
Subject cvs commit: jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite TestBinaryProcedureSequence.java TestConditionalBinaryProcedure.java TestConditionalProcedure.java TestConditionalUnaryProcedure.java TestProcedureSequence.java TestTransposedProcedure.java TestUnaryProcedureSequence.java
Date Mon, 24 Feb 2003 11:48:10 GMT
rwaldhoff    2003/02/24 03:48:09

  Modified:    functor/src/test/org/apache/commons/functor/adapter
                        TestBinaryFunctionBinaryProcedure.java
                        TestBinaryProcedureBinaryFunction.java
                        TestBoundProcedure.java TestFunctionProcedure.java
                        TestFunctionUnaryFunction.java
                        TestLeftBoundProcedure.java
                        TestProcedureFunction.java
                        TestProcedureUnaryProcedure.java
                        TestRightBoundProcedure.java
                        TestUnaryFunctionBinaryFunction.java
                        TestUnaryFunctionUnaryProcedure.java
                        TestUnaryProcedureBinaryProcedure.java
                        TestUnaryProcedureUnaryFunction.java
               functor/src/test/org/apache/commons/functor/core
                        TestAll.java
               functor/src/test/org/apache/commons/functor/core/composite
                        TestBinaryProcedureSequence.java
                        TestConditionalBinaryProcedure.java
                        TestConditionalProcedure.java
                        TestConditionalUnaryProcedure.java
                        TestProcedureSequence.java
                        TestTransposedProcedure.java
                        TestUnaryProcedureSequence.java
  Added:       functor/src/java/org/apache/commons/functor/core NoOp.java
               functor/src/test/org/apache/commons/functor/core
                        TestNoOp.java
  Removed:     functor/src/java/org/apache/commons/functor/core
                        NoOpProcedure.java
               functor/src/test/org/apache/commons/functor/core
                        TestNoOpProcedure.java
  Log:
  rename NoOpProcedure to NoOp
  
  Revision  Changes    Path
  1.1                  jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/NoOp.java
  
  Index: NoOp.java
  ===================================================================
  /* 
   * $Header: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/NoOp.java,v 1.1 2003/02/24 11:48:08 rwaldhoff Exp $
   * ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived 
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.commons.functor.core;
  
  import java.io.Serializable;
  
  import org.apache.commons.functor.BinaryProcedure;
  import org.apache.commons.functor.Procedure;
  import org.apache.commons.functor.UnaryProcedure;
  
  /**
   * A procedure that does nothing at all.
   * 
   * @version $Revision: 1.1 $ $Date: 2003/02/24 11:48:08 $
   * @author Rodney Waldhoff
   */
  public final class NoOp implements Procedure, UnaryProcedure, BinaryProcedure, Serializable {
  
      // constructor
      // ------------------------------------------------------------------------
      public NoOp() {
      }
   
      // predicate interface
      // ------------------------------------------------------------------------
      public void run() {
      }
  
      public void run(Object obj) {
      }
  
      public void run(Object left, Object right) {
      }
  
      public boolean equals(Object that) {
          return (that instanceof NoOp);
      }
          
      public int hashCode() {
          return "NoOp".hashCode();
      }
      
      public String toString() {
          return "NoOp";
      }
      
      // static methods
      // ------------------------------------------------------------------------
      public static NoOp getNoOpProcedure() {
          return INSTANCE;
      }
  
      // static attributes
      // ------------------------------------------------------------------------
      private static final NoOp INSTANCE = new NoOp();
  }
  
  
  
  1.2       +4 -4      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestBinaryFunctionBinaryProcedure.java
  
  Index: TestBinaryFunctionBinaryProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestBinaryFunctionBinaryProcedure.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestBinaryFunctionBinaryProcedure.java	27 Jan 2003 19:33:41 -0000	1.1
  +++ TestBinaryFunctionBinaryProcedure.java	24 Feb 2003 11:48:08 -0000	1.2
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.BinaryFunction;
   import org.apache.commons.functor.BinaryProcedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -121,7 +121,7 @@
           BinaryProcedure p = new BinaryFunctionBinaryProcedure(new ConstantFunction("K"));
           assertEquals(p,p);
           assertObjectsAreEqual(p,new BinaryFunctionBinaryProcedure(new ConstantFunction("K")));
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreNotEqual(p,new NoOp());
           assertObjectsAreNotEqual(p,new BinaryFunctionBinaryProcedure(null));
           assertObjectsAreNotEqual(p,new BinaryFunctionBinaryProcedure(new ConstantFunction("J")));
           assertObjectsAreEqual(new BinaryFunctionBinaryProcedure(null),new BinaryFunctionBinaryProcedure(null));
  
  
  
  1.3       +8 -8      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestBinaryProcedureBinaryFunction.java
  
  Index: TestBinaryProcedureBinaryFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestBinaryProcedureBinaryFunction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestBinaryProcedureBinaryFunction.java	28 Jan 2003 12:00:30 -0000	1.2
  +++ TestBinaryProcedureBinaryFunction.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.BinaryFunction;
   import org.apache.commons.functor.BinaryProcedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -86,7 +86,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new BinaryProcedureBinaryFunction(new NoOpProcedure());
  +        return new BinaryProcedureBinaryFunction(new NoOp());
       }
   
       // Lifecycle
  @@ -104,14 +104,14 @@
       // ------------------------------------------------------------------------    
   
       public void testEvaluate() throws Exception {
  -        BinaryFunction f = new BinaryProcedureBinaryFunction(new NoOpProcedure());
  +        BinaryFunction f = new BinaryProcedureBinaryFunction(new NoOp());
           assertNull(f.evaluate(null,null));
       }
       
       public void testEquals() throws Exception {
  -        BinaryFunction f = new BinaryProcedureBinaryFunction(new NoOpProcedure());
  +        BinaryFunction f = new BinaryProcedureBinaryFunction(new NoOp());
           assertEquals(f,f);
  -        assertObjectsAreEqual(f,new BinaryProcedureBinaryFunction(new NoOpProcedure()));
  +        assertObjectsAreEqual(f,new BinaryProcedureBinaryFunction(new NoOp()));
           assertObjectsAreNotEqual(f,new ConstantFunction("x"));
           assertObjectsAreNotEqual(f,new BinaryProcedureBinaryFunction(new BinaryProcedure() { public void run(Object a, Object b) { } }));
           assertObjectsAreNotEqual(f,new ConstantFunction(null));
  @@ -124,6 +124,6 @@
       }
   
       public void testAdapt() throws Exception {
  -        assertNotNull(BinaryProcedureBinaryFunction.adapt(new NoOpProcedure()));
  +        assertNotNull(BinaryProcedureBinaryFunction.adapt(new NoOp()));
       }
   }
  
  
  
  1.3       +11 -11    jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestBoundProcedure.java
  
  Index: TestBoundProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestBoundProcedure.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestBoundProcedure.java	19 Feb 2003 00:54:36 -0000	1.2
  +++ TestBoundProcedure.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -62,7 +62,7 @@
   import org.apache.commons.functor.BaseFunctorTest;
   import org.apache.commons.functor.Procedure;
   import org.apache.commons.functor.core.IdentityFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -85,7 +85,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new BoundProcedure(new NoOpProcedure(),"xyzzy");
  +        return new BoundProcedure(new NoOp(),"xyzzy");
       }
   
       // Lifecycle
  @@ -108,14 +108,14 @@
       }
       
       public void testEquals() throws Exception {
  -        Procedure f = new BoundProcedure(new NoOpProcedure(),"xyzzy");
  +        Procedure f = new BoundProcedure(new NoOp(),"xyzzy");
           assertEquals(f,f);
  -        assertObjectsAreEqual(f,new BoundProcedure(new NoOpProcedure(),"xyzzy"));
  -        assertObjectsAreNotEqual(f,new NoOpProcedure());
  -        assertObjectsAreNotEqual(f,new BoundProcedure(new NoOpProcedure(),"foo"));
  +        assertObjectsAreEqual(f,new BoundProcedure(new NoOp(),"xyzzy"));
  +        assertObjectsAreNotEqual(f,new NoOp());
  +        assertObjectsAreNotEqual(f,new BoundProcedure(new NoOp(),"foo"));
           assertObjectsAreNotEqual(f,new BoundProcedure(new UnaryFunctionUnaryProcedure(new IdentityFunction()),"xyzzy"));
           assertObjectsAreNotEqual(f,new BoundProcedure(null,"xyzzy"));
  -        assertObjectsAreNotEqual(f,new BoundProcedure(new NoOpProcedure(),null));
  +        assertObjectsAreNotEqual(f,new BoundProcedure(new NoOp(),null));
           assertObjectsAreEqual(new BoundProcedure(null,null),new BoundProcedure(null,null));
       }
   
  @@ -124,7 +124,7 @@
       }
   
       public void testAdapt() throws Exception {
  -        assertNotNull(BoundProcedure.bind(new NoOpProcedure(),"xyzzy"));
  -        assertNotNull(BoundProcedure.bind(new NoOpProcedure(),null));
  +        assertNotNull(BoundProcedure.bind(new NoOp(),"xyzzy"));
  +        assertNotNull(BoundProcedure.bind(new NoOp(),null));
       }
   }
  
  
  
  1.2       +4 -4      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestFunctionProcedure.java
  
  Index: TestFunctionProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestFunctionProcedure.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestFunctionProcedure.java	27 Jan 2003 19:33:41 -0000	1.1
  +++ TestFunctionProcedure.java	24 Feb 2003 11:48:08 -0000	1.2
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.Function;
   import org.apache.commons.functor.Procedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -121,7 +121,7 @@
           Procedure p = new FunctionProcedure(new ConstantFunction("K"));
           assertEquals(p,p);
           assertObjectsAreEqual(p,new FunctionProcedure(new ConstantFunction("K")));
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreNotEqual(p,new NoOp());
           assertObjectsAreNotEqual(p,new FunctionProcedure(null));
           assertObjectsAreNotEqual(p,new FunctionProcedure(new ConstantFunction("J")));
           assertObjectsAreEqual(new FunctionProcedure(null),new FunctionProcedure(null));
  
  
  
  1.3       +3 -3      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestFunctionUnaryFunction.java
  
  Index: TestFunctionUnaryFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestFunctionUnaryFunction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestFunctionUnaryFunction.java	28 Jan 2003 12:00:30 -0000	1.2
  +++ TestFunctionUnaryFunction.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -64,7 +64,7 @@
   import org.apache.commons.functor.Function;
   import org.apache.commons.functor.Procedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  
  
  
  1.3       +11 -11    jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestLeftBoundProcedure.java
  
  Index: TestLeftBoundProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestLeftBoundProcedure.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestLeftBoundProcedure.java	19 Feb 2003 00:54:36 -0000	1.2
  +++ TestLeftBoundProcedure.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -62,7 +62,7 @@
   import org.apache.commons.functor.BaseFunctorTest;
   import org.apache.commons.functor.UnaryProcedure;
   import org.apache.commons.functor.core.IdentityFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   import org.apache.commons.functor.core.RightIdentityFunction;
   
   /**
  @@ -86,7 +86,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new LeftBoundProcedure(new NoOpProcedure(),"xyzzy");
  +        return new LeftBoundProcedure(new NoOp(),"xyzzy");
       }
   
       // Lifecycle
  @@ -110,14 +110,14 @@
       }
       
       public void testEquals() throws Exception {
  -        UnaryProcedure f = new LeftBoundProcedure(new NoOpProcedure(),"xyzzy");
  +        UnaryProcedure f = new LeftBoundProcedure(new NoOp(),"xyzzy");
           assertEquals(f,f);
  -        assertObjectsAreEqual(f,new LeftBoundProcedure(new NoOpProcedure(),"xyzzy"));
  -        assertObjectsAreNotEqual(f,new NoOpProcedure());        
  +        assertObjectsAreEqual(f,new LeftBoundProcedure(new NoOp(),"xyzzy"));
  +        assertObjectsAreNotEqual(f,new NoOp());        
           assertObjectsAreNotEqual(f,new LeftBoundProcedure(new BinaryFunctionBinaryProcedure(new RightIdentityFunction()),"xyzzy"));
  -        assertObjectsAreNotEqual(f,new LeftBoundProcedure(new NoOpProcedure(),"foo"));
  +        assertObjectsAreNotEqual(f,new LeftBoundProcedure(new NoOp(),"foo"));
           assertObjectsAreNotEqual(f,new LeftBoundProcedure(null,"xyzzy"));
  -        assertObjectsAreNotEqual(f,new LeftBoundProcedure(new NoOpProcedure(),null));
  +        assertObjectsAreNotEqual(f,new LeftBoundProcedure(new NoOp(),null));
           assertObjectsAreEqual(new LeftBoundProcedure(null,null),new LeftBoundProcedure(null,null));
       }
   
  @@ -126,7 +126,7 @@
       }
   
       public void testAdapt() throws Exception {
  -        assertNotNull(LeftBoundProcedure.bind(new NoOpProcedure(),"xyzzy"));
  -        assertNotNull(LeftBoundProcedure.bind(new NoOpProcedure(),null));
  +        assertNotNull(LeftBoundProcedure.bind(new NoOp(),"xyzzy"));
  +        assertNotNull(LeftBoundProcedure.bind(new NoOp(),null));
       }
   }
  
  
  
  1.3       +8 -8      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestProcedureFunction.java
  
  Index: TestProcedureFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestProcedureFunction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestProcedureFunction.java	28 Jan 2003 12:00:30 -0000	1.2
  +++ TestProcedureFunction.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.Function;
   import org.apache.commons.functor.Procedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -86,7 +86,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new ProcedureFunction(new NoOpProcedure());
  +        return new ProcedureFunction(new NoOp());
       }
   
       // Lifecycle
  @@ -104,14 +104,14 @@
       // ------------------------------------------------------------------------    
   
       public void testEvaluate() throws Exception {
  -        Function f = new ProcedureFunction(new NoOpProcedure());
  +        Function f = new ProcedureFunction(new NoOp());
           assertNull(f.evaluate());
       }
       
       public void testEquals() throws Exception {
  -        Function f = new ProcedureFunction(new NoOpProcedure());
  +        Function f = new ProcedureFunction(new NoOp());
           assertEquals(f,f);
  -        assertObjectsAreEqual(f,new ProcedureFunction(new NoOpProcedure()));
  +        assertObjectsAreEqual(f,new ProcedureFunction(new NoOp()));
           assertObjectsAreNotEqual(f,new ConstantFunction("x"));
           assertObjectsAreNotEqual(f,new ProcedureFunction(new Procedure() { public void run() { } }));
           assertObjectsAreNotEqual(f,new ConstantFunction(null));
  @@ -124,6 +124,6 @@
       }
   
       public void testAdapt() throws Exception {
  -        assertNotNull(ProcedureFunction.adapt(new NoOpProcedure()));
  +        assertNotNull(ProcedureFunction.adapt(new NoOp()));
       }
   }
  
  
  
  1.3       +8 -8      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestProcedureUnaryProcedure.java
  
  Index: TestProcedureUnaryProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestProcedureUnaryProcedure.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestProcedureUnaryProcedure.java	28 Jan 2003 12:00:30 -0000	1.2
  +++ TestProcedureUnaryProcedure.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -62,7 +62,7 @@
   import org.apache.commons.functor.BaseFunctorTest;
   import org.apache.commons.functor.UnaryProcedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -85,7 +85,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new ProcedureUnaryProcedure(new NoOpProcedure());
  +        return new ProcedureUnaryProcedure(new NoOp());
       }
   
       // Lifecycle
  @@ -108,10 +108,10 @@
       }
       
       public void testEquals() throws Exception {
  -        UnaryProcedure p = new ProcedureUnaryProcedure(new NoOpProcedure());
  +        UnaryProcedure p = new ProcedureUnaryProcedure(new NoOp());
           assertEquals(p,p);
  -        assertObjectsAreEqual(p,new ProcedureUnaryProcedure(new NoOpProcedure()));
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreEqual(p,new ProcedureUnaryProcedure(new NoOp()));
  +        assertObjectsAreNotEqual(p,new NoOp());
           assertObjectsAreNotEqual(p,new ProcedureUnaryProcedure(null));
           assertObjectsAreEqual(new ProcedureUnaryProcedure(null),new ProcedureUnaryProcedure(null));
       }
  @@ -121,6 +121,6 @@
       }
   
       public void testAdapt() throws Exception {
  -        assertNotNull(ProcedureUnaryProcedure.adapt(new NoOpProcedure()));
  +        assertNotNull(ProcedureUnaryProcedure.adapt(new NoOp()));
       }
   }
  
  
  
  1.3       +11 -11    jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestRightBoundProcedure.java
  
  Index: TestRightBoundProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestRightBoundProcedure.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestRightBoundProcedure.java	19 Feb 2003 00:54:36 -0000	1.2
  +++ TestRightBoundProcedure.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.UnaryProcedure;
   import org.apache.commons.functor.core.IdentityFunction;
   import org.apache.commons.functor.core.LeftIdentityFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -86,7 +86,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new RightBoundProcedure(new NoOpProcedure(),"xyzzy");
  +        return new RightBoundProcedure(new NoOp(),"xyzzy");
       }
   
       // Lifecycle
  @@ -110,14 +110,14 @@
       }
       
       public void testEquals() throws Exception {
  -        UnaryProcedure f = new RightBoundProcedure(new NoOpProcedure(),"xyzzy");
  +        UnaryProcedure f = new RightBoundProcedure(new NoOp(),"xyzzy");
           assertEquals(f,f);
  -        assertObjectsAreEqual(f,new RightBoundProcedure(new NoOpProcedure(),"xyzzy"));
  -        assertObjectsAreNotEqual(f,new NoOpProcedure());
  +        assertObjectsAreEqual(f,new RightBoundProcedure(new NoOp(),"xyzzy"));
  +        assertObjectsAreNotEqual(f,new NoOp());
           assertObjectsAreNotEqual(f,new RightBoundProcedure(new BinaryFunctionBinaryProcedure(new LeftIdentityFunction()),"xyzzy"));
  -        assertObjectsAreNotEqual(f,new RightBoundProcedure(new NoOpProcedure(),"foo"));
  +        assertObjectsAreNotEqual(f,new RightBoundProcedure(new NoOp(),"foo"));
           assertObjectsAreNotEqual(f,new RightBoundProcedure(null,"xyzzy"));
  -        assertObjectsAreNotEqual(f,new RightBoundProcedure(new NoOpProcedure(),null));
  +        assertObjectsAreNotEqual(f,new RightBoundProcedure(new NoOp(),null));
           assertObjectsAreEqual(new RightBoundProcedure(null,null),new RightBoundProcedure(null,null));
       }
   
  @@ -126,7 +126,7 @@
       }
   
       public void testAdapt() throws Exception {
  -        assertNotNull(RightBoundProcedure.bind(new NoOpProcedure(),"xyzzy"));
  -        assertNotNull(RightBoundProcedure.bind(new NoOpProcedure(),null));
  +        assertNotNull(RightBoundProcedure.bind(new NoOp(),"xyzzy"));
  +        assertNotNull(RightBoundProcedure.bind(new NoOp(),null));
       }
   }
  
  
  
  1.3       +3 -3      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestUnaryFunctionBinaryFunction.java
  
  Index: TestUnaryFunctionBinaryFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestUnaryFunctionBinaryFunction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestUnaryFunctionBinaryFunction.java	28 Jan 2003 12:00:30 -0000	1.2
  +++ TestUnaryFunctionBinaryFunction.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -64,7 +64,7 @@
   import org.apache.commons.functor.Function;
   import org.apache.commons.functor.Procedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  
  
  
  1.2       +4 -4      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestUnaryFunctionUnaryProcedure.java
  
  Index: TestUnaryFunctionUnaryProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestUnaryFunctionUnaryProcedure.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestUnaryFunctionUnaryProcedure.java	27 Jan 2003 19:33:41 -0000	1.1
  +++ TestUnaryFunctionUnaryProcedure.java	24 Feb 2003 11:48:08 -0000	1.2
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.UnaryFunction;
   import org.apache.commons.functor.UnaryProcedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -121,7 +121,7 @@
           UnaryProcedure p = new UnaryFunctionUnaryProcedure(new ConstantFunction("K"));
           assertEquals(p,p);
           assertObjectsAreEqual(p,new UnaryFunctionUnaryProcedure(new ConstantFunction("K")));
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreNotEqual(p,new NoOp());
           assertObjectsAreNotEqual(p,new UnaryFunctionUnaryProcedure(null));
           assertObjectsAreNotEqual(p,new UnaryFunctionUnaryProcedure(new ConstantFunction("J")));
           assertObjectsAreEqual(new UnaryFunctionUnaryProcedure(null),new UnaryFunctionUnaryProcedure(null));
  
  
  
  1.3       +8 -8      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestUnaryProcedureBinaryProcedure.java
  
  Index: TestUnaryProcedureBinaryProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestUnaryProcedureBinaryProcedure.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestUnaryProcedureBinaryProcedure.java	28 Jan 2003 12:00:30 -0000	1.2
  +++ TestUnaryProcedureBinaryProcedure.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -62,7 +62,7 @@
   import org.apache.commons.functor.BaseFunctorTest;
   import org.apache.commons.functor.BinaryProcedure;
   import org.apache.commons.functor.core.IdentityFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -85,7 +85,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new UnaryProcedureBinaryProcedure(new NoOpProcedure());
  +        return new UnaryProcedureBinaryProcedure(new NoOp());
       }
   
       // Lifecycle
  @@ -108,10 +108,10 @@
       }
       
       public void testEquals() throws Exception {
  -        BinaryProcedure p = new UnaryProcedureBinaryProcedure(new NoOpProcedure());
  +        BinaryProcedure p = new UnaryProcedureBinaryProcedure(new NoOp());
           assertEquals(p,p);
  -        assertObjectsAreEqual(p,new UnaryProcedureBinaryProcedure(new NoOpProcedure()));
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreEqual(p,new UnaryProcedureBinaryProcedure(new NoOp()));
  +        assertObjectsAreNotEqual(p,new NoOp());
           assertObjectsAreNotEqual(p,new UnaryProcedureBinaryProcedure(null));
           assertObjectsAreEqual(new UnaryProcedureBinaryProcedure(null),new UnaryProcedureBinaryProcedure(null));
       }
  @@ -121,6 +121,6 @@
       }
   
       public void testAdapt() throws Exception {
  -        assertNotNull(UnaryProcedureBinaryProcedure.adapt(new NoOpProcedure()));
  +        assertNotNull(UnaryProcedureBinaryProcedure.adapt(new NoOp()));
       }
   }
  
  
  
  1.3       +8 -8      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestUnaryProcedureUnaryFunction.java
  
  Index: TestUnaryProcedureUnaryFunction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/adapter/TestUnaryProcedureUnaryFunction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestUnaryProcedureUnaryFunction.java	28 Jan 2003 12:00:30 -0000	1.2
  +++ TestUnaryProcedureUnaryFunction.java	24 Feb 2003 11:48:08 -0000	1.3
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.UnaryFunction;
   import org.apache.commons.functor.UnaryProcedure;
   import org.apache.commons.functor.core.ConstantFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -86,7 +86,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new UnaryProcedureUnaryFunction(new NoOpProcedure());
  +        return new UnaryProcedureUnaryFunction(new NoOp());
       }
   
       // Lifecycle
  @@ -104,14 +104,14 @@
       // ------------------------------------------------------------------------    
   
       public void testEvaluate() throws Exception {
  -        UnaryFunction f = new UnaryProcedureUnaryFunction(new NoOpProcedure());
  +        UnaryFunction f = new UnaryProcedureUnaryFunction(new NoOp());
           assertNull(f.evaluate(null));
       }
       
       public void testEquals() throws Exception {
  -        UnaryFunction f = new UnaryProcedureUnaryFunction(new NoOpProcedure());
  +        UnaryFunction f = new UnaryProcedureUnaryFunction(new NoOp());
           assertEquals(f,f);
  -        assertObjectsAreEqual(f,new UnaryProcedureUnaryFunction(new NoOpProcedure()));
  +        assertObjectsAreEqual(f,new UnaryProcedureUnaryFunction(new NoOp()));
           assertObjectsAreNotEqual(f,new ConstantFunction("x"));
           assertObjectsAreNotEqual(f,new UnaryProcedureUnaryFunction(new UnaryProcedure() { public void run(Object a) { } }));
           assertObjectsAreNotEqual(f,new ConstantFunction(null));
  @@ -124,6 +124,6 @@
       }
   
       public void testAdapt() throws Exception {
  -        assertNotNull(UnaryProcedureUnaryFunction.adapt(new NoOpProcedure()));
  +        assertNotNull(UnaryProcedureUnaryFunction.adapt(new NoOp()));
       }
   }
  
  
  
  1.6       +3 -3      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/TestAll.java
  
  Index: TestAll.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/TestAll.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestAll.java	24 Feb 2003 11:38:06 -0000	1.5
  +++ TestAll.java	24 Feb 2003 11:48:09 -0000	1.6
  @@ -74,7 +74,7 @@
           
           suite.addTest(TestConstantFunction.suite());
           suite.addTest(TestConstantPredicate.suite());
  -        suite.addTest(TestNoOpProcedure.suite());
  +        suite.addTest(TestNoOp.suite());
           suite.addTest(TestIdentityFunction.suite());
           suite.addTest(TestLeftIdentityFunction.suite());
           suite.addTest(TestRightIdentityFunction.suite());
  
  
  
  1.1                  jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/TestNoOp.java
  
  Index: TestNoOp.java
  ===================================================================
  /* 
   * $Header: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/TestNoOp.java,v 1.1 2003/02/24 11:48:09 rwaldhoff Exp $
   * ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived 
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.commons.functor.core;
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  import org.apache.commons.functor.BaseFunctorTest;
  import org.apache.commons.functor.BinaryProcedure;
  import org.apache.commons.functor.Procedure;
  import org.apache.commons.functor.UnaryProcedure;
  
  /**
   * @version $Revision: 1.1 $ $Date: 2003/02/24 11:48:09 $
   * @author Rodney Waldhoff
   */
  public class TestNoOp extends BaseFunctorTest {
  
      // Conventional
      // ------------------------------------------------------------------------
  
      public TestNoOp(String testName) {
          super(testName);
      }
  
      public static Test suite() {
          return new TestSuite(TestNoOp.class);
      }
  
      // Functor Testing Framework
      // ------------------------------------------------------------------------
  
      protected Object makeFunctor() {
          return new NoOp();
      }
  
      // Lifecycle
      // ------------------------------------------------------------------------
  
      public void setUp() throws Exception {
          super.setUp();
      }
  
      public void tearDown() throws Exception {
          super.tearDown();
      }
  
      // Tests
      // ------------------------------------------------------------------------
      
      public void testRun() throws Exception {
          NoOp p = new NoOp();
          p.run();
          p.run(null);
          p.run(null,null);
          p.run("foo");
          p.run("foo",null);
          p.run(null,"bar");
          p.run("foo","bar");        
      }
      
      public void testEquals() throws Exception {
          NoOp p = new NoOp();
          assertEquals(p,p);
          assertObjectsAreEqual(p,new NoOp());
          assertObjectsAreEqual(p,NoOp.getNoOpProcedure());
          assertObjectsAreNotEqual(p,new Procedure() { public void run() { } });
          assertObjectsAreNotEqual(p,new UnaryProcedure() { public void run(Object a) { } });
          assertObjectsAreNotEqual(p,new BinaryProcedure() { public void run(Object a, Object b) { } });
      }
      
      public void testConstant() throws Exception {
          assertEquals(NoOp.getNoOpProcedure(),NoOp.getNoOpProcedure());
          assertSame(NoOp.getNoOpProcedure(),NoOp.getNoOpProcedure());
      }
  }
  
  
  
  1.2       +9 -9      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestBinaryProcedureSequence.java
  
  Index: TestBinaryProcedureSequence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestBinaryProcedureSequence.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestBinaryProcedureSequence.java	27 Jan 2003 19:33:43 -0000	1.1
  +++ TestBinaryProcedureSequence.java	24 Feb 2003 11:48:09 -0000	1.2
  @@ -64,7 +64,7 @@
   
   import org.apache.commons.functor.BaseFunctorTest;
   import org.apache.commons.functor.BinaryProcedure;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -87,7 +87,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new BinaryProcedureSequence(new NoOpProcedure(),new NoOpProcedure());
  +        return new BinaryProcedureSequence(new NoOp(),new NoOp());
       }
   
       // Lifecycle
  @@ -155,17 +155,17 @@
           assertObjectsAreEqual(p,q);
   
           for(int i=0;i<3;i++) {
  -            p.then(new NoOpProcedure());
  +            p.then(new NoOp());
               assertObjectsAreNotEqual(p,q);
  -            q.then(new NoOpProcedure());
  +            q.then(new NoOp());
               assertObjectsAreEqual(p,q);
  -            p.then(new BinaryProcedureSequence(new NoOpProcedure(),new NoOpProcedure()));
  +            p.then(new BinaryProcedureSequence(new NoOp(),new NoOp()));
               assertObjectsAreNotEqual(p,q);            
  -            q.then(new BinaryProcedureSequence(new NoOpProcedure(),new NoOpProcedure()));
  +            q.then(new BinaryProcedureSequence(new NoOp(),new NoOp()));
               assertObjectsAreEqual(p,q);            
           }
                   
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreNotEqual(p,new NoOp());
       }
   
       // Classes
  
  
  
  1.3       +15 -15    jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestConditionalBinaryProcedure.java
  
  Index: TestConditionalBinaryProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestConditionalBinaryProcedure.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestConditionalBinaryProcedure.java	29 Jan 2003 23:24:52 -0000	1.2
  +++ TestConditionalBinaryProcedure.java	24 Feb 2003 11:48:09 -0000	1.3
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.BinaryProcedure;
   import org.apache.commons.functor.core.ConstantPredicate;
   import org.apache.commons.functor.core.LeftIdentityPredicate;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -88,8 +88,8 @@
       protected Object makeFunctor() {
           return new ConditionalBinaryProcedure(
               new ConstantPredicate(true),
  -            new NoOpProcedure(),
  -            new NoOpProcedure());
  +            new NoOp(),
  +            new NoOp());
       }
   
       // Lifecycle
  @@ -129,28 +129,28 @@
       public void testEquals() throws Exception {
           ConditionalBinaryProcedure p = new ConditionalBinaryProcedure(
               new LeftIdentityPredicate(),
  -            new NoOpProcedure(),
  -            new NoOpProcedure());
  +            new NoOp(),
  +            new NoOp());
           assertEquals(p,p);
           assertObjectsAreEqual(p,new ConditionalBinaryProcedure(
               new LeftIdentityPredicate(),
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalBinaryProcedure(
               new ConstantPredicate(true),
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalBinaryProcedure(
               null,
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalBinaryProcedure(
               new LeftIdentityPredicate(),
               null,
  -            new NoOpProcedure()));
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalBinaryProcedure(
               new LeftIdentityPredicate(),
  -            new NoOpProcedure(),
  +            new NoOp(),
               null));
       }
   
  
  
  
  1.2       +15 -15    jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestConditionalProcedure.java
  
  Index: TestConditionalProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestConditionalProcedure.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestConditionalProcedure.java	27 Jan 2003 19:33:43 -0000	1.1
  +++ TestConditionalProcedure.java	24 Feb 2003 11:48:09 -0000	1.2
  @@ -64,7 +64,7 @@
   import org.apache.commons.functor.adapter.FunctionPredicate;
   import org.apache.commons.functor.core.ConstantPredicate;
   import org.apache.commons.functor.core.LeftIdentityFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -89,8 +89,8 @@
       protected Object makeFunctor() {
           return new ConditionalProcedure(
               new ConstantPredicate(true),
  -            new NoOpProcedure(),
  -            new NoOpProcedure());
  +            new NoOp(),
  +            new NoOp());
       }
   
       // Lifecycle
  @@ -151,28 +151,28 @@
       public void testEquals() throws Exception {
           ConditionalProcedure p = new ConditionalProcedure(
               new ConstantPredicate(false),
  -            new NoOpProcedure(),
  -            new NoOpProcedure());
  +            new NoOp(),
  +            new NoOp());
           assertEquals(p,p);
           assertObjectsAreEqual(p,new ConditionalProcedure(
               new ConstantPredicate(false),
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalProcedure(
               new ConstantPredicate(true),
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalProcedure(
               null,
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalProcedure(
               new ConstantPredicate(false),
               null,
  -            new NoOpProcedure()));
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalProcedure(
               new ConstantPredicate(false),
  -            new NoOpProcedure(),
  +            new NoOp(),
               null));
       }
   
  
  
  
  1.3       +15 -15    jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java
  
  Index: TestConditionalUnaryProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestConditionalUnaryProcedure.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestConditionalUnaryProcedure.java	29 Jan 2003 23:24:52 -0000	1.2
  +++ TestConditionalUnaryProcedure.java	24 Feb 2003 11:48:09 -0000	1.3
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.UnaryProcedure;
   import org.apache.commons.functor.core.ConstantPredicate;
   import org.apache.commons.functor.core.IdentityPredicate;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -88,8 +88,8 @@
       protected Object makeFunctor() {
           return new ConditionalUnaryProcedure(
               new ConstantPredicate(true),
  -            new NoOpProcedure(),
  -            new NoOpProcedure());
  +            new NoOp(),
  +            new NoOp());
       }
   
       // Lifecycle
  @@ -129,28 +129,28 @@
       public void testEquals() throws Exception {
           ConditionalUnaryProcedure p = new ConditionalUnaryProcedure(
               new IdentityPredicate(),
  -            new NoOpProcedure(),
  -            new NoOpProcedure());
  +            new NoOp(),
  +            new NoOp());
           assertEquals(p,p);
           assertObjectsAreEqual(p,new ConditionalUnaryProcedure(
               new IdentityPredicate(),
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalUnaryProcedure(
               new ConstantPredicate(true),
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalUnaryProcedure(
               null,
  -            new NoOpProcedure(),
  -            new NoOpProcedure()));
  +            new NoOp(),
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalUnaryProcedure(
               new IdentityPredicate(),
               null,
  -            new NoOpProcedure()));
  +            new NoOp()));
           assertObjectsAreNotEqual(p,new ConditionalUnaryProcedure(
               new IdentityPredicate(),
  -            new NoOpProcedure(),
  +            new NoOp(),
               null));
       }
   
  
  
  
  1.2       +9 -9      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestProcedureSequence.java
  
  Index: TestProcedureSequence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestProcedureSequence.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestProcedureSequence.java	27 Jan 2003 19:33:43 -0000	1.1
  +++ TestProcedureSequence.java	24 Feb 2003 11:48:09 -0000	1.2
  @@ -64,7 +64,7 @@
   
   import org.apache.commons.functor.BaseFunctorTest;
   import org.apache.commons.functor.Procedure;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -87,7 +87,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new ProcedureSequence(new NoOpProcedure(),new NoOpProcedure());
  +        return new ProcedureSequence(new NoOp(),new NoOp());
       }
   
       // Lifecycle
  @@ -149,17 +149,17 @@
           assertObjectsAreEqual(p,q);
   
           for(int i=0;i<3;i++) {
  -            p.then(new NoOpProcedure());
  +            p.then(new NoOp());
               assertObjectsAreNotEqual(p,q);
  -            q.then(new NoOpProcedure());
  +            q.then(new NoOp());
               assertObjectsAreEqual(p,q);
  -            p.then(new ProcedureSequence(new NoOpProcedure(),new NoOpProcedure()));
  +            p.then(new ProcedureSequence(new NoOp(),new NoOp()));
               assertObjectsAreNotEqual(p,q);            
  -            q.then(new ProcedureSequence(new NoOpProcedure(),new NoOpProcedure()));
  +            q.then(new ProcedureSequence(new NoOp(),new NoOp()));
               assertObjectsAreEqual(p,q);            
           }
                   
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreNotEqual(p,new NoOp());
       }
   
       // Classes
  
  
  
  1.2       +10 -10    jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestTransposedProcedure.java
  
  Index: TestTransposedProcedure.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestTransposedProcedure.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTransposedProcedure.java	27 Jan 2003 19:33:43 -0000	1.1
  +++ TestTransposedProcedure.java	24 Feb 2003 11:48:09 -0000	1.2
  @@ -63,7 +63,7 @@
   import org.apache.commons.functor.BinaryProcedure;
   import org.apache.commons.functor.adapter.BinaryFunctionBinaryProcedure;
   import org.apache.commons.functor.core.LeftIdentityFunction;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -86,7 +86,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new TransposedProcedure(NoOpProcedure.getNoOpProcedure());
  +        return new TransposedProcedure(NoOp.getNoOpProcedure());
       }
   
       // Lifecycle
  @@ -114,13 +114,13 @@
       }
           
       public void testEquals() throws Exception {
  -        BinaryProcedure p = new TransposedProcedure(NoOpProcedure.getNoOpProcedure());
  +        BinaryProcedure p = new TransposedProcedure(NoOp.getNoOpProcedure());
           assertEquals(p,p);
  -        assertObjectsAreEqual(p,new TransposedProcedure(NoOpProcedure.getNoOpProcedure()));
  -        assertObjectsAreEqual(p,TransposedProcedure.transpose(NoOpProcedure.getNoOpProcedure()));
  -        assertObjectsAreNotEqual(p,new TransposedProcedure(new TransposedProcedure(NoOpProcedure.getNoOpProcedure())));
  +        assertObjectsAreEqual(p,new TransposedProcedure(NoOp.getNoOpProcedure()));
  +        assertObjectsAreEqual(p,TransposedProcedure.transpose(NoOp.getNoOpProcedure()));
  +        assertObjectsAreNotEqual(p,new TransposedProcedure(new TransposedProcedure(NoOp.getNoOpProcedure())));
           assertObjectsAreNotEqual(p,new TransposedProcedure(null));
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreNotEqual(p,new NoOp());
       }
   
       public void testTransposeNull() throws Exception {
  @@ -128,7 +128,7 @@
       }
   
       public void testTranspose() throws Exception {
  -        assertNotNull(TransposedProcedure.transpose(new NoOpProcedure()));
  +        assertNotNull(TransposedProcedure.transpose(new NoOp()));
       }
   
       // Classes
  
  
  
  1.2       +9 -9      jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestUnaryProcedureSequence.java
  
  Index: TestUnaryProcedureSequence.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/composite/TestUnaryProcedureSequence.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestUnaryProcedureSequence.java	27 Jan 2003 19:33:43 -0000	1.1
  +++ TestUnaryProcedureSequence.java	24 Feb 2003 11:48:09 -0000	1.2
  @@ -64,7 +64,7 @@
   
   import org.apache.commons.functor.BaseFunctorTest;
   import org.apache.commons.functor.UnaryProcedure;
  -import org.apache.commons.functor.core.NoOpProcedure;
  +import org.apache.commons.functor.core.NoOp;
   
   /**
    * @version $Revision$ $Date$
  @@ -87,7 +87,7 @@
       // ------------------------------------------------------------------------
   
       protected Object makeFunctor() {
  -        return new UnaryProcedureSequence(new NoOpProcedure(),new NoOpProcedure());
  +        return new UnaryProcedureSequence(new NoOp(),new NoOp());
       }
   
       // Lifecycle
  @@ -155,17 +155,17 @@
           assertObjectsAreEqual(p,q);
   
           for(int i=0;i<3;i++) {
  -            p.then(new NoOpProcedure());
  +            p.then(new NoOp());
               assertObjectsAreNotEqual(p,q);
  -            q.then(new NoOpProcedure());
  +            q.then(new NoOp());
               assertObjectsAreEqual(p,q);
  -            p.then(new UnaryProcedureSequence(new NoOpProcedure(),new NoOpProcedure()));
  +            p.then(new UnaryProcedureSequence(new NoOp(),new NoOp()));
               assertObjectsAreNotEqual(p,q);            
  -            q.then(new UnaryProcedureSequence(new NoOpProcedure(),new NoOpProcedure()));
  +            q.then(new UnaryProcedureSequence(new NoOp(),new NoOp()));
               assertObjectsAreEqual(p,q);            
           }
                   
  -        assertObjectsAreNotEqual(p,new NoOpProcedure());
  +        assertObjectsAreNotEqual(p,new NoOp());
       }
   
       // Classes
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message