This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-collections.git
commit e41107dd7a7759acfbcd3ba973b24591473bce15 Author: Gary Gregory <[email protected]> AuthorDate: Thu Jul 30 06:17:36 2026 -0400 Sort members --- .../multimap/AbstractMultiValuedMapTest.java | 26 +++++++++++----------- .../properties/OrderedPropertiesTest.java | 18 +++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java index 890bffdef..80b5f53c2 100644 --- a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java +++ b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java @@ -683,6 +683,19 @@ public abstract class AbstractMultiValuedMapTest<K, V> extends AbstractObjectTes this.confirmed = confirmed; } + @Test + @SuppressWarnings("unchecked") + void testAddAllThroughGetEmptyLeavesKeyAbsent() { + assumeTrue(isAddSupported()); + resetEmpty(); + final MultiValuedMap<K, V> map = getMap(); + final Collection<V> col = map.get((K) "k0"); + assertFalse(col.addAll(new ArrayList<>())); + assertFalse(map.containsKey("k0")); + assertFalse(map.keySet().contains("k0")); + assertEquals(0, map.size()); + } + @Test @SuppressWarnings("unchecked") void testAddMappingThroughGet() { @@ -705,19 +718,6 @@ public abstract class AbstractMultiValuedMapTest<K, V> extends AbstractObjectTes assertTrue(col2.contains("v1_1")); } - @Test - @SuppressWarnings("unchecked") - void testAddAllThroughGetEmptyLeavesKeyAbsent() { - assumeTrue(isAddSupported()); - resetEmpty(); - final MultiValuedMap<K, V> map = getMap(); - final Collection<V> col = map.get((K) "k0"); - assertFalse(col.addAll(new ArrayList<>())); - assertFalse(map.containsKey("k0")); - assertFalse(map.keySet().contains("k0")); - assertEquals(0, map.size()); - } - /*void testRemoveViaGetCollectionRemove() { if (!isRemoveSupported()) { return; diff --git a/src/test/java/org/apache/commons/collections4/properties/OrderedPropertiesTest.java b/src/test/java/org/apache/commons/collections4/properties/OrderedPropertiesTest.java index 40476f111..90c472fb0 100644 --- a/src/test/java/org/apache/commons/collections4/properties/OrderedPropertiesTest.java +++ b/src/test/java/org/apache/commons/collections4/properties/OrderedPropertiesTest.java @@ -218,15 +218,6 @@ class OrderedPropertiesTest { }); } - @Test - void testKeySetRejectsAdd() { - final OrderedProperties orderedProperties = newThreeKeyProperties(); - final Set<Object> keySet = orderedProperties.keySet(); - assertThrows(UnsupportedOperationException.class, () -> keySet.add("key4")); - assertEquals("[key1, key2, key3]", orderedProperties.keySet().toString()); - assertEquals("{key1=value1, key2=value2, key3=value3}", orderedProperties.toString()); - } - @Test void testKeys() { final OrderedProperties orderedProperties = new OrderedProperties(); @@ -241,6 +232,15 @@ class OrderedPropertiesTest { } } + @Test + void testKeySetRejectsAdd() { + final OrderedProperties orderedProperties = newThreeKeyProperties(); + final Set<Object> keySet = orderedProperties.keySet(); + assertThrows(UnsupportedOperationException.class, () -> keySet.add("key4")); + assertEquals("[key1, key2, key3]", orderedProperties.keySet().toString()); + assertEquals("{key1=value1, key2=value2, key3=value3}", orderedProperties.toString()); + } + @Test void testLoadOrderedKeys() throws IOException { final OrderedProperties orderedProperties = new OrderedProperties();
