Renamed ignoredSimpleTests to ignoredTests in AbstractTestMap
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131238 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne
parent
a322e63163
commit
999d7f34cc
|
|
@ -1,13 +1,10 @@
|
|||
/*
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBeanMap.java,v 1.11 2003/10/02 23:01:10 scolebourne Exp $
|
||||
* $Revision: 1.11 $
|
||||
* $Date: 2003/10/02 23:01:10 $
|
||||
*
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestBeanMap.java,v 1.12 2003/10/05 20:46:40 scolebourne Exp $
|
||||
* ====================================================================
|
||||
*
|
||||
* The Apache Software License, Version 1.1
|
||||
*
|
||||
* Copyright (c) 1999-2003 The Apache Software Foundation. All rights
|
||||
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
|
||||
* reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -36,7 +33,7 @@
|
|||
*
|
||||
* 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.
|
||||
* 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
|
||||
|
|
@ -69,7 +66,9 @@ import junit.framework.Test;
|
|||
/**
|
||||
* Test cases for BeanMap
|
||||
*
|
||||
* @author <a href="mailto:morgand@apache.org">Morgan Delagrange</a>
|
||||
* @version $Revision: 1.12 $ $Date: 2003/10/05 20:46:40 $
|
||||
*
|
||||
* @author Morgan Delagrange
|
||||
*/
|
||||
public class TestBeanMap extends AbstractTestMap {
|
||||
|
||||
|
|
@ -183,20 +182,17 @@ public class TestBeanMap extends AbstractTestMap {
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
note to self. The Sample keys were generated by copying the field
|
||||
declarations and using the following regular expression search and replace:
|
||||
|
||||
From:
|
||||
private \(.*\) some\(.*\);
|
||||
To:
|
||||
"some\2Value",
|
||||
|
||||
Then, I manually added the "class" key, which is a property that exists for
|
||||
all beans (and all objects for that matter.
|
||||
*/
|
||||
|
||||
public Object[] getSampleKeys() {
|
||||
// note to self. The Sample keys were generated by copying the field
|
||||
// declarations and using the following regular expression search and replace:
|
||||
//
|
||||
// From:
|
||||
// private \(.*\) some\(.*\);
|
||||
// To:
|
||||
// "some\2Value",
|
||||
//
|
||||
// Then, I manually added the "class" key, which is a property that exists for
|
||||
// all beans (and all objects for that matter.
|
||||
protected Object[] getSampleKeys() {
|
||||
Object[] keys = new Object[] {
|
||||
"someIntValue",
|
||||
"someLongValue",
|
||||
|
|
@ -221,11 +217,8 @@ public class TestBeanMap extends AbstractTestMap {
|
|||
**/
|
||||
private Object objectInFullMap = new Object();
|
||||
|
||||
/*
|
||||
note to self: the sample values were created manually
|
||||
*/
|
||||
|
||||
public Object[] getSampleValues() {
|
||||
// note to self: the sample values were created manually
|
||||
protected Object[] getSampleValues() {
|
||||
Object[] values = new Object[] {
|
||||
new Integer(1234),
|
||||
new Long(1298341928234L),
|
||||
|
|
@ -242,7 +235,7 @@ public class TestBeanMap extends AbstractTestMap {
|
|||
return values;
|
||||
}
|
||||
|
||||
public Object[] getNewSampleValues() {
|
||||
protected Object[] getNewSampleValues() {
|
||||
Object[] values = new Object[] {
|
||||
new Integer(223),
|
||||
new Long(23341928234L),
|
||||
|
|
@ -289,6 +282,22 @@ public class TestBeanMap extends AbstractTestMap {
|
|||
return new BeanMap();
|
||||
}
|
||||
|
||||
protected String[] ignoredTests() {
|
||||
// Ignore the serialization tests on collection views.
|
||||
return new String[] {
|
||||
"TestBeanMap.bulkTestMapEntrySet.testCanonicalEmptyCollectionExists",
|
||||
"TestBeanMap.bulkTestMapEntrySet.testCanonicalFullCollectionExists",
|
||||
"TestBeanMap.bulkTestMapKeySet.testCanonicalEmptyCollectionExists",
|
||||
"TestBeanMap.bulkTestMapKeySet.testCanonicalFullCollectionExists",
|
||||
"TestBeanMap.bulkTestMapValues.testCanonicalEmptyCollectionExists",
|
||||
"TestBeanMap.bulkTestMapValues.testCanonicalFullCollectionExists",
|
||||
"TestBeanMap.bulkTestMapEntrySet.testSimpleSerialization",
|
||||
"TestBeanMap.bulkTestMapKeySet.testSimpleSerialization",
|
||||
"TestBeanMap.bulkTestMapEntrySet.testSerializeDeserializeThenCompare",
|
||||
"TestBeanMap.bulkTestMapKeySet.testSerializeDeserializeThenCompare"
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Need to override this method because the "clear()" method on the bean
|
||||
* map just returns the bean properties to their default states. It does
|
||||
|
|
@ -320,23 +329,6 @@ public class TestBeanMap extends AbstractTestMap {
|
|||
}
|
||||
}
|
||||
|
||||
public String[] ignoredSimpleTests() {
|
||||
// Ignore the serialization tests on collection views.
|
||||
return new String[] {
|
||||
"TestBeanMap.bulkTestMapEntrySet.testCanonicalEmptyCollectionExists",
|
||||
"TestBeanMap.bulkTestMapEntrySet.testCanonicalFullCollectionExists",
|
||||
"TestBeanMap.bulkTestMapKeySet.testCanonicalEmptyCollectionExists",
|
||||
"TestBeanMap.bulkTestMapKeySet.testCanonicalFullCollectionExists",
|
||||
"TestBeanMap.bulkTestMapValues.testCanonicalEmptyCollectionExists",
|
||||
"TestBeanMap.bulkTestMapValues.testCanonicalFullCollectionExists",
|
||||
"TestBeanMap.bulkTestMapEntrySet.testSimpleSerialization",
|
||||
"TestBeanMap.bulkTestMapKeySet.testSimpleSerialization",
|
||||
"TestBeanMap.bulkTestMapEntrySet.testSerializeDeserializeThenCompare",
|
||||
"TestBeanMap.bulkTestMapKeySet.testSerializeDeserializeThenCompare"
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
public void testBeanMapPutAllWriteable() {
|
||||
BeanMap map1 = (BeanMap)makeFullMap();
|
||||
BeanMap map2 = (BeanMap)makeFullMap();
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
/*
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.12 2003/10/02 22:14:29 scolebourne Exp $
|
||||
* $Revision: 1.12 $
|
||||
* $Date: 2003/10/02 22:14:29 $
|
||||
*
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v 1.13 2003/10/05 20:46:40 scolebourne Exp $
|
||||
* ====================================================================
|
||||
*
|
||||
* The Apache Software License, Version 1.1
|
||||
*
|
||||
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
|
||||
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
|
||||
* reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -36,7 +33,7 @@
|
|||
*
|
||||
* 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.
|
||||
* 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
|
||||
|
|
@ -58,7 +55,6 @@
|
|||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
|
||||
package org.apache.commons.collections;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -72,9 +68,10 @@ import junit.framework.Test;
|
|||
/**
|
||||
* Test class.
|
||||
*
|
||||
* @version $Revision: 1.13 $ $Date: 2003/10/05 20:46:40 $
|
||||
*
|
||||
* @author Rodney Waldhoff
|
||||
* @author Simon Kitching
|
||||
* @version $Id: TestCursorableLinkedList.java,v 1.12 2003/10/02 22:14:29 scolebourne Exp $
|
||||
*/
|
||||
public class TestCursorableLinkedList extends AbstractTestList {
|
||||
public TestCursorableLinkedList(String testName) {
|
||||
|
|
@ -1059,7 +1056,7 @@ public class TestCursorableLinkedList extends AbstractTestList {
|
|||
*
|
||||
* @return an array of sublist serialization test names
|
||||
*/
|
||||
public String[] ignoredSimpleTests() {
|
||||
protected String[] ignoredTests() {
|
||||
ArrayList list = new ArrayList();
|
||||
String prefix = "TestCursorableLinkedList";
|
||||
String bulk = ".bulkTestSubList";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
package org.apache.commons.collections;
|
||||
|
||||
/* ====================================================================
|
||||
/*
|
||||
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestStaticBucketMap.java,v 1.6 2003/10/05 20:46:40 scolebourne Exp $
|
||||
* ====================================================================
|
||||
*
|
||||
* The Apache Software License, Version 1.1
|
||||
*
|
||||
* Copyright (c) 2001 The Apache Software Foundation. All rights
|
||||
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
|
||||
* reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -18,21 +19,21 @@ package org.apache.commons.collections;
|
|||
* 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:
|
||||
* 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 "Apache" and "Apache Software Foundation" and
|
||||
* "Apache Turbine" 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.
|
||||
* 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",
|
||||
* "Apache Turbine", nor may "Apache" appear in their name, without
|
||||
* prior written permission of the Apache Software Foundation.
|
||||
* 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
|
||||
|
|
@ -52,7 +53,9 @@ package org.apache.commons.collections;
|
|||
* 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 java.util.Map;
|
||||
|
||||
|
|
@ -62,7 +65,9 @@ import junit.framework.Test;
|
|||
* Unit tests
|
||||
* {@link org.apache.commons.collections.StaticBucketMap}.
|
||||
*
|
||||
* @author <a href="mailto:mas@apache.org">Michael A. Smith</a>
|
||||
* @version $Revision: 1.6 $ $Date: 2003/10/05 20:46:40 $
|
||||
*
|
||||
* @author Michael A. Smith
|
||||
*/
|
||||
public class TestStaticBucketMap extends AbstractTestMap {
|
||||
|
||||
|
|
@ -83,7 +88,7 @@ public class TestStaticBucketMap extends AbstractTestMap {
|
|||
return new StaticBucketMap(30);
|
||||
}
|
||||
|
||||
public String[] ignoredSimpleTests() {
|
||||
protected String[] ignoredTests() {
|
||||
String pre = "TestStaticBucketMap.bulkTestMap";
|
||||
String post = ".testCollectionIteratorFailFast";
|
||||
return new String[] {
|
||||
|
|
|
|||
Loading…
Reference in New Issue