From ae60862fd63c00004799e02ca5f1c930e1752970 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Wed, 24 Dec 2003 22:38:32 +0000 Subject: [PATCH] Fix test class to not hard code empty Bag git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131451 13f79535-47bb-0310-9956-ffa450edef68 --- .../bag/TestPredicatedSortedBag.java | 18 ++++++++---------- .../collections/bag/TestTypedSortedBag.java | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java index 43de0c958..9d872bcdc 100644 --- a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java,v 1.4 2003/12/05 20:22:12 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java,v 1.5 2003/12/24 22:38:32 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -72,13 +72,12 @@ import org.apache.commons.collections.SortedBag; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.4 $ $Date: 2003/12/05 20:22:12 $ + * @version $Revision: 1.5 $ $Date: 2003/12/24 22:38:32 $ * * @author Phil Steitz */ public class TestPredicatedSortedBag extends AbstractTestSortedBag { - private SortedBag emptyBag = new TreeBag(); private SortedBag nullBag = null; public TestPredicatedSortedBag(String testName) { @@ -111,20 +110,20 @@ public class TestPredicatedSortedBag extends AbstractTestSortedBag { } public Bag makeBag() { - return decorateBag(emptyBag, truePredicate); + return decorateBag(new TreeBag(), truePredicate); } protected Bag makeTestBag() { - return decorateBag(emptyBag, stringPredicate()); + return decorateBag(new TreeBag(), stringPredicate()); } //-------------------------------------------------------------------------- public void testDecorate() { - SortedBag bag = decorateBag(emptyBag, stringPredicate()); + SortedBag bag = decorateBag(new TreeBag(), stringPredicate()); SortedBag bag2 = ((PredicatedSortedBag) bag).getSortedBag(); try { - SortedBag bag3 = decorateBag(emptyBag, null); + SortedBag bag3 = decorateBag(new TreeBag(), null); fail("Expecting IllegalArgumentException for null predicate"); } catch (IllegalArgumentException e) {} try { @@ -134,7 +133,7 @@ public class TestPredicatedSortedBag extends AbstractTestSortedBag { } public void testSortOrder() { - SortedBag bag = decorateBag(emptyBag, stringPredicate()); + SortedBag bag = decorateBag(new TreeBag(), stringPredicate()); String one = "one"; String two = "two"; String three = "three"; @@ -144,7 +143,6 @@ public class TestPredicatedSortedBag extends AbstractTestSortedBag { assertEquals("first element", bag.first(), one); assertEquals("last element", bag.last(), two); Comparator c = bag.comparator(); - assertTrue("natural order, so comparator should be null", - c == null); + assertTrue("natural order, so comparator should be null", c == null); } } diff --git a/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java index 27ea071c6..fd41eef8b 100644 --- a/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java +++ b/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java,v 1.4 2003/12/05 20:22:12 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java,v 1.5 2003/12/24 22:38:32 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -70,7 +70,7 @@ import org.apache.commons.collections.SortedBag; * implementation. * * @since Commons Collections 3.0 - * @version $Revision: 1.4 $ $Date: 2003/12/05 20:22:12 $ + * @version $Revision: 1.5 $ $Date: 2003/12/24 22:38:32 $ * * @author Phil Steitz */ @@ -94,7 +94,6 @@ public class TestTypedSortedBag extends AbstractTestSortedBag { protected Class stringClass = this.getName().getClass(); private Object obj = new Object(); protected Class objectClass = obj.getClass(); - protected SortedBag emptyBag = new TreeBag(); protected SortedBag nullBag = null; protected SortedBag decorateBag(SortedBag bag, Class claz) { @@ -102,19 +101,19 @@ public class TestTypedSortedBag extends AbstractTestSortedBag { } public Bag makeBag() { - return decorateBag(emptyBag, objectClass); + return decorateBag(new TreeBag(), objectClass); } protected Bag makeTestBag() { - return decorateBag(emptyBag, stringClass); + return decorateBag(new TreeBag(), stringClass); } //-------------------------------------------------------------------------- public void testDecorate() { - SortedBag bag = decorateBag(emptyBag, stringClass); + SortedBag bag = decorateBag(new TreeBag(), stringClass); try { - SortedBag bag3 = decorateBag(emptyBag, null); + SortedBag bag3 = decorateBag(new TreeBag(), null); fail("Expecting IllegalArgumentException for null predicate"); } catch (IllegalArgumentException e) {} try { @@ -124,7 +123,7 @@ public class TestTypedSortedBag extends AbstractTestSortedBag { } public void testSortOrder() { - SortedBag bag = decorateBag(emptyBag, stringClass); + SortedBag bag = decorateBag(new TreeBag(), stringClass); String one = "one"; String two = "two"; String three = "three"; @@ -134,7 +133,6 @@ public class TestTypedSortedBag extends AbstractTestSortedBag { assertEquals("first element", bag.first(), one); assertEquals("last element", bag.last(), two); Comparator c = bag.comparator(); - assertTrue("natural order, so comparator should be null", - c == null); + assertTrue("natural order, so comparator should be null", c == null); } }