You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/11/14 21:57:03 UTC
svn commit: r1542074 - in
/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4:
BulkTest.java bidimap/DualTreeBidiMap2Test.java
bidimap/DualTreeBidiMapTest.java map/TransformedSortedMapTest.java
trie/UnmodifiableTrieTest.java
Author: tn
Date: Thu Nov 14 20:57:02 2013
New Revision: 1542074
URL: http://svn.apache.org/r1542074
Log:
Exclude more test cases for IBM JDK 6 as these are failing for release SR15.
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BulkTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BulkTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BulkTest.java?rev=1542074&r1=1542073&r2=1542074&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BulkTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/BulkTest.java Thu Nov 14 20:57:02 2013
@@ -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
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java?rev=1542074&r1=1542073&r2=1542074&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java Thu Nov 14 20:57:02 2013
@@ -155,27 +155,21 @@ public class DualTreeBidiMap2Test<K exte
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 };
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java?rev=1542074&r1=1542073&r2=1542074&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java Thu Nov 14 20:57:02 2013
@@ -48,29 +48,23 @@ public class DualTreeBidiMapTest<K exten
*/
@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 };
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java?rev=1542074&r1=1542073&r2=1542074&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java Thu Nov 14 20:57:02 2013
@@ -47,27 +47,21 @@ public class TransformedSortedMapTest<K,
@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;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java?rev=1542074&r1=1542073&r2=1542074&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java Thu Nov 14 20:57:02 2013
@@ -88,6 +88,23 @@ public class UnmodifiableTrieTest<V> ext
//-----------------------------------------------------------------------
+ /**
+ * 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";