WordSearch: reduce code duplication, add 1 test

Adjust timeout for AddMultithreadingTest

Author: andrei-punko

src/main/java/by/andd3dfx/search/WordSearch.java

@@ -40,7 +40,7 @@ public boolean exist(char[][] board, String word) {
 
         for (int i = 0; i < m; i++) {
             for (int j = 0; j < n; j++) {
-                if (word.charAt(0) == board[i][j]) {
+                if (checkIsCharacterSuitable(board, i, j, word, 0)) {
                     boolean[][] visited = new boolean[m][n];
                     visited[i][j] = true;
 
@@ -58,50 +58,38 @@ private boolean findNextCharacter(char[][] board, int i, int j, String word, int
             return true;
         }
 
-        var m = board.length;
-        var n = board[0].length;
+        if (checkNewPos(board, i - 1, j, word, pos, visited)) {
+            return true;
+        }
+        if (checkNewPos(board, i, j - 1, word, pos, visited)) {
+            return true;
+        }
+        if (checkNewPos(board, i + 1, j, word, pos, visited)) {
+            return true;
+        }
+        if (checkNewPos(board, i, j + 1, word, pos, visited)) {
+            return true;
+        }
 
-        if (i > 0 && !visited[i - 1][j]) {
-            if (checkIsCharacterSuitable(board, i - 1, j, word, pos)) {
-                visited[i - 1][j] = true;
-                if (findNextCharacter(board, i - 1, j, word, pos + 1, visited)) {
-                    return true;
-                }
+        return false;
+    }
 
-                visited[i - 1][j] = false;
-            }
-        }
-        if (j > 0 && !visited[i][j - 1]) {
-            if (checkIsCharacterSuitable(board, i, j - 1, word, pos)) {
-                visited[i][j - 1] = true;
-                if (findNextCharacter(board, i, j - 1, word, pos + 1, visited)) {
-                    return true;
-                }
+    private boolean checkNewPos(char[][] board, int i, int j, String word, int pos, boolean[][] visited) {
+        var m = board.length;
+        var n = board[0].length;
 
-                visited[i][j - 1] = false;
-            }
+        if (i < 0 || j < 0 || i >= m || j >= n) {
+            return false;
         }
-        if (i < m - 1 && !visited[i + 1][j]) {
-            if (checkIsCharacterSuitable(board, i + 1, j, word, pos)) {
-                visited[i + 1][j] = true;
-                if (findNextCharacter(board, i + 1, j, word, pos + 1, visited)) {
-                    return true;
-                }
 
-                visited[i + 1][j] = false;
+        if (!visited[i][j] && checkIsCharacterSuitable(board, i, j, word, pos)) {
+            visited[i][j] = true;
+            if (findNextCharacter(board, i, j, word, pos + 1, visited)) {
+                return true;
             }
-        }
-        if (j < n - 1 && !visited[i][j + 1]) {
-            if (checkIsCharacterSuitable(board, i, j + 1, word, pos)) {
-                visited[i][j + 1] = true;
-                if (findNextCharacter(board, i, j + 1, word, pos + 1, visited)) {
-                    return true;
-                }
 
-                visited[i][j + 1] = false;
-            }
+            visited[i][j] = false;
         }
-
         return false;
     }
 

src/test/java/by/andd3dfx/multithreading/AddMultithreadingTest.java

@@ -37,7 +37,7 @@ public void checkMultithreadingPresence() throws ExecutionException, Interrupted
 
         var future = CompletableFuture.supplyAsync(() -> aggregator.doRequest());
 
-        await().atMost(1_100, TimeUnit.MILLISECONDS)
+        await().atMost(1_200, TimeUnit.MILLISECONDS)
                 .until(() -> future.isDone());
         assertThat(future.get()).isEqualTo("OneTwo");
     }

src/test/java/by/andd3dfx/search/WordSearchTest.java

@@ -89,4 +89,16 @@ public void exist_checkConnectivity() {
 
         assertFalse(wordSearch.exist(board, word));
     }
+
+    @Test
+    public void exist_allCharsUsed() {
+        char[][] board = new char[][]{
+                {'A', 'B', 'C', 'E'},
+                {'S', 'F', 'C', 'S'},
+                {'A', 'D', 'E', 'E'}
+        };
+        var word = "ASABFDECCESE";
+
+        assertTrue(wordSearch.exist(board, word));
+    }
 }