Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid some null-based tests in JDK1.2 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131575 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2004-01-24 21:48:27 +00:00
parent 746ba6748d
commit c9ac0e22a3
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/org/apache/commons/collections/map/AbstractTestMap.java
View File

@ -155,10 +155,20 @@ import org.apache.commons.collections.set.AbstractTestSet;
* @author Rodney Waldhoff * @author Rodney Waldhoff
* @author Paul Jack * @author Paul Jack
* @author Stephen Colebourne * @author Stephen Colebourne
* @version $Revision: 1.6 $ $Date: 2004/01/14 21:34:34 $ * @version $Revision: 1.7 $ $Date: 2004/01/24 21:48:27 $
*/ */
public abstract class AbstractTestMap extends AbstractTestObject { public abstract class AbstractTestMap extends AbstractTestObject {
/**
* JDK1.2 has bugs in null handling of Maps, especially HashMap.Entry.toString
* This avoids nulls for JDK1.2
*/
private static final boolean JDK12;
static {
String str = System.getProperty("java.version");
JDK12 = str.startsWith("1.2");
}
// These instance variables are initialized with the reset method. // These instance variables are initialized with the reset method.
// Tests for map methods that alter the map (put, putAll, remove) // Tests for map methods that alter the map (put, putAll, remove)
// first call reset() to create the map and its views; then perform // first call reset() to create the map and its views; then perform
@ -304,7 +314,7 @@ public abstract class AbstractTestMap extends AbstractTestObject {
"hello", "goodbye", "we'll", "see", "you", "all", "again", "hello", "goodbye", "we'll", "see", "you", "all", "again",
"key", "key",
"key2", "key2",
(isAllowNullKey()) ? null : "nonnullkey" (isAllowNullKey() && !JDK12) ? null : "nonnullkey"
}; };
return result; return result;
} }
@ -346,7 +356,7 @@ public abstract class AbstractTestMap extends AbstractTestObject {
Object[] result = new Object[] { Object[] result = new Object[] {
"blahv", "foov", "barv", "bazv", "tmpv", "goshv", "gollyv", "geev", "blahv", "foov", "barv", "bazv", "tmpv", "goshv", "gollyv", "geev",
"hellov", "goodbyev", "we'llv", "seev", "youv", "allv", "againv", "hellov", "goodbyev", "we'llv", "seev", "youv", "allv", "againv",
(isAllowNullValue()) ? null : "nonnullvalue", (isAllowNullValue() && !JDK12) ? null : "nonnullvalue",
"value", "value",
(isAllowDuplicateValues()) ? "value" : "value2", (isAllowDuplicateValues()) ? "value" : "value2",
}; };
@ -366,7 +376,7 @@ public abstract class AbstractTestMap extends AbstractTestObject {
*/ */
public Object[] getNewSampleValues() { public Object[] getNewSampleValues() {
Object[] result = new Object[] { Object[] result = new Object[] {
(isAllowNullValue() && isAllowDuplicateValues()) ? null : "newnonnullvalue", (isAllowNullValue() && !JDK12 && isAllowDuplicateValues()) ? null : "newnonnullvalue",
"newvalue", "newvalue",
(isAllowDuplicateValues()) ? "newvalue" : "newvalue2", (isAllowDuplicateValues()) ? "newvalue" : "newvalue2",
"newblahv", "newfoov", "newbarv", "newbazv", "newtmpv", "newgoshv", "newblahv", "newfoov", "newbarv", "newbazv", "newtmpv", "newgoshv",