This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
The following commit(s) were added to refs/heads/master by this push:
new 342b03d [BulkTest] remove workarounds for buggy JDK 1.6
implementations (#68)
342b03d is described below
commit 342b03d1dd60209b4fe17df492cf9a4e9c3242bd
Author: Eitan Adler <[email protected]>
AuthorDate: Sun Feb 10 03:48:18 2019 -0800
[BulkTest] remove workarounds for buggy JDK 1.6 implementations (#68)
Considering that we now require Java 8, having a workaround for IBM's
version of JDK 1.6 isn't required.
---
.../commons/collections4/bidimap/DualTreeBidiMap.java | 1 -
.../java/org/apache/commons/collections4/BulkTest.java | 11 -----------
.../collections4/bidimap/DualTreeBidiMap2Test.java | 18 ------------------
.../collections4/bidimap/DualTreeBidiMapTest.java | 18 ------------------
.../commons/collections4/map/AbstractMapTest.java | 4 ----
.../collections4/map/TransformedSortedMapTest.java | 17 -----------------
.../collections4/trie/UnmodifiableTrieTest.java | 8 --------
7 files changed, 77 deletions(-)
diff --git
a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
index 0792f60..1469925 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
@@ -378,7 +378,6 @@ public class DualTreeBidiMap<K, V> extends
AbstractDualBidiMap<K, V>
final V oldValue = parent.put(last.getKey(), value);
// Map.Entry specifies that the behavior is undefined when the
backing map
// has been modified (as we did with the put), so we also set the
value
- // (especially needed for IBM JDK)
last.setValue(value);
return oldValue;
}
diff --git a/src/test/java/org/apache/commons/collections4/BulkTest.java
b/src/test/java/org/apache/commons/collections4/BulkTest.java
index a613198..a7c4b7e 100644
--- a/src/test/java/org/apache/commons/collections4/BulkTest.java
+++ b/src/test/java/org/apache/commons/collections4/BulkTest.java
@@ -136,17 +136,6 @@ 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
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
index 486b0de..1d74864 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
@@ -154,24 +154,6 @@ public class DualTreeBidiMap2Test<K extends Comparable<K>,
V extends Comparable<
@Override
public String[] ignoredTests() {
final String recursiveTest =
"DualTreeBidiMap2Test.bulkTestInverseMap.bulkTestInverseMap";
-
- if (IBMJDK16) {
- final String preSub = "DualTreeBidiMap2Test.bulkTestSubMap.";
- final String preTail = "DualTreeBidiMap2Test.bulkTestTailMap.";
- return new String[] {
- recursiveTest,
- 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"
- };
- }
return new String[] { recursiveTest };
}
diff --git
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
index fbd34bf..0f25f86 100644
---
a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
@@ -48,24 +48,6 @@ public class DualTreeBidiMapTest<K extends Comparable<K>, V
extends Comparable<V
@Override
public String[] ignoredTests() {
final String recursiveTest =
"DualTreeBidiMapTest.bulkTestInverseMap.bulkTestInverseMap";
-
- if (IBMJDK16) {
- final String preSub = "DualTreeBidiMapTest.bulkTestSubMap.";
- final String preTail = "DualTreeBidiMapTest.bulkTestTailMap.";
- return new String[] {
- recursiveTest,
- 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"
- };
- }
return new String[] { recursiveTest };
}
diff --git
a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
index c32d60f..dd2a3b6 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
@@ -2006,10 +2006,6 @@ public abstract class AbstractMapTest<K, V> extends
AbstractObjectTest {
public void verifyValues() {
final List<V> known = new ArrayList<>(getConfirmed().values());
- // bug in IBM JDK: IBM J9 VM build 2.4, JRE 1.6.0 IBM J9 2.4 Linux
x86-32 jvmxi3260sr12-20121024_126067
- // a call to values() on an empty map retrieved via TreeMap#headMap or
tailMap
- // will render the values view unusable: resulting in
NullPointerExceptions or missing values
- // it will also not recover, as the value view is cached internally
values = getMap().values();
final List<V> test = new ArrayList<>(values);
diff --git
a/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
index 7be48c9..3d44292 100644
---
a/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
@@ -46,23 +46,6 @@ public class TransformedSortedMapTest<K, V> extends
AbstractSortedMapTest<K, V>
@Override
public String[] ignoredTests() {
- if (IBMJDK16) {
- final String preSubMap =
"TransformedSortedMapTest.bulkTestSubMap.";
- final String preTailMap =
"TransformedSortedMapTest.bulkTestTailMap.";
- return new String[] {
- 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"
- };
- }
return null;
}
diff --git
a/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
b/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
index a8de8a5..b05ee44 100644
---
a/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
+++
b/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
@@ -92,14 +92,6 @@ public class UnmodifiableTrieTest<V> extends
AbstractSortedMapTest<String, V> {
*/
@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"
- };
- }
return null;
}
