refactor 44

fishercoder1534 · fishercoder1534 · commit 766f49b54439 · 2017-12-31T17:58:35.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_44.java b/src/main/java/com/fishercoder/solutions/_44.java
@@ -23,29 +23,30 @@ bool isMatch(const char *s, const char *p)
  */
 public class _44 {
 
+  public static class Solution1 {
     public boolean isMatch(String s, String p) {
-        boolean[][] match = new boolean[s.length() + 1][p.length() + 1];
-        match[s.length()][p.length()] = true;
-        for (int i = p.length() - 1; i >= 0; i--) {
-            if (p.charAt(i) != '*') {
-                break;
-            } else {
-                match[s.length()][i] = true;
-            }
+      boolean[][] match = new boolean[s.length() + 1][p.length() + 1];
+      match[s.length()][p.length()] = true;
+      for (int i = p.length() - 1; i >= 0; i--) {
+        if (p.charAt(i) != '*') {
+          break;
+        } else {
+          match[s.length()][i] = true;
         }
-
-        for (int i = s.length() - 1; i >= 0; i--) {
-            for (int j = p.length() - 1; j >= 0; j--) {
-                if (s.charAt(i) == p.charAt(j) || p.charAt(j) == '?') {
-                    match[i][j] = match[i + 1][j + 1];
-                } else if (p.charAt(j) == '*') {
-                    match[i][j] = match[i + 1][j] || match[i][j + 1];
-                } else {
-                    match[i][j] = false;
-                }
-            }
+      }
+
+      for (int i = s.length() - 1; i >= 0; i--) {
+        for (int j = p.length() - 1; j >= 0; j--) {
+          if (s.charAt(i) == p.charAt(j) || p.charAt(j) == '?') {
+            match[i][j] = match[i + 1][j + 1];
+          } else if (p.charAt(j) == '*') {
+            match[i][j] = match[i + 1][j] || match[i][j + 1];
+          } else {
+            match[i][j] = false;
+          }
         }
-        return match[0][0];
+      }
+      return match[0][0];
     }
-
+  }
 }
diff --git a/src/test/java/com/fishercoder/_44Test.java b/src/test/java/com/fishercoder/_44Test.java
@@ -0,0 +1,51 @@
+package com.fishercoder;
+
+import com.fishercoder.solutions._44;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class _44Test {
+  private static _44.Solution1 solution1;
+
+  @BeforeClass
+  public static void setup() {
+    solution1 = new _44.Solution1();
+  }
+
+  @Test
+  public void test1() {
+    assertEquals(false, solution1.isMatch("aa", "a"));
+  }
+
+  @Test
+  public void test2() {
+    assertEquals(true, solution1.isMatch("aa", "aa"));
+  }
+
+  @Test
+  public void test3() {
+    assertEquals(false, solution1.isMatch("aaa", "aa"));
+  }
+
+  @Test
+  public void test4() {
+    assertEquals(true, solution1.isMatch("aa", "*"));
+  }
+
+  @Test
+  public void test5() {
+    assertEquals(true, solution1.isMatch("aa", "a*"));
+  }
+
+  @Test
+  public void test6() {
+    assertEquals(true, solution1.isMatch("ab", "?*"));
+  }
+
+  @Test
+  public void test7() {
+    assertEquals(false, solution1.isMatch("aab", "c*a*b"));
+  }
+}
