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

Exclude more test cases for IBM JDK 6 as these are failing for release SR15. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1542074 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2013-11-14 20:57:02 +00:00
parent 8cc80dd1a4
commit 04af9bc8ee
5 changed files with 69 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/java/org/apache/commons/collections4/BulkTest.java
View File

@ -137,6 +137,17 @@ import junit.framework.TestSuite;
*/
public class BulkTest extends TestCase implements Cloneable {
/**
* IBM JDK 1.6.0 has several bugs in their java.util.TreeMap implementation.
*/
protected static final boolean IBMJDK16;
static {
final String vmName = System.getProperty("java.vm.name");
final String version = System.getProperty("java.version");
IBMJDK16 = vmName != null && vmName.equals("IBM J9 VM") &&
version != null && version.equals("1.6.0");
}
// Note: BulkTest is Cloneable to make it easier to construct
// BulkTest instances for simple test methods that are defined in

32
src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
View File

@ -155,27 +155,21 @@ public class DualTreeBidiMap2Test<K extends Comparable<K>, V extends Comparable<
public String[] ignoredTests() {
String recursiveTest = "DualTreeBidiMap2Test.bulkTestInverseMap.bulkTestInverseMap";
// there are several bugs in the following JVM:
// IBM J9 VM build 2.4, JRE 1.6.0 IBM J9 2.4 Linux x86-32 jvmxi3260sr12-20121024_126067
// thus disabling tests related to these bugs
final String vmName = System.getProperty("java.vm.name");
final String version = System.getProperty("java.version");
if (vmName == null || version == null) {
return new String[] { recursiveTest };
}
if (vmName.equals("IBM J9 VM") && version.equals("1.6.0")) {
final String preSub = "DualTreeBidiMap2Test.bulkTestSubMap.bulkTestMap";
final String preTail = "DualTreeBidiMap2Test.bulkTestTailMap.bulkTestMap";
if (IBMJDK16) {
final String preSub = "DualTreeBidiMap2Test.bulkTestSubMap.";
final String preTail = "DualTreeBidiMap2Test.bulkTestTailMap.";
return new String[] {
recursiveTest,
preSub + "EntrySet.testCollectionIteratorRemove",
preSub + "Values.testCollectionIteratorRemove",
preTail + "Values.testCollectionClear",
preTail + "Values.testCollectionRemoveAll",
preTail + "Values.testCollectionRetainAll"
preSub + "bulkTestMapEntrySet.testCollectionIteratorRemove",
preSub + "bulkTestMapValues.testCollectionIteratorRemove",
preTail + "testMapRemove",
preTail + "bulkTestMapEntrySet.testCollectionIteratorRemove",
preTail + "bulkTestMapEntrySet.testCollectionRemoveAll",
preTail + "bulkTestMapKeySet.testCollectionIteratorRemove",
preTail + "bulkTestMapKeySet.testCollectionRemoveAll",
preTail + "bulkTestMapValues.testCollectionClear",
preTail + "bulkTestMapValues.testCollectionRemoveAll",
preTail + "bulkTestMapValues.testCollectionRetainAll"
};
} else {
return new String[] { recursiveTest };

34
src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
View File

@ -48,29 +48,23 @@ public class DualTreeBidiMapTest<K extends Comparable<K>, V extends Comparable<V
*/
@Override
public String[] ignoredTests() {
String recursiveTest = "DualTreeBidiMapTest.bulkTestInverseMap.bulkTestInverseMap";
final String recursiveTest = "DualTreeBidiMapTest.bulkTestInverseMap.bulkTestInverseMap";
// there are several bugs in the following JVM:
// IBM J9 VM build 2.4, JRE 1.6.0 IBM J9 2.4 Linux x86-32 jvmxi3260sr12-20121024_126067
// thus disabling tests related to these bugs
final String vmName = System.getProperty("java.vm.name");
final String version = System.getProperty("java.version");
if (vmName == null || version == null) {
return new String[] { recursiveTest };
}
if (vmName.equals("IBM J9 VM") && version.equals("1.6.0")) {
final String preSub = "DualTreeBidiMapTest.bulkTestSubMap.bulkTestMap";
final String preTail = "DualTreeBidiMapTest.bulkTestTailMap.bulkTestMap";
if (IBMJDK16) {
final String preSub = "DualTreeBidiMapTest.bulkTestSubMap.";
final String preTail = "DualTreeBidiMapTest.bulkTestTailMap.";
return new String[] {
recursiveTest,
preSub + "EntrySet.testCollectionIteratorRemove",
preSub + "Values.testCollectionIteratorRemove",
preTail + "Values.testCollectionClear",
preTail + "Values.testCollectionRemoveAll",
preTail + "Values.testCollectionRetainAll"
preSub + "bulkTestMapEntrySet.testCollectionIteratorRemove",
preSub + "bulkTestMapValues.testCollectionIteratorRemove",
preTail + "testMapRemove",
preTail + "bulkTestMapEntrySet.testCollectionIteratorRemove",
preTail + "bulkTestMapEntrySet.testCollectionRemoveAll",
preTail + "bulkTestMapKeySet.testCollectionIteratorRemove",
preTail + "bulkTestMapKeySet.testCollectionRemoveAll",
preTail + "bulkTestMapValues.testCollectionClear",
preTail + "bulkTestMapValues.testCollectionRemoveAll",
preTail + "bulkTestMapValues.testCollectionRetainAll"
};
} else {
return new String[] { recursiveTest };

34
src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
View File

@ -47,27 +47,21 @@ public class TransformedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V>
@Override
public String[] ignoredTests() {
// there are several bugs in the following JVM:
// IBM J9 VM build 2.4, JRE 1.6.0 IBM J9 2.4 Linux x86-32 jvmxi3260sr12-20121024_126067
// thus disabling tests related to these bugs
final String vmName = System.getProperty("java.vm.name");
final String version = System.getProperty("java.version");
if (vmName == null || version == null) {
return null;
}
if (vmName.equals("IBM J9 VM") && version.equals("1.6.0")) {
final String preSubMap = "TransformedSortedMapTest.bulkTestSubMap.bulkTestMap";
final String preTailMap = "TransformedSortedMapTest.bulkTestTailMap.bulkTestMap";
if (IBMJDK16) {
final String preSubMap = "TransformedSortedMapTest.bulkTestSubMap.";
final String preTailMap = "TransformedSortedMapTest.bulkTestTailMap.";
return new String[] {
preSubMap + "EntrySet.testCollectionIteratorRemove",
preSubMap + "KeySet.testCollectionRemove",
preSubMap + "Values.testCollectionIteratorRemove",
preTailMap + "Values.testCollectionClear",
preTailMap + "Values.testCollectionRemoveAll",
preTailMap + "Values.testCollectionRetainAll"
preSubMap + "bulkTestMapEntrySet.testCollectionIteratorRemove",
preSubMap + "bulkTestMapKeySet.testCollectionRemove",
preSubMap + "bulkTestMapValues.testCollectionIteratorRemove",
preTailMap + "testMapRemove",
preTailMap + "bulkTestMapEntrySet.testCollectionIteratorRemove",
preTailMap + "bulkTestMapEntrySet.testCollectionRemoveAll",
preTailMap + "bulkTestMapKeySet.testCollectionIteratorRemove",
preTailMap + "bulkTestMapKeySet.testCollectionRemoveAll",
preTailMap + "bulkTestMapValues.testCollectionClear",
preTailMap + "bulkTestMapValues.testCollectionRemoveAll",
preTailMap + "bulkTestMapValues.testCollectionRetainAll"
};
} else {
return null;

17
src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
View File

@ -88,6 +88,23 @@ public class UnmodifiableTrieTest<V> extends AbstractSortedMapTest<String, V> {
//-----------------------------------------------------------------------
/**
* Override to prevent infinite recursion of tests.
*/
@Override
public String[] ignoredTests() {
if (IBMJDK16) {
final String prefix = "UnmodifiableTrieTest.";
return new String[] {
prefix + "bulkTestHeadMap.bulkTestMapEntrySet.testCollectionToArray2",
prefix + "bulkTestTailMap.bulkTestMapEntrySet.testCollectionToArray2",
prefix + "bulkTestSubMap.bulkTestMapEntrySet.testCollectionToArray2"
};
} else {
return null;
}
}
@Override
public String getCompatibilityVersion() {
return "4";