refactor 422

fishercoder1534 · fishercoder1534 · commit c4372e01ba93 · 2019-03-24T07:35:13.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_422.java b/src/main/java/com/fishercoder/solutions/_422.java
@@ -3,6 +3,8 @@
 import java.util.List;
 
 /**
+ * 422. Valid Word Square
+ *
  * Given a sequence of words, check whether it forms a valid word square.
 
  A sequence of words forms a valid word square if the kth row and column read the exact same string, where 0 ≤ k < max(numRows, numColumns).
@@ -71,22 +73,23 @@
  */
 public class _422 {
 
-    public boolean validWordSquare(List<String> words) {
-        for (int i = 0; i < words.size(); i++) {
-            String word = words.get(i);
-            for (int j = 0; j < word.length(); j++) {
-                if (j >= words.size()) {
-                    return false;
-                }
-                if (i >= words.get(j).length()) {
-                    return false;
-                }
-                if (word.charAt(j) != words.get(j).charAt(i)) {
-                    return false;
+    public static class Solution1 {
+        public boolean validWordSquare(List<String> words) {
+            for (int i = 0; i < words.size(); i++) {
+                String word = words.get(i);
+                for (int j = 0; j < word.length(); j++) {
+                    if (j >= words.size()) {
+                        return false;
+                    }
+                    if (i >= words.get(j).length()) {
+                        return false;
+                    }
+                    if (word.charAt(j) != words.get(j).charAt(i)) {
+                        return false;
+                    }
                 }
             }
+            return true;
         }
-        return true;
     }
-
 }
diff --git a/src/test/java/com/fishercoder/_422Test.java b/src/test/java/com/fishercoder/_422Test.java
@@ -12,49 +12,41 @@
 import static junit.framework.Assert.assertEquals;
 
 public class _422Test {
-    private static _422 test;
-    private static boolean expected;
-    private static boolean actual;
-    private static List<String> words;
-
-    @BeforeClass
-    public static void setup() {
-        test = new _422();
-    }
-
-    @Before
-    public void setupForEachTest() {
-    }
-
-    @Test
-    public void test1() {
-        words = new ArrayList<>(Arrays.asList("abcd", "bnrt", "crmy", "dtye"));
-        expected = true;
-        actual = test.validWordSquare(words);
-        assertEquals(expected, actual);
-    }
-
-    @Test
-    public void test2() {
-//        abcd
-//        bnrt
-//        crm
-//        dt
-        words = new ArrayList<>(Arrays.asList("abcd", "bnrt", "crm", "dt"));
-        expected = true;
-        actual = test.validWordSquare(words);
-        assertEquals(expected, actual);
-    }
-
-    @Test
-    public void test3() {
-        //ball
-        //asee
-        //let
-        //lep
-        words = new ArrayList<>(Arrays.asList("ball", "asee", "let", "lep"));
-        expected = false;
-        actual = test.validWordSquare(words);
-        assertEquals(expected, actual);
-    }
+  private static _422.Solution1 test;
+  private static boolean expected;
+  private static boolean actual;
+  private static List<String> words;
+
+  @BeforeClass
+  public static void setup() {
+    test = new _422.Solution1();
+  }
+
+  @Before
+  public void setupForEachTest() {
+  }
+
+  @Test
+  public void test1() {
+    words = new ArrayList<>(Arrays.asList("abcd", "bnrt", "crmy", "dtye"));
+    expected = true;
+    actual = test.validWordSquare(words);
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  public void test2() {
+    words = new ArrayList<>(Arrays.asList("abcd", "bnrt", "crm", "dt"));
+    expected = true;
+    actual = test.validWordSquare(words);
+    assertEquals(expected, actual);
+  }
+
+  @Test
+  public void test3() {
+    words = new ArrayList<>(Arrays.asList("ball", "asee", "let", "lep"));
+    expected = false;
+    actual = test.validWordSquare(words);
+    assertEquals(expected, actual);
+  }
 }
