Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 91937 invoked from network); 15 Mar 2010 22:28:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Mar 2010 22:28:43 -0000 Received: (qmail 38016 invoked by uid 500); 15 Mar 2010 22:27:55 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 37956 invoked by uid 500); 15 Mar 2010 22:27:55 -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 37949 invoked by uid 99); 15 Mar 2010 22:27:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Mar 2010 22:27:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Mar 2010 22:27:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B743823889D5; Mon, 15 Mar 2010 22:27:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r923475 - /commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestBooleanConverters.java Date: Mon, 15 Mar 2010 22:27:31 -0000 To: commits@commons.apache.org From: adrianc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100315222731.B743823889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: adrianc Date: Mon Mar 15 22:27:31 2010 New Revision: 923475 URL: http://svn.apache.org/viewvc?rev=923475&view=rev Log: Improved boolean converter test code. Modified: commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestBooleanConverters.java Modified: commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestBooleanConverters.java URL: http://svn.apache.org/viewvc/commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestBooleanConverters.java?rev=923475&r1=923474&r2=923475&view=diff ============================================================================== --- commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestBooleanConverters.java (original) +++ commons/sandbox/convert/trunk/src/test/java/org/apache/commons/convert/TestBooleanConverters.java Mon Mar 15 22:27:31 2010 @@ -29,20 +29,22 @@ public class TestBooleanConverters exten super(name); } - public static void assertConversion(String label, Converter converter, S source, T target) throws Exception { - assertTrue(label + " can convert", converter.canConvert(source.getClass(), target.getClass())); - assertEquals(label + " converted", target, converter.convert(source)); + public static void assertFromBoolean(String label, Converter converter, T trueResult, T falseResult) throws Exception { + assertTrue(label + " can convert", converter.canConvert(Boolean.class, trueResult.getClass())); + assertEquals(label + " converted", trueResult, converter.convert(true)); + assertEquals(label + " converted", falseResult, converter.convert(false)); + } + + public static void assertToBoolean(String label, Converter converter, T trueSource, T falseSource) throws Exception { + assertTrue(label + " can convert", converter.canConvert(trueSource.getClass(), Boolean.class)); + assertEquals(label + " converted", Boolean.TRUE, converter.convert(trueSource)); + assertEquals(label + " converted", Boolean.FALSE, converter.convert(falseSource)); } public void testBooleanConverters() throws Exception { - assertConversion("BooleanToInteger", new BooleanConverters.BooleanToInteger(), true, 1); - assertConversion("BooleanToInteger", new BooleanConverters.BooleanToInteger(), false, 0); - assertConversion("BooleanToString", new BooleanConverters.BooleanToString(), true, "true"); - assertConversion("BooleanToString", new BooleanConverters.BooleanToString(), false, "false"); - assertConversion("IntegerToBoolean", new BooleanConverters.IntegerToBoolean(), 1, true); - assertConversion("IntegerToBoolean", new BooleanConverters.IntegerToBoolean(), 0, false); - assertConversion("StringToBoolean", new BooleanConverters.StringToBoolean(), "false", false); - assertConversion("StringToBoolean", new BooleanConverters.StringToBoolean(), "notTrue", false); - assertConversion("StringToBoolean", new BooleanConverters.StringToBoolean(), "true", true); + assertFromBoolean("BooleanToInteger", new BooleanConverters.BooleanToInteger(), 1, 0); + assertFromBoolean("BooleanToString", new BooleanConverters.BooleanToString(), "true", "false"); + assertToBoolean("IntegerToBoolean", new BooleanConverters.IntegerToBoolean(), 1, 0); + assertToBoolean("StringToBoolean", new BooleanConverters.StringToBoolean(), "true", "false"); } }