done

src/main/java/io/zipcoder/WC.java

@@ -20,33 +20,34 @@ public class WC {
         }
     }
 
-    public WC(Iterator<String> si) {
-        this.si = si;
-
-    }
-
-    public Iterator<String> getSi() {
-
-        return si;
-    }
-
-
-    private HashMap<String, Integer> readFile() {
+//    public WC(Iterator<String> si) {
+//        this.si = si;
+//
+//    }
+//
+//    public Iterator<String> getSi() {
+//
+//        return si;
+//    }
+
+
+    public HashMap<String, Integer> readFile() {
         HashMap<String, Integer> wordCount = new HashMap<String, Integer>();
 
-        while(getSi().hasNext()) {
-            if(wordCount.containsKey(si.next())) {
-                int value = wordCount.get(si.next());
+        while(si.hasNext()) {
+            String key = si.next().toLowerCase();
+            if(wordCount.containsKey(key)) {
+                int value = wordCount.get(key);
                 value++;
-                wordCount.put(si.next(), value);
+                wordCount.put(key, value);
             } else {
-                wordCount.put(si.next(), 1);
+                wordCount.put(key, 1);
             }
         }
         return wordCount;
     }
 
-    public void printWordCount(HashMap<String, Integer> myMap) {
+    public static void printWordCount(HashMap<String, Integer> myMap) {
         for (String word: myMap.keySet()){
 
             String key = word;
@@ -57,11 +58,49 @@ public class WC {
         }
     }
 
+    public static LinkedHashMap<String, Integer> sortList(HashMap<String, Integer> myMap) {
+        List<String> mapKeys = new ArrayList<String>(myMap.keySet());
+        List<Integer> mapValues = new ArrayList<Integer>(myMap.values());
+        Collections.sort(mapValues);
+        Collections.sort(mapKeys);
+
+        LinkedHashMap<String, Integer> sortedMap = new LinkedHashMap<String, Integer>();
+        Iterator<Integer> valueIt = mapValues.iterator();
+        while (valueIt.hasNext()) {
+            Integer val = valueIt.next();
+            Iterator<String> keyIt = mapKeys.iterator();
+
+            while (keyIt.hasNext()) {
+                String key = keyIt.next();
+                Integer comp1 = myMap.get(key);
+                Integer comp2 = val;
+
+                if (comp1.equals(comp2)) {
+                    keyIt.remove();
+                    sortedMap.put(key, val);
+                    break;
+                }
+            }
+        }
+        return sortedMap;
+
+
+//        Map<String, Integer> sorted = myMap
+//                .entrySet()
+//                .stream()
+//                .sorted(comparingByValue())
+//                .collect(
+//                        toMap(e -> e.getKey(), e -> e.getValue(), (e1, e2) -> e2,
+//                                LinkedHashMap::new));
+
+    }
+
     public static void main(String[] args) {
-        String fileName = "./../../someTextFile.txt";
+        String fileName = "./../../LittleWomen.txt";
         String fullPath = WC.class.getResource(fileName).getFile();
         WC wc = new WC(fullPath);
-        wc.printWordCount(wc.readFile());
+        HashMap<String, Integer> result = wc.readFile();
+        printWordCount(sortList(result));
 
 
 

src/test/java/io/zipcoder/WCTest.java

@@ -5,20 +5,42 @@ import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 public class WCTest {
 
     @Test
     public void testCountTheWords() {
         //Given
-        WC test = new WC(WC.class.getResource("/someTextFile.txt").getFile());
-        System.out.println(test.getSi().next());
-
+        String fileName = "./../../someTextFile.txt";
+        String fullPath = WC.class.getResource(fileName).getFile();
+        WC wc = new WC(fullPath);
+        Integer expected = 3;
 
         //When
+        HashMap<String, Integer> result = wc.readFile();
+        Integer actual = result.get("cow");
 
         //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testSortedList() {
+        //Given
+        String fileName = "./../../someTextFile.txt";
+        String fullPath = WC.class.getResource(fileName).getFile();
+        WC wc = new WC(fullPath);
+        Integer expected = 3;
+
+        //When
+        HashMap<String, Integer> result = wc.readFile();
+        LinkedHashMap<String, Integer> sort = WC.sortList(result);
+        Integer actual = result.get("cow");
 
+        //Then
+        Assert.assertEquals(expected, actual);
     }
 
 }