psteitz 2003/10/12 19:48:16
Modified: collections/src/test/org/apache/commons/collections/decorators
TestAll.java
Added: collections/src/test/org/apache/commons/collections/decorators
TestTypedSortedSet.java TestUnmodifiableList.java
TestUnmodifiableSortedSet.java
Log:
Added more decorator tests.
Revision Changes Path
1.20 +5 -2
jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestAll.java
Index: TestAll.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestAll.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TestAll.java 12 Oct 2003 06:37:30 -0000 1.19
+++ TestAll.java 13 Oct 2003 02:48:16 -0000 1.20
@@ -119,8 +119,11 @@
suite.addTest(TestTypedBag.suite());
suite.addTest(TestTypedSortedBag.suite());
+ suite.addTest(TestTypedSortedSet.suite());
suite.addTest(TestUnmodifiableMap.suite());
+ suite.addTest(TestUnmodifiableList.suite());
+ suite.addTest(TestUnmodifiableSortedSet.suite());
return suite;
}
1.1
jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestTypedSortedSet.java
Index: TestTypedSortedSet.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestTypedSortedSet.java,v
1.1 2003/10/13 02:48:16 psteitz Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 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 acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgement may appear in the software itself,
* if and wherever such third-party acknowledgements 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 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
* <http://www.apache.org/>.
*
*/
package org.apache.commons.collections.decorators;
import java.util.Arrays;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.collections.AbstractTestSortedSet;
import org.apache.commons.collections.BulkTest;
/**
* Extension of [EMAIL PROTECTED] AbstractTestSortedSet} for exercising the
* [EMAIL PROTECTED] TypedSortedSet} implementation.
*
* @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/10/13 02:48:16 $
*
* @author Phil Steitz
*/
public class TestTypedSortedSet extends AbstractTestSortedSet{
public TestTypedSortedSet(String testName) {
super(testName);
}
public static Test suite() {
return BulkTest.makeSuite(TestTypedSortedSet.class);
}
public static void main(String args[]) {
String[] testCaseName = { TestTypedSortedSet.class.getName()};
junit.textui.TestRunner.main(testCaseName);
}
//-------------------------------------------------------------------
protected Class integerType = new Integer(0).getClass();
public Set makeEmptySet() {
return TypedSortedSet.decorate(new TreeSet(), integerType);
}
public Set makeFullSet() {
TreeSet set = new TreeSet();
set.addAll(Arrays.asList(getFullElements()));
return TypedSortedSet.decorate(set, integerType);
}
//--------------------------------------------------------------------
protected Long getNextAsLong() {
SortedSet set = (SortedSet) makeFullSet();
int nextValue = ((Integer)set.last()).intValue() + 1;
return new Long(nextValue);
}
protected Integer getNextAsInt() {
SortedSet set = (SortedSet) makeFullSet();
int nextValue = ((Integer)set.last()).intValue() + 1;
return new Integer(nextValue);
}
public void testIllegalAdd() {
Set set = makeFullSet();
try {
set.add(getNextAsLong());
fail("Should fail type test.");
} catch (IllegalArgumentException e) {
// expected
}
assertTrue("Collection shouldn't convert long to int",
!set.contains(getNextAsInt()));
}
public void testIllegalAddAll() {
Set set = makeFullSet();
Set elements = new TreeSet();
elements.add(getNextAsLong());
try {
set.addAll(elements);
fail("Should fail type test.");
} catch (IllegalArgumentException e) {
// expected
}
assertTrue("Collection shouldn't convert long to int",
!set.contains(getNextAsInt()));
}
}
1.1
jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestUnmodifiableList.java
Index: TestUnmodifiableList.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestUnmodifiableList.java,v
1.1 2003/10/13 02:48:16 psteitz Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 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 acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgement may appear in the software itself,
* if and wherever such third-party acknowledgements 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 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
* <http://www.apache.org/>.
*
*/
package org.apache.commons.collections.decorators;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.collections.AbstractTestList;
/**
* Extension of [EMAIL PROTECTED] AbstractTestList} for exercising the
* [EMAIL PROTECTED] UnmodifiableList} implementation.
*
* @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/10/13 02:48:16 $
*
* @author Phil Steitz
*/
public class TestUnmodifiableList extends AbstractTestList{
public TestUnmodifiableList(String testName) {
super(testName);
}
public static Test suite() {
return new TestSuite(TestUnmodifiableList.class);
}
public static void main(String args[]) {
String[] testCaseName = { TestPredicatedSortedMap.class.getName()};
junit.textui.TestRunner.main(testCaseName);
}
//-------------------------------------------------------------------
public List makeEmptyList() {
return UnmodifiableList.decorate(new ArrayList());
}
public List makeFullList() {
ArrayList list = new ArrayList();
list.addAll(Arrays.asList(getFullElements()));
return UnmodifiableList.decorate(list);
}
protected boolean isSetSupported() {
return false;
}
protected boolean isAddSupported() {
return false;
}
protected boolean isRemoveSupported() {
return false;
}
//--------------------------------------------------------------------
protected UnmodifiableList list = null;
protected ArrayList array = null;
protected void setupList() {
list = (UnmodifiableList) makeFullList();
array = new ArrayList();
array.add(new Integer(1));
}
/**
* Verify that base list and sublists are not modifiable
*/
public void testUnmodifiable() {
setupList();
verifyUnmodifiable(list);
verifyUnmodifiable(list.subList(0, 2));
}
protected void verifyUnmodifiable(List list) {
try {
list.add(0, new Integer(0));
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.add(new Integer(0));
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.addAll(0, array);
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.addAll(array);
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.clear();
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.remove(0);
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.remove(new Integer(0));
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.removeAll(array);
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.retainAll(array);
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
list.set(0, new Integer(0));
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
}
/**
* Verify that iterator is not modifiable
*/
public void testUnmodifiableIterator() {
setupList();
Iterator iterator = list.iterator();
try {
Object obj = iterator.next();
iterator.remove();
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
}
}
1.1
jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestUnmodifiableSortedSet.java
Index: TestUnmodifiableSortedSet.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestUnmodifiableSortedSet.java,v
1.1 2003/10/13 02:48:16 psteitz Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 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 acknowledgement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgement may appear in the software itself,
* if and wherever such third-party acknowledgements 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 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
* <http://www.apache.org/>.
*
*/
package org.apache.commons.collections.decorators;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.collections.AbstractTestSortedSet;
/**
* Extension of [EMAIL PROTECTED] AbstractTestSortedSet} for exercising the
* [EMAIL PROTECTED] UnmodifiableSortedSet} implementation.
*
* @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/10/13 02:48:16 $
*
* @author Phil Steitz
*/
public class TestUnmodifiableSortedSet extends AbstractTestSortedSet{
public TestUnmodifiableSortedSet(String testName) {
super(testName);
}
public static Test suite() {
// Can't run bulk tests in AbstractTestSet -- subset tests modify set
return new TestSuite(TestUnmodifiableSortedSet.class);
}
public static void main(String args[]) {
String[] testCaseName = { TestUnmodifiableSortedSet.class.getName()};
junit.textui.TestRunner.main(testCaseName);
}
//-------------------------------------------------------------------
public Set makeEmptySet() {
return UnmodifiableSortedSet.decorate(new TreeSet());
}
public Set makeFullSet() {
TreeSet set = new TreeSet();
set.addAll(Arrays.asList(getFullElements()));
return UnmodifiableSortedSet.decorate(set);
}
protected boolean isAddSupported() {
return false;
}
protected boolean isRemoveSupported() {
return false;
}
//--------------------------------------------------------------------
protected UnmodifiableSortedSet set = null;
protected ArrayList array = null;
protected void setupSet() {
set = (UnmodifiableSortedSet) makeFullSet();
array = new ArrayList();
array.add(new Integer(1));
}
/**
* Verify that base set and subsets are not modifiable
*/
public void testUnmodifiable() {
setupSet();
verifyUnmodifiable(set);
verifyUnmodifiable(set.headSet(new Integer(1)));
verifyUnmodifiable(set.tailSet(new Integer(1)));
verifyUnmodifiable(set.subSet(new Integer(1), new Integer(3)));
}
/**
* Verifies that a set is not modifiable
*/
public void verifyUnmodifiable(Set set) {
try {
set.add("value");
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
set.addAll(new TreeSet());
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
set.clear();
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
set.remove("x");
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
set.removeAll(array);
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
try {
set.retainAll(array);
fail("Expecting UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
// expected
}
}
public void testComparator() {
setupSet();
Comparator c = set.comparator();
assertTrue("natural order, so comparator should be null", c == null);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
