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

Merge branch 'pr-250' 

This closes #250
This commit is contained in:
Bruno P. Kinoshita 2021-10-09 14:53:22 +13:00
parent dfafc5d723 e6f72fe910
commit 5b0f22a750
4 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -455,6 +455,9 @@
<contributor>
<name>Chen Guoping</name>
</contributor>
<contributor>
<name>Stefano Cordio</name>
</contributor>
</contributors>
<dependencies>

3
src/changes/changes.xml
View File

@ -79,6 +79,9 @@
<action issue="COLLECTIONS-796" type="fix" dev="kinow" due-to="Clemens Kurz">
SetUniqueList.createSetBasedOnList doesn't add list elements to return value.
</action>
<action issue="COLLECTIONS-799" type="fix" dev="kinow" due-to="Stefano Cordio">
UnmodifiableNavigableSet can be modified by pollFirst() and pollLast().
</action>
<!-- ADD -->
<action issue="COLLECTIONS-760" dev="kinow" type="add" due-to="Isira Seneviratne">
Add tests for MapUtils.

16
src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
View File

@ -107,6 +107,22 @@ public final class UnmodifiableNavigableSet<E>
throw new UnsupportedOperationException();
}
/**
* @since 4.5
*/
@Override
public E pollFirst() {
throw new UnsupportedOperationException();
}
/**
* @since 4.5
*/
@Override
public E pollLast() {
throw new UnsupportedOperationException();
}
@Override
public boolean retainAll(final Collection<?> coll) {
throw new UnsupportedOperationException();

60
src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java
View File

@ -27,6 +27,8 @@ import junit.framework.Test;
import org.apache.commons.collections4.BulkTest;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Extension of {@link AbstractNavigableSetTest} for exercising the
* {@link UnmodifiableNavigableSet} implementation.
@ -48,7 +50,7 @@ public class UnmodifiableNavigableSetTest<E> extends AbstractNavigableSetTest<E>
//-------------------------------------------------------------------
@Override
public NavigableSet<E> makeObject() {
return UnmodifiableNavigableSet.unmodifiableNavigableSet(new TreeSet<E>());
return UnmodifiableNavigableSet.unmodifiableNavigableSet(new TreeSet<>());
}
@Override
@ -95,11 +97,7 @@ public class UnmodifiableNavigableSetTest<E> extends AbstractNavigableSetTest<E>
public void testDecorateFactory() {
final NavigableSet<E> set = makeFullCollection();
assertSame(set, UnmodifiableNavigableSet.unmodifiableNavigableSet(set));
try {
UnmodifiableNavigableSet.unmodifiableNavigableSet(null);
fail();
} catch (final NullPointerException ex) {}
assertThrows(NullPointerException.class, () -> UnmodifiableNavigableSet.unmodifiableNavigableSet(null));
}
/**
@ -107,48 +105,26 @@ public class UnmodifiableNavigableSetTest<E> extends AbstractNavigableSetTest<E>
*/
@SuppressWarnings("unchecked")
public void verifyUnmodifiable(final Set<E> set) {
try {
set.add((E) "value");
fail("Expecting UnsupportedOperationException.");
} catch (final UnsupportedOperationException e) {
// expected
}
try {
set.addAll(new TreeSet<E>());
fail("Expecting UnsupportedOperationException.");
} catch (final UnsupportedOperationException e) {
// expected
}
try {
set.clear();
fail("Expecting UnsupportedOperationException.");
} catch (final UnsupportedOperationException e) {
// expected
}
try {
set.remove("x");
fail("Expecting UnsupportedOperationException.");
} catch (final UnsupportedOperationException e) {
// expected
}
try {
set.removeAll(array);
fail("Expecting UnsupportedOperationException.");
} catch (final UnsupportedOperationException e) {
// expected
}
try {
set.retainAll(array);
fail("Expecting UnsupportedOperationException.");
} catch (final UnsupportedOperationException e) {
// expected
assertThrows(UnsupportedOperationException.class, () -> set.add((E) "value"));
assertThrows(UnsupportedOperationException.class, () -> set.addAll(new TreeSet<>()));
assertThrows(UnsupportedOperationException.class, () -> set.clear());
assertThrows(UnsupportedOperationException.class, () -> set.iterator().remove());
assertThrows(UnsupportedOperationException.class, () -> set.remove("x"));
assertThrows(UnsupportedOperationException.class, () -> set.removeAll(array));
assertThrows(UnsupportedOperationException.class, () -> set.removeIf(element -> true));
assertThrows(UnsupportedOperationException.class, () -> set.retainAll(array));
if (set instanceof NavigableSet) {
final NavigableSet<E> navigableSet = (NavigableSet<E>) set;
assertThrows(UnsupportedOperationException.class, () -> navigableSet.pollFirst());
assertThrows(UnsupportedOperationException.class, () -> navigableSet.pollLast());
}
}
public void testComparator() {
setupSet();
final Comparator<? super E> c = set.comparator();
assertTrue("natural order, so comparator should be null", c == null);
assertNull("natural order, so comparator should be null", c);
}