tab police
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1070674 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Matthew Jason Benson
parent
9a24ed01f7
commit
d1016f05a5
|
|
@ -1216,82 +1216,82 @@ public abstract class AbstractTestMap<K, V> extends AbstractTestObject {
|
|||
* Tests values.removeAll.
|
||||
*/
|
||||
public void testValuesRemoveAll() {
|
||||
resetFull();
|
||||
Collection<V> values = getMap().values();
|
||||
List<V> sampleValuesAsList = Arrays.asList(getSampleValues());
|
||||
if (!values.equals(sampleValuesAsList)) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
assertFalse(values.removeAll(Collections.<V> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.removeAll is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleValuesAsList.size(), getMap().size());
|
||||
try {
|
||||
assertTrue(values.removeAll(sampleValuesAsList));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.removeAll is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
resetFull();
|
||||
Collection<V> values = getMap().values();
|
||||
List<V> sampleValuesAsList = Arrays.asList(getSampleValues());
|
||||
if (!values.equals(sampleValuesAsList)) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
assertFalse(values.removeAll(Collections.<V> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.removeAll is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleValuesAsList.size(), getMap().size());
|
||||
try {
|
||||
assertTrue(values.removeAll(sampleValuesAsList));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.removeAll is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test values.retainAll.
|
||||
*/
|
||||
public void testValuesRetainAll() {
|
||||
resetFull();
|
||||
Collection<V> values = getMap().values();
|
||||
List<V> sampleValuesAsList = Arrays.asList(getSampleValues());
|
||||
if (!values.equals(sampleValuesAsList)) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
assertFalse(values.retainAll(sampleValuesAsList));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
resetFull();
|
||||
Collection<V> values = getMap().values();
|
||||
List<V> sampleValuesAsList = Arrays.asList(getSampleValues());
|
||||
if (!values.equals(sampleValuesAsList)) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
assertFalse(values.retainAll(sampleValuesAsList));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.retainAll is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleValuesAsList.size(), getMap().size());
|
||||
try {
|
||||
assertTrue(values.retainAll(Collections.<V> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.retainAll is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleValuesAsList.size(), getMap().size());
|
||||
try {
|
||||
assertTrue(values.retainAll(Collections.<V> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.retainAll is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifies that values.iterator.remove changes the underlying map.
|
||||
*/
|
||||
public void testValuesIteratorRemoveChangesMap() {
|
||||
resetFull();
|
||||
List<V> sampleValuesAsList = Arrays.asList(getSampleValues());
|
||||
Map<V, Integer> cardinality = CollectionUtils.getCardinalityMap(sampleValuesAsList);
|
||||
Collection<V> values = getMap().values();
|
||||
for (Iterator<V> iter = values.iterator(); iter.hasNext();) {
|
||||
V value = iter.next();
|
||||
Integer count = cardinality.get(value);
|
||||
if (count == null) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
iter.remove();
|
||||
cardinality.put(value, --count);
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.iterator.remove is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
boolean expected = count > 0;
|
||||
StringBuilder msg = new StringBuilder("Value should ");
|
||||
msg.append(expected ? "yet " : "no longer ");
|
||||
msg.append("be present in the underlying map");
|
||||
assertEquals(msg.toString(), expected, getMap().containsValue(value));
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
resetFull();
|
||||
List<V> sampleValuesAsList = Arrays.asList(getSampleValues());
|
||||
Map<V, Integer> cardinality = CollectionUtils.getCardinalityMap(sampleValuesAsList);
|
||||
Collection<V> values = getMap().values();
|
||||
for (Iterator<V> iter = values.iterator(); iter.hasNext();) {
|
||||
V value = iter.next();
|
||||
Integer count = cardinality.get(value);
|
||||
if (count == null) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
iter.remove();
|
||||
cardinality.put(value, --count);
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if values.iterator.remove is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
boolean expected = count > 0;
|
||||
StringBuilder msg = new StringBuilder("Value should ");
|
||||
msg.append(expected ? "yet " : "no longer ");
|
||||
msg.append("be present in the underlying map");
|
||||
assertEquals(msg.toString(), expected, getMap().containsValue(value));
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1324,18 +1324,18 @@ public abstract class AbstractTestMap<K, V> extends AbstractTestObject {
|
|||
Set<K> keys = getMap().keySet();
|
||||
List<K> sampleKeysAsList = Arrays.asList(getSampleKeys());
|
||||
if (!keys.equals(sampleKeysAsList)) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
try {
|
||||
assertFalse(keys.removeAll(Collections.<K> emptySet()));
|
||||
assertFalse(keys.removeAll(Collections.<K> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleKeysAsList, keys);
|
||||
try {
|
||||
assertTrue(keys.removeAll(sampleKeysAsList));
|
||||
assertTrue(keys.removeAll(sampleKeysAsList));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
}
|
||||
|
|
@ -1348,18 +1348,18 @@ public abstract class AbstractTestMap<K, V> extends AbstractTestObject {
|
|||
Set<K> keys = getMap().keySet();
|
||||
List<K> sampleKeysAsList = Arrays.asList(getSampleKeys());
|
||||
if (!keys.equals(sampleKeysAsList)) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
try {
|
||||
assertFalse(keys.retainAll(sampleKeysAsList));
|
||||
assertFalse(keys.retainAll(sampleKeysAsList));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleKeysAsList, keys);
|
||||
try {
|
||||
assertTrue(keys.retainAll(Collections.<K> emptySet()));
|
||||
assertTrue(keys.retainAll(Collections.<K> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
}
|
||||
|
|
@ -1370,13 +1370,13 @@ public abstract class AbstractTestMap<K, V> extends AbstractTestObject {
|
|||
public void testKeySetIteratorRemoveChangesMap() {
|
||||
resetFull();
|
||||
for (Iterator<K> iter = getMap().keySet().iterator(); iter.hasNext();) {
|
||||
K key = iter.next();
|
||||
try {
|
||||
iter.remove();
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertFalse(getMap().containsKey(key));
|
||||
K key = iter.next();
|
||||
try {
|
||||
iter.remove();
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertFalse(getMap().containsKey(key));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1386,91 +1386,91 @@ public abstract class AbstractTestMap<K, V> extends AbstractTestObject {
|
|||
* and testing if the entry was removed from the map.
|
||||
*/
|
||||
public void testEntrySetRemoveChangesMap() {
|
||||
resetFull();
|
||||
K[] sampleKeys = getSampleKeys();
|
||||
V[] sampleValues = getSampleValues();
|
||||
Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
|
||||
for (int i = 0; i < sampleKeys.length; i++) {
|
||||
try {
|
||||
entrySet.remove(new DefaultMapEntry<K, V>(sampleKeys[i], sampleValues[i]));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if entrySet removal is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertTrue(
|
||||
"Entry should have been removed from the underlying map.",
|
||||
!getMap().containsKey(sampleKeys[i]));
|
||||
}
|
||||
resetFull();
|
||||
K[] sampleKeys = getSampleKeys();
|
||||
V[] sampleValues = getSampleValues();
|
||||
Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
|
||||
for (int i = 0; i < sampleKeys.length; i++) {
|
||||
try {
|
||||
entrySet.remove(new DefaultMapEntry<K, V>(sampleKeys[i], sampleValues[i]));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
// if entrySet removal is unsupported, just skip this test
|
||||
return;
|
||||
}
|
||||
assertTrue(
|
||||
"Entry should have been removed from the underlying map.",
|
||||
!getMap().containsKey(sampleKeys[i]));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test entrySet.removeAll.
|
||||
*/
|
||||
public void testEntrySetRemoveAll() {
|
||||
resetFull();
|
||||
K[] sampleKeys = getSampleKeys();
|
||||
V[] sampleValues = getSampleValues();
|
||||
//verify map looks as expected:
|
||||
for (int i = 0; i < sampleKeys.length; i++) {
|
||||
if (!getMap().containsKey(sampleKeys[i])) {
|
||||
return;
|
||||
}
|
||||
V value = sampleValues[i];
|
||||
V test = getMap().get(sampleKeys[i]);
|
||||
if (value == test || value != null && value.equals(test)) {
|
||||
continue;
|
||||
}
|
||||
return;
|
||||
}
|
||||
Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
|
||||
HashSet<Map.Entry<K, V>> comparisonSet = new HashSet<Map.Entry<K, V>>(entrySet);
|
||||
try {
|
||||
assertFalse(entrySet.removeAll(Collections.<Map.Entry<K, V>> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleKeys.length, getMap().size());
|
||||
try {
|
||||
assertTrue(entrySet.removeAll(comparisonSet));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
resetFull();
|
||||
K[] sampleKeys = getSampleKeys();
|
||||
V[] sampleValues = getSampleValues();
|
||||
//verify map looks as expected:
|
||||
for (int i = 0; i < sampleKeys.length; i++) {
|
||||
if (!getMap().containsKey(sampleKeys[i])) {
|
||||
return;
|
||||
}
|
||||
V value = sampleValues[i];
|
||||
V test = getMap().get(sampleKeys[i]);
|
||||
if (value == test || value != null && value.equals(test)) {
|
||||
continue;
|
||||
}
|
||||
return;
|
||||
}
|
||||
Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
|
||||
HashSet<Map.Entry<K, V>> comparisonSet = new HashSet<Map.Entry<K, V>>(entrySet);
|
||||
try {
|
||||
assertFalse(entrySet.removeAll(Collections.<Map.Entry<K, V>> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleKeys.length, getMap().size());
|
||||
try {
|
||||
assertTrue(entrySet.removeAll(comparisonSet));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test entrySet.retainAll.
|
||||
*/
|
||||
public void testEntrySetRetainAll() {
|
||||
resetFull();
|
||||
K[] sampleKeys = getSampleKeys();
|
||||
V[] sampleValues = getSampleValues();
|
||||
//verify map looks as expected:
|
||||
for (int i = 0; i < sampleKeys.length; i++) {
|
||||
if (!getMap().containsKey(sampleKeys[i])) {
|
||||
return;
|
||||
}
|
||||
V value = sampleValues[i];
|
||||
V test = getMap().get(sampleKeys[i]);
|
||||
if (value == test || value != null && value.equals(test)) {
|
||||
continue;
|
||||
}
|
||||
return;
|
||||
}
|
||||
Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
|
||||
HashSet<Map.Entry<K, V>> comparisonSet = new HashSet<Map.Entry<K, V>>(entrySet);
|
||||
try {
|
||||
assertFalse(entrySet.retainAll(comparisonSet));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleKeys.length, getMap().size());
|
||||
try {
|
||||
assertTrue(entrySet.retainAll(Collections.<Map.Entry<K, V>> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
resetFull();
|
||||
K[] sampleKeys = getSampleKeys();
|
||||
V[] sampleValues = getSampleValues();
|
||||
//verify map looks as expected:
|
||||
for (int i = 0; i < sampleKeys.length; i++) {
|
||||
if (!getMap().containsKey(sampleKeys[i])) {
|
||||
return;
|
||||
}
|
||||
V value = sampleValues[i];
|
||||
V test = getMap().get(sampleKeys[i]);
|
||||
if (value == test || value != null && value.equals(test)) {
|
||||
continue;
|
||||
}
|
||||
return;
|
||||
}
|
||||
Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
|
||||
HashSet<Map.Entry<K, V>> comparisonSet = new HashSet<Map.Entry<K, V>>(entrySet);
|
||||
try {
|
||||
assertFalse(entrySet.retainAll(comparisonSet));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertEquals(sampleKeys.length, getMap().size());
|
||||
try {
|
||||
assertTrue(entrySet.retainAll(Collections.<Map.Entry<K, V>> emptySet()));
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertTrue(getMap().isEmpty());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1479,13 +1479,13 @@ public abstract class AbstractTestMap<K, V> extends AbstractTestObject {
|
|||
public void testEntrySetIteratorRemoveChangesMap() {
|
||||
resetFull();
|
||||
for (Iterator<Map.Entry<K, V>> iter = getMap().entrySet().iterator(); iter.hasNext();) {
|
||||
K key = iter.next().getKey();
|
||||
try {
|
||||
iter.remove();
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertFalse(getMap().containsKey(key));
|
||||
K key = iter.next().getKey();
|
||||
try {
|
||||
iter.remove();
|
||||
} catch (UnsupportedOperationException e) {
|
||||
return;
|
||||
}
|
||||
assertFalse(getMap().containsKey(key));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue