From dee1c299751cfaa830ba28ab9fb3015e9e1eb28f Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Thu, 12 Sep 2002 22:01:25 +0000 Subject: [PATCH] New builder subpackage created git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@137020 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/lang/HashCodeBuilderTest.java | 262 ------------------ .../apache/commons/lang/LangTestSuite.java | 3 +- .../lang/builder/BuilderTestSuite.java | 92 ++++++ 3 files changed, 93 insertions(+), 264 deletions(-) delete mode 100644 src/test/org/apache/commons/lang/HashCodeBuilderTest.java create mode 100644 src/test/org/apache/commons/lang/builder/BuilderTestSuite.java diff --git a/src/test/org/apache/commons/lang/HashCodeBuilderTest.java b/src/test/org/apache/commons/lang/HashCodeBuilderTest.java deleted file mode 100644 index 7fefbdd7e..000000000 --- a/src/test/org/apache/commons/lang/HashCodeBuilderTest.java +++ /dev/null @@ -1,262 +0,0 @@ -package org.apache.commons.lang; - -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2002 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 acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements 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 names 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 - * . - */ - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import junit.textui.TestRunner; -/** - * Unit tests {@link org.apache.commons.lang.HashCodeBuilder}. - * - * @author Stephen Colebourne - * @version $Id: HashCodeBuilderTest.java,v 1.1 2002/08/15 22:37:30 scolebourne Exp $ - */ -public class HashCodeBuilderTest extends TestCase { - - public HashCodeBuilderTest(String name) { - super(name); - } - - public static void main(String[] args) { - TestRunner.run(suite()); - } - - public static Test suite() { - TestSuite suite = new TestSuite(HashCodeBuilderTest.class); - suite.setName("HashCodeBuilder Tests"); - return suite; - } - - protected void setUp() throws Exception { - super.setUp(); - } - - protected void tearDown() throws Exception { - super.tearDown(); - } - - //----------------------------------------------------------------------- - - public void testConstructorEx1() { - try { - new HashCodeBuilder(0, 0); - - } catch (IllegalArgumentException ex) { - return; - } - fail(); - } - - public void testConstructorEx2() { - try { - new HashCodeBuilder(2, 2); - - } catch (IllegalArgumentException ex) { - return; - } - fail(); - } - - public void testObject() { - Object obj = null; - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj = new Object(); - assertEquals(17 * 37 + obj.hashCode(), new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testLong() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((long) 0L).toHashCode()); - assertEquals(17 * 37 + (int) (123456789L ^ (123456789L >> 32)), new HashCodeBuilder(17, 37).append((long) 123456789L).toHashCode()); - } - - public void testInt() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((int) 0).toHashCode()); - assertEquals(17 * 37 + 123456, new HashCodeBuilder(17, 37).append((int) 123456).toHashCode()); - } - - public void testShort() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((short) 0).toHashCode()); - assertEquals(17 * 37 + 12345, new HashCodeBuilder(17, 37).append((short) 12345).toHashCode()); - } - - public void testChar() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((char) 0).toHashCode()); - assertEquals(17 * 37 + 1234, new HashCodeBuilder(17, 37).append((char) 1234).toHashCode()); - } - - public void testByte() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((byte) 0).toHashCode()); - assertEquals(17 * 37 + 123, new HashCodeBuilder(17, 37).append((byte) 123).toHashCode()); - } - - public void testDouble() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((double) 0d).toHashCode()); - double d = 1234567.89; - long l = Double.doubleToLongBits(d); - assertEquals(17 * 37 + (int) (l ^ (l >> 32)), new HashCodeBuilder(17, 37).append(d).toHashCode()); - } - - public void testFloat() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((float) 0f).toHashCode()); - float f = 1234.89f; - int i = Float.floatToIntBits(f); - assertEquals(17 * 37 + i, new HashCodeBuilder(17, 37).append(f).toHashCode()); - } - - public void testBoolean() { - assertEquals(17 * 37 + 0, new HashCodeBuilder(17, 37).append(true).toHashCode()); - assertEquals(17 * 37 + 1, new HashCodeBuilder(17, 37).append(false).toHashCode()); - } - - public void testObjectArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((Object[]) null).toHashCode()); - Object[] obj = new Object[2]; - assertEquals((17 * 37) * 37 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = new Object(); - assertEquals((17 * 37 + obj[0].hashCode()) * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = new Object(); - assertEquals( (17 * 37 + obj[0].hashCode()) * 37 + obj[1].hashCode(), new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testLongArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((long[]) null).toHashCode()); - long[] obj = new long[2]; - assertEquals((17 * 37) * 37 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = 5L; - int h1 = (int) (5L ^ (5L >> 32)); - assertEquals((17 * 37 + h1) * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = 6L; - int h2 = (int) (6L ^ (6L >> 32)); - assertEquals( (17 * 37 + h1) * 37 + h2, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testIntArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((int[]) null).toHashCode()); - int[] obj = new int[2]; - assertEquals((17 * 37) * 37 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = 5; - assertEquals((17 * 37 + 5) * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = 6; - assertEquals( (17 * 37 + 5) * 37 + 6, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testShortArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((short[]) null).toHashCode()); - short[] obj = new short[2]; - assertEquals((17 * 37) * 37 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = (short) 5; - assertEquals((17 * 37 + 5) * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = (short) 6; - assertEquals( (17 * 37 + 5) * 37 + 6, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testCharArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((char[]) null).toHashCode()); - char[] obj = new char[2]; - assertEquals((17 * 37) * 37 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = (char) 5; - assertEquals((17 * 37 + 5) * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = (char) 6; - assertEquals( (17 * 37 + 5) * 37 + 6, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testByteArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((byte[]) null).toHashCode()); - byte[] obj = new byte[2]; - assertEquals((17 * 37) * 37 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = (byte) 5; - assertEquals((17 * 37 + 5) * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = (byte) 6; - assertEquals( (17 * 37 + 5) * 37 + 6, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testDoubleArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((double[]) null).toHashCode()); - double[] obj = new double[2]; - assertEquals((17 * 37) * 37 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = 5.4d; - long l1 = Double.doubleToLongBits(5.4d); - int h1 = (int) (l1 ^ (l1 >> 32)); - assertEquals((17 * 37 + h1) * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = 6.3d; - long l2 = Double.doubleToLongBits(6.3d); - int h2 = (int) (l2 ^ (l2 >> 32)); - assertEquals( (17 * 37 + h1) * 37 + h2, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testFloatArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((float[]) null).toHashCode()); - float[] obj = new float[2]; - assertEquals((17 * 37) * 37 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = 5.4f; - int h1 = Float.floatToIntBits(5.4f); - assertEquals((17 * 37 + h1) * 37, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = 6.3f; - int h2 = Float.floatToIntBits(6.3f); - assertEquals( (17 * 37 + h1) * 37 + h2, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - - public void testBooleanArray() { - assertEquals(17 * 37, new HashCodeBuilder(17, 37).append((boolean[]) null).toHashCode()); - boolean[] obj = new boolean[2]; - assertEquals((17 * 37 + 1) * 37 + 1 , new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[0] = true; - assertEquals((17 * 37 + 0) * 37 + 1, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - obj[1] = false; - assertEquals( (17 * 37 + 0) * 37 + 1, new HashCodeBuilder(17, 37).append(obj).toHashCode()); - } - -} diff --git a/src/test/org/apache/commons/lang/LangTestSuite.java b/src/test/org/apache/commons/lang/LangTestSuite.java index 61ea53a96..785bba1ae 100644 --- a/src/test/org/apache/commons/lang/LangTestSuite.java +++ b/src/test/org/apache/commons/lang/LangTestSuite.java @@ -62,7 +62,7 @@ * * @author Stephen Colebourne * @author Ringo De Smet - * @version $Id: LangTestSuite.java,v 1.3 2002/08/15 22:37:29 scolebourne Exp $ + * @version $Id: LangTestSuite.java,v 1.4 2002/09/12 22:01:25 scolebourne Exp $ */ public class LangTestSuite extends TestCase { @@ -87,7 +87,6 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.setName("Commons-Lang Tests"); suite.addTest(CharSetUtilsTest.suite()); - suite.addTest(HashCodeBuilderTest.suite()); suite.addTest(NumberRangeTest.suite()); suite.addTest(NumberUtilsTest.suite()); suite.addTest(ObjectUtilsTest.suite()); diff --git a/src/test/org/apache/commons/lang/builder/BuilderTestSuite.java b/src/test/org/apache/commons/lang/builder/BuilderTestSuite.java new file mode 100644 index 000000000..0176f3fac --- /dev/null +++ b/src/test/org/apache/commons/lang/builder/BuilderTestSuite.java @@ -0,0 +1,92 @@ +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2002 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 acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements 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 names 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 + * . + */ +package org.apache.commons.lang.builder; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; +import junit.textui.TestRunner; +/** + * Test suite for the Lang Builder package. + * + * @author Stephen Colebourne + * @version $Id: BuilderTestSuite.java,v 1.1 2002/09/12 22:01:24 scolebourne Exp $ + */ +public class BuilderTestSuite extends TestCase { + + /** + * Construct a new instance. + */ + public BuilderTestSuite(String name) { + super(name); + } + + /** + * Command-line interface. + */ + public static void main(String[] args) { + TestRunner.run(suite()); + } + + /** + * Get the suite of tests + */ + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.setName("Commons-Lang-Builder Tests"); + suite.addTest(EqualsBuilderTest.suite()); + suite.addTest(HashCodeBuilderTest.suite()); + return suite; + } +}