morgand 02/03/14 10:00:51
Modified: collections/src/test/org/apache/commons/collections
TestBag.java
Log:
fixed bad line feeds
Revision Changes Path
1.2 +251 -251
jakarta-commons/collections/src/test/org/apache/commons/collections/TestBag.java
Index: TestBag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestBag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestBag.java 29 Aug 2001 15:28:07 -0000 1.1
+++ TestBag.java 14 Mar 2002 18:00:51 -0000 1.2
@@ -1,251 +1,251 @@
-/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestBag.java,v
1.1 2001/08/29 15:28:07 jstrachan Exp $
- * $Revision: 1.1 $
- * $Date: 2001/08/29 15:28:07 $
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 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 [EMAIL PROTECTED]
- *
- * 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 Group.
- *
- * 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.collections;
-
-import junit.framework.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Tests base {@link Bag} methods and contracts.
- * <p>
- * To use, simply extend this class, and implement
- * the {@link #makeBag} method.
- * <p>
- * If your {@link Bag} fails one of these tests by design,
- * you may still use this base set of cases. Simply override the
- * test case (method) your {@link Bag} fails.
- *
- * @author Chuck Burdick
- * @version $Id: TestBag.java,v 1.1 2001/08/29 15:28:07 jstrachan Exp $
- */
-public abstract class TestBag extends TestCollection {
- public TestBag(String testName) {
- super(testName);
- }
-
- /**
- * Return a new, empty {@link Bag} to used for testing.
- */
- public abstract Bag makeBag();
-
- public Collection makeCollection() {
- return makeBag();
- }
-
- public void testBagAdd() {
- Bag bag = makeBag();
- bag.add("A");
- assertTrue("Should contain 'A'", bag.contains("A"));
- assertEquals("Should have count of 1",
- 1, bag.getCount("A"));
- bag.add("A");
- assertTrue("Should contain 'A'", bag.contains("A"));
- assertEquals("Should have count of 2",
- 2, bag.getCount("A"));
- bag.add("B");
- assertTrue(bag.contains("A"));
- assertTrue(bag.contains("B"));
- }
-
- public void testBagEqualsSelf() {
- Bag bag = makeBag();
- assertTrue(bag.equals(bag));
- bag.add("elt");
- assertTrue(bag.equals(bag));
- bag.add("elt"); // again
- assertTrue(bag.equals(bag));
- bag.add("elt2");
- assertTrue(bag.equals(bag));
- }
-
- public void testRemove() {
- Bag bag = makeBag();
- bag.add("A");
- assertEquals("Should have count of 1", 1, bag.getCount("A"));
- bag.remove("A");
- assertEquals("Should have count of 0", 0, bag.getCount("A"));
- bag.add("A");
- bag.add("A");
- bag.add("A");
- bag.add("A");
- assertEquals("Should have count of 4", 4, bag.getCount("A"));
- bag.remove("A", 0);
- assertEquals("Should have count of 4", 4, bag.getCount("A"));
- bag.remove("A", 2);
- assertEquals("Should have count of 2", 2, bag.getCount("A"));
- bag.remove("A");
- assertEquals("Should have count of 0", 0, bag.getCount("A"));
- }
-
- public void testRemoveAll() {
- Bag bag = makeBag();
- bag.add("A", 2);
- assertEquals("Should have count of 2", 2, bag.getCount("A"));
- bag.add("B");
- bag.add("C");
- assertEquals("Should have count of 4", 4, bag.size());
- List delete = new ArrayList();
- delete.add("A");
- delete.add("B");
- bag.removeAll(delete);
- assertEquals("Should have count of 1", 1, bag.getCount("A"));
- assertEquals("Should have count of 0", 0, bag.getCount("B"));
- assertEquals("Should have count of 1", 1, bag.getCount("C"));
- assertEquals("Should have count of 2", 2, bag.size());
- }
-
- public void testContains() {
- Bag bag = makeBag();
- bag.add("A");
- bag.add("A");
- bag.add("A");
- bag.add("B");
- bag.add("B");
- List compare = new ArrayList();
- compare.add("A");
- compare.add("B");
- assertEquals("Other list has 1 'B'", 1,
- (new HashBag(compare)).getCount("B"));
- assertTrue("Bag has at least 1 'B'", 1 <= bag.getCount("B"));
- assertTrue("Bag contains items in the list", bag.containsAll(compare));
- compare.add("A");
- compare.add("B");
- assertEquals("Other list has 2 'B'", 2,
- (new HashBag(compare)).getCount("B"));
- assertTrue("Bag has at least 2 'B'", 2 <= bag.getCount("B"));
- assertTrue("Bag contains items in the list", bag.containsAll(compare));
- compare.add("A");
- compare.add("B");
- assertEquals("Other list has 3 'B'", 3,
- (new HashBag(compare)).getCount("B"));
- assertTrue("Bag does not have 3 'B'", 3 > bag.getCount("B"));
- assertTrue("Bag contains items in the list", !bag.containsAll(compare));
- }
-
- public void testSize() {
- Bag bag = makeBag();
- bag.add("A");
- bag.add("A");
- bag.add("A");
- bag.add("B");
- bag.add("B");
- assertEquals("Should have 5 total items", 5, bag.size());
- bag.remove("A", 2);
- assertEquals("Should have 1 'A'", 1, bag.getCount("A"));
- assertEquals("Should have 3 total items", 3, bag.size());
- bag.remove("B");
- assertEquals("Should have 1 total item", 1, bag.size());
- }
-
- public void testRetainAll() {
- Bag bag = makeBag();
- bag.add("A");
- bag.add("A");
- bag.add("A");
- bag.add("B");
- bag.add("B");
- bag.add("C");
- List retains = new ArrayList();
- retains.add("B");
- retains.add("C");
- bag.retainAll(retains);
- assertEquals("Should have 2 total items", 2, bag.size());
- }
-
- public void testIterator() {
- Bag bag = makeBag();
- bag.add("A");
- bag.add("A");
- bag.add("B");
- assertEquals("Bag should have 3 items", 3, bag.size());
- Iterator i = bag.iterator();
- assertEquals("First should be 'A'", "A", i.next());
- assertEquals("Second should be 'A'", "A", i.next());
- i.remove();
- assertEquals("Third should be 'B'", "B", i.next());
- assertTrue("Should have no more", !i.hasNext());
- assertEquals("Bag should have 2 items", 2, bag.size());
- assertEquals("Bag should have 1 'A'", 1, bag.getCount("A"));
- }
-
- public void testIteratorFail() {
- Bag bag = makeBag();
- bag.add("A");
- bag.add("A");
- bag.add("B");
- Iterator i = bag.iterator();
- assertEquals("First should be 'A'", "A", i.next());
- bag.remove("A");
- try {
- i.next();
- fail("Should throw ConcurrentModificationException");
- } catch (ConcurrentModificationException e) {
- // expected
- }
- }
-}
-
-
+/*
+ * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestBag.java,v
1.2 2002/03/14 18:00:51 morgand Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/14 18:00:51 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2001 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 [EMAIL PROTECTED]
+ *
+ * 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 Group.
+ *
+ * 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.collections;
+
+import junit.framework.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Tests base {@link Bag} methods and contracts.
+ * <p>
+ * To use, simply extend this class, and implement
+ * the {@link #makeBag} method.
+ * <p>
+ * If your {@link Bag} fails one of these tests by design,
+ * you may still use this base set of cases. Simply override the
+ * test case (method) your {@link Bag} fails.
+ *
+ * @author Chuck Burdick
+ * @version $Id: TestBag.java,v 1.2 2002/03/14 18:00:51 morgand Exp $
+ */
+public abstract class TestBag extends TestCollection {
+ public TestBag(String testName) {
+ super(testName);
+ }
+
+ /**
+ * Return a new, empty {@link Bag} to used for testing.
+ */
+ public abstract Bag makeBag();
+
+ public Collection makeCollection() {
+ return makeBag();
+ }
+
+ public void testBagAdd() {
+ Bag bag = makeBag();
+ bag.add("A");
+ assertTrue("Should contain 'A'", bag.contains("A"));
+ assertEquals("Should have count of 1",
+ 1, bag.getCount("A"));
+ bag.add("A");
+ assertTrue("Should contain 'A'", bag.contains("A"));
+ assertEquals("Should have count of 2",
+ 2, bag.getCount("A"));
+ bag.add("B");
+ assertTrue(bag.contains("A"));
+ assertTrue(bag.contains("B"));
+ }
+
+ public void testBagEqualsSelf() {
+ Bag bag = makeBag();
+ assertTrue(bag.equals(bag));
+ bag.add("elt");
+ assertTrue(bag.equals(bag));
+ bag.add("elt"); // again
+ assertTrue(bag.equals(bag));
+ bag.add("elt2");
+ assertTrue(bag.equals(bag));
+ }
+
+ public void testRemove() {
+ Bag bag = makeBag();
+ bag.add("A");
+ assertEquals("Should have count of 1", 1, bag.getCount("A"));
+ bag.remove("A");
+ assertEquals("Should have count of 0", 0, bag.getCount("A"));
+ bag.add("A");
+ bag.add("A");
+ bag.add("A");
+ bag.add("A");
+ assertEquals("Should have count of 4", 4, bag.getCount("A"));
+ bag.remove("A", 0);
+ assertEquals("Should have count of 4", 4, bag.getCount("A"));
+ bag.remove("A", 2);
+ assertEquals("Should have count of 2", 2, bag.getCount("A"));
+ bag.remove("A");
+ assertEquals("Should have count of 0", 0, bag.getCount("A"));
+ }
+
+ public void testRemoveAll() {
+ Bag bag = makeBag();
+ bag.add("A", 2);
+ assertEquals("Should have count of 2", 2, bag.getCount("A"));
+ bag.add("B");
+ bag.add("C");
+ assertEquals("Should have count of 4", 4, bag.size());
+ List delete = new ArrayList();
+ delete.add("A");
+ delete.add("B");
+ bag.removeAll(delete);
+ assertEquals("Should have count of 1", 1, bag.getCount("A"));
+ assertEquals("Should have count of 0", 0, bag.getCount("B"));
+ assertEquals("Should have count of 1", 1, bag.getCount("C"));
+ assertEquals("Should have count of 2", 2, bag.size());
+ }
+
+ public void testContains() {
+ Bag bag = makeBag();
+ bag.add("A");
+ bag.add("A");
+ bag.add("A");
+ bag.add("B");
+ bag.add("B");
+ List compare = new ArrayList();
+ compare.add("A");
+ compare.add("B");
+ assertEquals("Other list has 1 'B'", 1,
+ (new HashBag(compare)).getCount("B"));
+ assertTrue("Bag has at least 1 'B'", 1 <= bag.getCount("B"));
+ assertTrue("Bag contains items in the list", bag.containsAll(compare));
+ compare.add("A");
+ compare.add("B");
+ assertEquals("Other list has 2 'B'", 2,
+ (new HashBag(compare)).getCount("B"));
+ assertTrue("Bag has at least 2 'B'", 2 <= bag.getCount("B"));
+ assertTrue("Bag contains items in the list", bag.containsAll(compare));
+ compare.add("A");
+ compare.add("B");
+ assertEquals("Other list has 3 'B'", 3,
+ (new HashBag(compare)).getCount("B"));
+ assertTrue("Bag does not have 3 'B'", 3 > bag.getCount("B"));
+ assertTrue("Bag contains items in the list", !bag.containsAll(compare));
+ }
+
+ public void testSize() {
+ Bag bag = makeBag();
+ bag.add("A");
+ bag.add("A");
+ bag.add("A");
+ bag.add("B");
+ bag.add("B");
+ assertEquals("Should have 5 total items", 5, bag.size());
+ bag.remove("A", 2);
+ assertEquals("Should have 1 'A'", 1, bag.getCount("A"));
+ assertEquals("Should have 3 total items", 3, bag.size());
+ bag.remove("B");
+ assertEquals("Should have 1 total item", 1, bag.size());
+ }
+
+ public void testRetainAll() {
+ Bag bag = makeBag();
+ bag.add("A");
+ bag.add("A");
+ bag.add("A");
+ bag.add("B");
+ bag.add("B");
+ bag.add("C");
+ List retains = new ArrayList();
+ retains.add("B");
+ retains.add("C");
+ bag.retainAll(retains);
+ assertEquals("Should have 2 total items", 2, bag.size());
+ }
+
+ public void testIterator() {
+ Bag bag = makeBag();
+ bag.add("A");
+ bag.add("A");
+ bag.add("B");
+ assertEquals("Bag should have 3 items", 3, bag.size());
+ Iterator i = bag.iterator();
+ assertEquals("First should be 'A'", "A", i.next());
+ assertEquals("Second should be 'A'", "A", i.next());
+ i.remove();
+ assertEquals("Third should be 'B'", "B", i.next());
+ assertTrue("Should have no more", !i.hasNext());
+ assertEquals("Bag should have 2 items", 2, bag.size());
+ assertEquals("Bag should have 1 'A'", 1, bag.getCount("A"));
+ }
+
+ public void testIteratorFail() {
+ Bag bag = makeBag();
+ bag.add("A");
+ bag.add("A");
+ bag.add("B");
+ Iterator i = bag.iterator();
+ assertEquals("First should be 'A'", "A", i.next());
+ bag.remove("A");
+ try {
+ i.next();
+ fail("Should throw ConcurrentModificationException");
+ } catch (ConcurrentModificationException e) {
+ // expected
+ }
+ }
+}
+
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
