refactor 28

fishercoder1534 · fishercoder1534 · commit 00e9f44c1dfc · 2017-12-20T08:20:43.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_28.java b/src/main/java/com/fishercoder/solutions/_28.java
@@ -1,33 +1,26 @@
 package com.fishercoder.solutions;
-/**Implement strStr().
-
- Returns the index of the first occurrence of needle in haystack, or -1 if needle is not part of haystack.
-
+/**
+ * 28. Implement strStr()
+ *
+ * Implement strStr().
+ *
+ * Returns the index of the first occurrence of needle in haystack, or -1 if needle is not part of haystack.
  */
 public class _28 {
-/**You could use substring as follows, or use two pointers to go through the haystack, if substring API call is not allowed.*/
-public static int strStr(String haystack, String needle) {
-    if (haystack == null || needle == null || haystack.length() < needle.length()) {
+
+  public static class Solution1 {
+    public int strStr(String haystack, String needle) {
+      if (haystack == null || needle == null || haystack.length() < needle.length()) {
         return -1;
-    }
+      }
 
-    for (int i = 0; i <= haystack.length() - needle.length(); i++) {
+      for (int i = 0; i <= haystack.length() - needle.length(); i++) {
         if (haystack.substring(i, i + needle.length()).equals(needle)) {
-            return i;
+          return i;
         }
+      }
+      return -1;
     }
-    return -1;
-}
-
-    public static void main(String... args) {
-//        String haystack = "a";
-//        String needle = "";
+  }
 
-//        String haystack = "mississippi";
-//        String needle = "a";
-
-        String haystack = "a";
-        String needle = "a";
-        strStr(haystack, needle);
-    }
 }
diff --git a/src/test/java/com/fishercoder/_28Test.java b/src/test/java/com/fishercoder/_28Test.java
@@ -0,0 +1,31 @@
+package com.fishercoder;
+
+import com.fishercoder.solutions._28;
+import org.junit.Before;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class _28Test {
+  private static _28.Solution1 solution1;
+
+  @Before
+  public void setupForEachTest() {
+    solution1 = new _28.Solution1();
+  }
+
+  @Test
+  public void test1() {
+    assertEquals(0, solution1.strStr("a", ""));
+  }
+
+  @Test
+  public void test2() {
+    assertEquals(-1, solution1.strStr("mississippi", "a"));
+  }
+
+  @Test
+  public void test3() {
+    assertEquals(0, solution1.strStr("a", "a"));
+  }
+}
