Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 50670 invoked from network); 10 Jun 2008 18:08:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Jun 2008 18:08:55 -0000 Received: (qmail 21164 invoked by uid 500); 10 Jun 2008 18:08:56 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 21108 invoked by uid 500); 10 Jun 2008 18:08:56 -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 21099 invoked by uid 99); 10 Jun 2008 18:08:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jun 2008 11:08:56 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jun 2008 18:08:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5E1AF23889F7; Tue, 10 Jun 2008 11:08:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r666243 - in /commons/sandbox/functor/trunk/src: main/java/org/apache/commons/functor/adapter/ test/java/org/apache/commons/functor/adapter/ test/java/org/apache/commons/functor/core/ Date: Tue, 10 Jun 2008 18:08:33 -0000 To: commits@commons.apache.org From: mbenson@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080610180833.5E1AF23889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mbenson Date: Tue Jun 10 11:08:32 2008 New Revision: 666243 URL: http://svn.apache.org/viewvc?rev=666243&view=rev Log: unchecked warnings; IllegalArgumentExceptions on null constructor args Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/adapter/TestUnaryProcedureUnaryFunction.java commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java?rev=666243&r1=666242&r2=666243&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java Tue Jun 10 11:08:32 2008 @@ -47,6 +47,9 @@ * @param procedure to adapt */ public UnaryProcedureUnaryFunction(UnaryProcedure procedure) { + if (procedure == null) { + throw new IllegalArgumentException("UnaryProcedure argument was null"); + } this.procedure = procedure; } Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/adapter/TestUnaryProcedureUnaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/adapter/TestUnaryProcedureUnaryFunction.java?rev=666243&r1=666242&r2=666243&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/adapter/TestUnaryProcedureUnaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/adapter/TestUnaryProcedureUnaryFunction.java Tue Jun 10 11:08:32 2008 @@ -46,7 +46,7 @@ // ------------------------------------------------------------------------ protected Object makeFunctor() { - return new UnaryProcedureUnaryFunction(new NoOp()); + return new UnaryProcedureUnaryFunction(NoOp.INSTANCE); } // Lifecycle @@ -64,19 +64,20 @@ // ------------------------------------------------------------------------ public void testEvaluate() throws Exception { - UnaryFunction f = new UnaryProcedureUnaryFunction(new NoOp()); + UnaryFunction f = new UnaryProcedureUnaryFunction(NoOp.INSTANCE); assertNull(f.evaluate(null)); } public void testEquals() throws Exception { - UnaryFunction f = new UnaryProcedureUnaryFunction(new NoOp()); + UnaryFunction f = new UnaryProcedureUnaryFunction(NoOp.INSTANCE); assertEquals(f,f); - assertObjectsAreEqual(f,new UnaryProcedureUnaryFunction(new NoOp())); - assertObjectsAreNotEqual(f,new Constant("x")); - assertObjectsAreNotEqual(f,new UnaryProcedureUnaryFunction(new UnaryProcedure() { public void run(Object a) { } })); - assertObjectsAreNotEqual(f,new Constant(null)); - assertObjectsAreNotEqual(f,new UnaryProcedureUnaryFunction(null)); - assertObjectsAreEqual(new UnaryProcedureUnaryFunction(null),new UnaryProcedureUnaryFunction(null)); + assertObjectsAreEqual(f,new UnaryProcedureUnaryFunction(NoOp.INSTANCE)); + assertObjectsAreNotEqual(f,Constant.of("x")); + assertObjectsAreNotEqual(f, new UnaryProcedureUnaryFunction(new UnaryProcedure() { + public void run(Object a) { + } + })); + assertObjectsAreNotEqual(f,Constant.of(null)); } public void testAdaptNull() throws Exception { Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java?rev=666243&r1=666242&r2=666243&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java (original) +++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/TestIdentity.java Tue Jun 10 11:08:32 2008 @@ -44,7 +44,7 @@ // ------------------------------------------------------------------------ protected Object makeFunctor() { - return new Identity(); + return Identity.INSTANCE; } // Lifecycle @@ -62,7 +62,7 @@ // ------------------------------------------------------------------------ public void testEvaluate() throws Exception { - UnaryFunction f = new Identity(); + UnaryFunction f = new Identity(); assertNull(f.evaluate(null)); assertEquals("xyzzy",f.evaluate("xyzzy")); assertEquals(new Integer(3),f.evaluate(new Integer(3))); @@ -71,7 +71,7 @@ } public void testTest() throws Exception { - UnaryPredicate p = new Identity(); + UnaryPredicate p = new Identity(); assertTrue(p.test(Boolean.TRUE)); assertTrue(!p.test(Boolean.FALSE)); try { @@ -88,11 +88,11 @@ } } public void testEquals() throws Exception { - UnaryFunction f = new Identity(); + UnaryFunction f = new Identity(); assertEquals(f,f); - assertObjectsAreEqual(f,new Identity()); + assertObjectsAreEqual(f,new Identity()); assertObjectsAreEqual(f,Identity.instance()); - assertObjectsAreNotEqual(f,new Constant("abcde")); + assertObjectsAreNotEqual(f,Constant.of("abcde")); } public void testConstant() throws Exception {