From e4e92570188763170f9291f62cd388e7e5b9d119 Mon Sep 17 00:00:00 2001 From: Apirom Na Nakorn Date: Tue, 30 Oct 2018 22:28:31 +0700 Subject: [PATCH 1/5] add test use ImmutablePair class with java.util.HashMap and java.util.TreeMap --- .../lang3/tuple/ImmutablePairTest.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java index 260879a95e6..92dcb06b8f5 100644 --- a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java +++ b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java @@ -26,6 +26,11 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map.Entry; +import java.util.TreeMap; import org.junit.jupiter.api.Test; @@ -136,4 +141,41 @@ public void testSerialization() throws Exception { assertEquals(origPair, deserializedPair); assertEquals(origPair.hashCode(), deserializedPair.hashCode()); } + + @Test + public void testUseAsKeyOfHashMap() { + + HashMap, String> map = new HashMap<>(); + + Object o1 = new Object(); + Object o2 = new Object(); + + ImmutablePair key1 = ImmutablePair.of(o1, o2); + String value1 = "a1"; + map.put(key1, value1); + + assertEquals(value1, map.get(key1)); + assertEquals(value1, map.get(ImmutablePair.of(o1, o2))); + } + + @Test + public void testUseAsKeyOfTreeMap() { + + TreeMap, String> map = new TreeMap<>(); + map.put(ImmutablePair.of(1, 2), "12"); + map.put(ImmutablePair.of(1, 1), "11"); + map.put(ImmutablePair.of(0, 1), "01"); + + ArrayList> expected = new ArrayList<>(); + expected.add(ImmutablePair.of(0, 1)); + expected.add(ImmutablePair.of(1, 1)); + expected.add(ImmutablePair.of(1, 2)); + + Iterator, String>> it = map.entrySet().iterator(); + for(ImmutablePair item : expected) { + Entry, String> entry = it.next(); + assertEquals(item, entry.getKey()); + assertEquals(item.getLeft() + "" + item.getRight(), entry.getValue()); + } + } } From 093fcf5eb346f0c02410fe2cd14d3c5aa494c3a0 Mon Sep 17 00:00:00 2001 From: Apirom Na Nakorn Date: Tue, 30 Oct 2018 22:41:40 +0700 Subject: [PATCH 2/5] format code correctly based on error from Travis CI --- .../lang3/tuple/ImmutablePairTest.java | 51 ++++++++----------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java index 92dcb06b8f5..1b73d305afd 100644 --- a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java +++ b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java @@ -144,38 +144,31 @@ public void testSerialization() throws Exception { @Test public void testUseAsKeyOfHashMap() { - - HashMap, String> map = new HashMap<>(); - - Object o1 = new Object(); - Object o2 = new Object(); - - ImmutablePair key1 = ImmutablePair.of(o1, o2); - String value1 = "a1"; - map.put(key1, value1); - - assertEquals(value1, map.get(key1)); - assertEquals(value1, map.get(ImmutablePair.of(o1, o2))); + HashMap, String> map = new HashMap<>(); + Object o1 = new Object(); + Object o2 = new Object(); + ImmutablePair key1 = ImmutablePair.of(o1, o2); + String value1 = "a1"; + map.put(key1, value1); + assertEquals(value1, map.get(key1)); + assertEquals(value1, map.get(ImmutablePair.of(o1, o2))); } @Test public void testUseAsKeyOfTreeMap() { - - TreeMap, String> map = new TreeMap<>(); - map.put(ImmutablePair.of(1, 2), "12"); - map.put(ImmutablePair.of(1, 1), "11"); - map.put(ImmutablePair.of(0, 1), "01"); - - ArrayList> expected = new ArrayList<>(); - expected.add(ImmutablePair.of(0, 1)); - expected.add(ImmutablePair.of(1, 1)); - expected.add(ImmutablePair.of(1, 2)); - - Iterator, String>> it = map.entrySet().iterator(); - for(ImmutablePair item : expected) { - Entry, String> entry = it.next(); - assertEquals(item, entry.getKey()); - assertEquals(item.getLeft() + "" + item.getRight(), entry.getValue()); - } + TreeMap, String> map = new TreeMap<>(); + map.put(ImmutablePair.of(1, 2), "12"); + map.put(ImmutablePair.of(1, 1), "11"); + map.put(ImmutablePair.of(0, 1), "01"); + ArrayList> expected = new ArrayList<>(); + expected.add(ImmutablePair.of(0, 1)); + expected.add(ImmutablePair.of(1, 1)); + expected.add(ImmutablePair.of(1, 2)); + Iterator, String>> it = map.entrySet().iterator(); + for(ImmutablePair item : expected) { + Entry, String> entry = it.next(); + assertEquals(item, entry.getKey()); + assertEquals(item.getLeft() + "" + item.getRight(), entry.getValue()); + } } } From 14f09339452883d0ceb70e8b1b2c82fe80660fe6 Mon Sep 17 00:00:00 2001 From: Apirom Na Nakorn Date: Tue, 30 Oct 2018 22:42:41 +0700 Subject: [PATCH 3/5] Remove unused space --- .../java/org/apache/commons/lang3/tuple/ImmutablePairTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java index 1b73d305afd..29cfeb8d3a2 100644 --- a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java +++ b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java @@ -168,7 +168,7 @@ public void testUseAsKeyOfTreeMap() { for(ImmutablePair item : expected) { Entry, String> entry = it.next(); assertEquals(item, entry.getKey()); - assertEquals(item.getLeft() + "" + item.getRight(), entry.getValue()); + assertEquals(item.getLeft() + "" + item.getRight(), entry.getValue()); } } } From ae30de532507099132911e3952ad8e2568d3b219 Mon Sep 17 00:00:00 2001 From: Apirom Na Nakorn Date: Tue, 30 Oct 2018 22:53:53 +0700 Subject: [PATCH 4/5] add test use ImmutableTriple class with java.util.HashMap and java.util.TreeMap --- .../lang3/tuple/ImmutableTripleTest.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java b/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java index 8f76000bdd1..fe73930bb0c 100644 --- a/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java +++ b/src/test/java/org/apache/commons/lang3/tuple/ImmutableTripleTest.java @@ -26,6 +26,11 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.TreeMap; +import java.util.Map.Entry; import org.junit.jupiter.api.Test; @@ -142,5 +147,36 @@ public void testSerialization() throws Exception { assertEquals(origTriple, deserializedTriple); assertEquals(origTriple.hashCode(), deserializedTriple.hashCode()); } + + @Test + public void testUseAsKeyOfHashMap() { + HashMap, String> map = new HashMap<>(); + Object o1 = new Object(); + Object o2 = new Object(); + Object o3 = new Object(); + ImmutableTriple key1 = ImmutableTriple.of(o1, o2, o3); + String value1 = "a1"; + map.put(key1, value1); + assertEquals(value1, map.get(key1)); + assertEquals(value1, map.get(ImmutableTriple.of(o1, o2, o3))); + } + + @Test + public void testUseAsKeyOfTreeMap() { + TreeMap, String> map = new TreeMap<>(); + map.put(ImmutableTriple.of(0, 1, 2), "012"); + map.put(ImmutableTriple.of(0, 1, 1), "011"); + map.put(ImmutableTriple.of(0, 0, 1), "001"); + ArrayList> expected = new ArrayList<>(); + expected.add(ImmutableTriple.of(0, 0, 1)); + expected.add(ImmutableTriple.of(0, 1, 1)); + expected.add(ImmutableTriple.of(0, 1, 2)); + Iterator, String>> it = map.entrySet().iterator(); + for(ImmutableTriple item : expected) { + Entry, String> entry = it.next(); + assertEquals(item, entry.getKey()); + assertEquals(item.getLeft() + "" + item.getMiddle() + "" + item.getRight(), entry.getValue()); + } + } } From 29937f04c6de046ca3456305cdaece81a913b73b Mon Sep 17 00:00:00 2001 From: Apirom Na Nakorn Date: Tue, 30 Oct 2018 22:56:06 +0700 Subject: [PATCH 5/5] Remove unused space --- .../org/apache/commons/lang3/tuple/ImmutablePairTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java index 29cfeb8d3a2..a5b0d9d2020 100644 --- a/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java +++ b/src/test/java/org/apache/commons/lang3/tuple/ImmutablePairTest.java @@ -141,7 +141,7 @@ public void testSerialization() throws Exception { assertEquals(origPair, deserializedPair); assertEquals(origPair.hashCode(), deserializedPair.hashCode()); } - + @Test public void testUseAsKeyOfHashMap() { HashMap, String> map = new HashMap<>(); @@ -153,7 +153,7 @@ public void testUseAsKeyOfHashMap() { assertEquals(value1, map.get(key1)); assertEquals(value1, map.get(ImmutablePair.of(o1, o2))); } - + @Test public void testUseAsKeyOfTreeMap() { TreeMap, String> map = new TreeMap<>();