refactor 524

fishercoder1534 · fishercoder1534 · commit fd703c78fe52 · 2019-06-09T07:55:26.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_524.java b/src/main/java/com/fishercoder/solutions/_524.java
@@ -32,20 +32,22 @@
  */
 public class _524 {
 
-    public String findLongestWord(String s, List<String> d) {
-        Collections.sort(d, (a, b) -> a.length() == b.length() ? a.compareTo(b) : b.length() - a.length());
-        for (String dictWord : d) {
-            int i = 0;
-            for (char c : s.toCharArray()) {
-                if (i < dictWord.length() && dictWord.charAt(i) == c) {
-                    i++;
+    public static class Solution1 {
+        public String findLongestWord(String s, List<String> d) {
+            Collections.sort(d, (a, b) -> a.length() == b.length() ? a.compareTo(b) : b.length() - a.length());
+            for (String dictWord : d) {
+                int i = 0;
+                for (char c : s.toCharArray()) {
+                    if (i < dictWord.length() && dictWord.charAt(i) == c) {
+                        i++;
+                    }
+                }
+                if (i == dictWord.length()) {
+                    return dictWord;
                 }
             }
-            if (i == dictWord.length()) {
-                return dictWord;
-            }
+            return "";
         }
-        return "";
     }
 
 }
diff --git a/src/test/java/com/fishercoder/_524Test.java b/src/test/java/com/fishercoder/_524Test.java
@@ -13,23 +13,23 @@
  * Created by fishercoder on 4/30/17.
  */
 public class _524Test {
-    private static _524 test;
+    private static _524.Solution1 solution1;
     private static String expected;
     private static String actual;
     private static String s;
     private static ArrayList d;
 
     @BeforeClass
     public static void setup() {
-        test = new _524();
+        solution1 = new _524.Solution1();
     }
 
     @Test
     public void test1() {
         d = new ArrayList(Arrays.asList("ale", "apple", "monkey", "plea"));
         s = "abpcplea";
         expected = "apple";
-        actual = test.findLongestWord(expected, d);
+        actual = solution1.findLongestWord(expected, d);
         assertEquals(expected, actual);
     }
 
@@ -38,7 +38,7 @@ public void test2() {
         d = new ArrayList(Arrays.asList("a", "b", "c"));
         s = "abpcplea";
         expected = "a";
-        actual = test.findLongestWord(expected, d);
+        actual = solution1.findLongestWord(expected, d);
         assertEquals(expected, actual);
     }
 
@@ -47,7 +47,7 @@ public void test3() {
         d = new ArrayList(Arrays.asList("apple", "ewaf", "awefawfwaf", "awef", "awefe", "ewafeffewafewf"));
         s = "aewfafwafjlwajflwajflwafj";
         expected = "ewaf";
-        actual = test.findLongestWord(expected, d);
+        actual = solution1.findLongestWord(expected, d);
         assertEquals(expected, actual);
     }
 }
