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 98f607cf0 Javadoc: Match since tag to expected version
98f607cf0 is described below
commit 98f607cf0e209bc0b6e9ec70a3307e42cd294bf7
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Oct 20 17:05:07 2024 -0400
Javadoc: Match since tag to expected version
Sort members
---
.../multimap/ArrayListValuedHashMapTest.java | 16 +++---
.../multimap/ArrayListValuedLinkedHashMapTest.java | 58 +++++++++++-----------
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
index aed4b1414..1f3124456 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
@@ -71,6 +71,14 @@ public class ArrayListValuedHashMapTest<K, V> extends
AbstractMultiValuedMapTest
assertEquals("{}", listMap1.toString());
}
+ @Test
+ public void testCopyConstructorWithMultiValuedMap() {
+ final ListValuedMap<K, V> map = makeObject();
+ map.put((K) "key", (V) "sleutel");
+ final ListValuedMap<K, V> copy = new ArrayListValuedHashMap<>(map);
+ assertEquals(map, copy);
+ }
+
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testEqualsHashCodeContract() {
@@ -254,14 +262,6 @@ public class ArrayListValuedHashMapTest<K, V> extends
AbstractMultiValuedMapTest
assertEquals("Q", list3.get(2));
}
- @Test
- public void testCopyConstructorWithMultiValuedMap() {
- final ListValuedMap<K, V> map = makeObject();
- map.put((K) "key", (V) "sleutel");
- final ListValuedMap<K, V> copy = new ArrayListValuedHashMap<>(map);
- assertEquals(map, copy);
- }
-
// public void testCreate() throws Exception {
// writeExternalFormToDisk((java.io.Serializable) makeObject(),
//
"src/test/resources/org/apache/commons/collections4/data/test/ArrayListValuedHashMap.emptyCollection.version4.1.obj");
diff --git
a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedLinkedHashMapTest.java
b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedLinkedHashMapTest.java
index a05758f63..667ee882e 100644
---
a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedLinkedHashMapTest.java
+++
b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedLinkedHashMapTest.java
@@ -43,6 +43,11 @@ public class ArrayListValuedLinkedHashMapTest<K, V> extends
AbstractMultiValuedM
super(ArrayListValuedLinkedHashMapTest.class.getSimpleName());
}
+ @Override
+ public String getCompatibilityVersion() {
+ return "4.5"; // ArrayListValuedLinkedHashMap has been added in
version 4.5
+ }
+
@Override
protected int getIterationBehaviour() {
return AbstractCollectionTest.UNORDERED;
@@ -53,11 +58,6 @@ public class ArrayListValuedLinkedHashMapTest<K, V> extends
AbstractMultiValuedM
return new ArrayListValuedLinkedHashMap<>();
}
- @Override
- public String getCompatibilityVersion() {
- return "4.5"; // ArrayListValuedLinkedHashMap has been added in
version 4.5
- }
-
@Test
public void testArrayListValuedLinkedHashMap() {
final ListValuedMap<K, V> listMap;
@@ -77,6 +77,14 @@ public class ArrayListValuedLinkedHashMapTest<K, V> extends
AbstractMultiValuedM
assertEquals("{}", listMap1.toString());
}
+ @Test
+ public void testCopyConstructorWithMultiValuedMap() {
+ final ListValuedMap<K, V> map = makeObject();
+ map.put((K) "key", (V) "sleutel");
+ final ListValuedMap<K, V> copy = new
ArrayListValuedLinkedHashMap<>(map);
+ assertEquals(map, copy);
+ }
+
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testEqualsHashCodeContract() {
@@ -181,6 +189,22 @@ public class ArrayListValuedLinkedHashMapTest<K, V>
extends AbstractMultiValuedM
assertEquals(2, listMap.get((K) "B").size());
}
+ @Test
+ public void testPreservesKeyInsertionOrder() {
+ final ListValuedMap<K, V> map = makeObject();
+ map.put((K) Integer.valueOf(5), (V) "five");
+ map.put((K) Integer.valueOf(1), (V) "one");
+ map.put((K) Integer.valueOf(5), (V) "vijf"); // "vijf" = "five" in
Dutch
+ MapIterator<K, V> mapIterator = map.mapIterator();
+ assertEquals(5, mapIterator.next());
+ assertEquals("five", mapIterator.getValue());
+ assertEquals(5, mapIterator.next());
+ assertEquals("vijf", mapIterator.getValue());
+ assertEquals(1, mapIterator.next());
+ assertEquals("one", mapIterator.getValue());
+ assertFalse(mapIterator.hasNext());
+ }
+
@Test
public void testTrimToSize() {
final ArrayListValuedLinkedHashMap<K, V> listMap = new
ArrayListValuedLinkedHashMap<>(4);
@@ -260,30 +284,6 @@ public class ArrayListValuedLinkedHashMapTest<K, V>
extends AbstractMultiValuedM
assertEquals("Q", list3.get(2));
}
- @Test
- public void testPreservesKeyInsertionOrder() {
- final ListValuedMap<K, V> map = makeObject();
- map.put((K) Integer.valueOf(5), (V) "five");
- map.put((K) Integer.valueOf(1), (V) "one");
- map.put((K) Integer.valueOf(5), (V) "vijf"); // "vijf" = "five" in
Dutch
- MapIterator<K, V> mapIterator = map.mapIterator();
- assertEquals(5, mapIterator.next());
- assertEquals("five", mapIterator.getValue());
- assertEquals(5, mapIterator.next());
- assertEquals("vijf", mapIterator.getValue());
- assertEquals(1, mapIterator.next());
- assertEquals("one", mapIterator.getValue());
- assertFalse(mapIterator.hasNext());
- }
-
- @Test
- public void testCopyConstructorWithMultiValuedMap() {
- final ListValuedMap<K, V> map = makeObject();
- map.put((K) "key", (V) "sleutel");
- final ListValuedMap<K, V> copy = new
ArrayListValuedLinkedHashMap<>(map);
- assertEquals(map, copy);
- }
-
// @Test
// public void testCreate() throws Exception {
// writeExternalFormToDisk((java.io.Serializable) makeObject(),
