You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2003/10/05 22:46:40 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestStaticBucketMap.java TestBeanMap.java TestCursorableLinkedList.java
scolebourne 2003/10/05 13:46:40
Modified: collections/src/test/org/apache/commons/collections
TestStaticBucketMap.java TestBeanMap.java
TestCursorableLinkedList.java
Log:
Renamed ignoredSimpleTests to ignoredTests in AbstractTestMap
Revision Changes Path
1.6 +21 -16 jakarta-commons/collections/src/test/org/apache/commons/collections/TestStaticBucketMap.java
Index: TestStaticBucketMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestStaticBucketMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestStaticBucketMap.java 2 Oct 2003 23:01:10 -0000 1.5
+++ TestStaticBucketMap.java 5 Oct 2003 20:46:40 -0000 1.6
@@ -1,9 +1,10 @@
-package org.apache.commons.collections;
-
-/* ====================================================================
+/*
+ * $Header$
+ * ====================================================================
+ *
* 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 @@
* 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.
- *
- * 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.
+ * 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
@@ -52,7 +53,9 @@
* 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 @@
* Unit tests
* {@link org.apache.commons.collections.StaticBucketMap}.
*
- * @author <a href="mailto:mas@apache.org">Michael A. Smith</a>
+ * @version $Revision$ $Date$
+ *
+ * @author Michael A. Smith
*/
public class TestStaticBucketMap extends AbstractTestMap {
@@ -83,7 +88,7 @@
return new StaticBucketMap(30);
}
- public String[] ignoredSimpleTests() {
+ protected String[] ignoredTests() {
String pre = "TestStaticBucketMap.bulkTestMap";
String post = ".testCollectionIteratorFailFast";
return new String[] {
1.12 +36 -44 jakarta-commons/collections/src/test/org/apache/commons/collections/TestBeanMap.java
Index: TestBeanMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestBeanMap.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TestBeanMap.java 2 Oct 2003 23:01:10 -0000 1.11
+++ TestBeanMap.java 5 Oct 2003 20:46:40 -0000 1.12
@@ -1,13 +1,10 @@
/*
* $Header$
- * $Revision$
- * $Date$
- *
* ====================================================================
*
* 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 @@
/**
* Test cases for BeanMap
*
- * @author <a href="mailto:morgand@apache.org">Morgan Delagrange</a>
+ * @version $Revision$ $Date$
+ *
+ * @author Morgan Delagrange
*/
public class TestBeanMap extends AbstractTestMap {
@@ -183,20 +182,17 @@
}
}
-/*
- 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 @@
**/
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 @@
return values;
}
- public Object[] getNewSampleValues() {
+ protected Object[] getNewSampleValues() {
Object[] values = new Object[] {
new Integer(223),
new Long(23341928234L),
@@ -289,6 +282,22 @@
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
@@ -319,23 +328,6 @@
"CloneNotSupportedException when clone should succeed.");
}
}
-
- 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();
1.13 +6 -9 jakarta-commons/collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java
Index: TestCursorableLinkedList.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestCursorableLinkedList.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestCursorableLinkedList.java 2 Oct 2003 22:14:29 -0000 1.12
+++ TestCursorableLinkedList.java 5 Oct 2003 20:46:40 -0000 1.13
@@ -1,13 +1,10 @@
/*
* $Header$
- * $Revision$
- * $Date$
- *
* ====================================================================
*
* 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 @@
/**
* Test class.
*
+ * @version $Revision$ $Date$
+ *
* @author Rodney Waldhoff
* @author Simon Kitching
- * @version $Id$
*/
public class TestCursorableLinkedList extends AbstractTestList {
public TestCursorableLinkedList(String testName) {
@@ -1059,7 +1056,7 @@
*
* @return an array of sublist serialization test names
*/
- public String[] ignoredSimpleTests() {
+ protected String[] ignoredTests() {
ArrayList list = new ArrayList();
String prefix = "TestCursorableLinkedList";
String bulk = ".bulkTestSubList";
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org