From 75bc156357fa0110adc1de21dbb86653d3fa22c5 Mon Sep 17 00:00:00 2001
From: Tomasz Lelek <tomasz.lelek@allegrogroup.com>
Date: Sat, 14 Jan 2017 10:11:52 +0100
Subject: [PATCH] BAEL-586 proper file for test

---
 .../org/baeldung/guava/GuavaMultiMapTest.java | 63 +++++++++++++++++++
 .../org/baeldung/guava/GuavaStringTest.java   | 49 ---------------
 2 files changed, 63 insertions(+), 49 deletions(-)
 create mode 100644 guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java

diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java b/guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java
new file mode 100644
index 0000000000..5e80dd2f87
--- /dev/null
+++ b/guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java
@@ -0,0 +1,63 @@
+package org.baeldung.guava;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+import org.junit.Test;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+
+public class GuavaMultiMapTest {
+
+    @Test
+    public void givenMap_whenAddTwoValuesForSameKey_shouldOverridePreviousKey() {
+        //given
+        String key = "a-key";
+        Map<String, String> map = new LinkedHashMap<>();
+
+        //when
+        map.put(key, "firstValue");
+        map.put(key, "secondValue");
+
+        //then
+        assertEquals(1, map.size());
+    }
+
+    @Test
+    public void givenMultiMap_whenAddTwoValuesForSameKey_shouldHaveTwoEntriesInMap() {
+        //given
+        String key = "a-key";
+        Multimap<String, String> map = ArrayListMultimap.create();
+
+        //when
+        map.put(key, "firstValue");
+        map.put(key, "secondValue");
+
+        //then
+        assertEquals(2, map.size());
+    }
+
+    @Test
+    public void givenMapOfListValues_whenAddTwoValuesForSameKey_shouldHaveTwoElementsInList() {
+        //given
+        String key = "a-key";
+        Map<String, List<String>> map = new LinkedHashMap<>();
+
+        //when
+        List<String> values = map.get(key);
+        if(values == null){
+            values = new LinkedList<>();
+            values.add("firstValue");
+            values.add("secondValue");
+        }
+        map.put(key, values);
+
+        //then
+        assertEquals(1, map.size());
+    }
+}
\ No newline at end of file
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java b/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java
index 7cf986baaf..cedbe60d91 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java
+++ b/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java
@@ -211,53 +211,4 @@ public class GuavaStringTest {
         assertEquals("hello", result);
     }
 
-    public static class MultimapTest {
-
-        @Test
-        public void givenMap_whenAddTwoValuesForSameKey_shouldOverridePreviousKey() {
-            //given
-            String key = "a-key";
-            Map<String, String> map = new LinkedHashMap<>();
-
-            //when
-            map.put(key, "firstValue");
-            map.put(key, "secondValue");
-
-            //then
-            assertEquals(1, map.size());
-        }
-
-        @Test
-        public void givenMultiMap_whenAddTwoValuesForSameKey_shouldHaveTwoEntriesInMap() {
-            //given
-            String key = "a-key";
-            Multimap<String, String> map = ArrayListMultimap.create();
-
-            //when
-            map.put(key, "firstValue");
-            map.put(key, "secondValue");
-
-            //then
-            assertEquals(2, map.size());
-        }
-
-        @Test
-        public void givenMapOfListValues_whenAddTwoValuesForSameKey_shouldHaveTwoElementsInList() {
-            //given
-            String key = "a-key";
-            Map<String, List<String>> map = new LinkedHashMap<>();
-
-            //when
-            List<String> values = map.get(key);
-            if(values == null){
-                values = new LinkedList<>();
-                values.add("firstValue");
-                values.add("secondValue");
-            }
-            map.put(key, values);
-
-            //then
-            assertEquals(1, map.size());
-        }
-    }
 }