@@ -12,23 +12,15 @@ public class CrosswordSolverTest {
12
12
13
13
@ Test
14
14
public void testValidPlacement () {
15
- char [][] puzzle = {
16
- { ' ' , ' ' , ' ' },
17
- { ' ' , ' ' , ' ' },
18
- { ' ' , ' ' , ' ' }
19
- };
15
+ char [][] puzzle = {{' ' , ' ' , ' ' }, {' ' , ' ' , ' ' }, {' ' , ' ' , ' ' }};
20
16
assertTrue (CrosswordSolver .isValid (puzzle , "cat" , 0 , 0 , true ));
21
17
assertTrue (CrosswordSolver .isValid (puzzle , "dog" , 0 , 0 , false ));
22
18
assertFalse (CrosswordSolver .isValid (puzzle , "cat" , 1 , 2 , false ));
23
19
}
24
20
25
21
@ Test
26
22
public void testPlaceAndRemoveWord () {
27
- char [][] puzzle = {
28
- { ' ' , ' ' , ' ' },
29
- { ' ' , ' ' , ' ' },
30
- { ' ' , ' ' , ' ' }
31
- };
23
+ char [][] puzzle = {{' ' , ' ' , ' ' }, {' ' , ' ' , ' ' }, {' ' , ' ' , ' ' }};
32
24
CrosswordSolver .placeWord (puzzle , "cat" , 0 , 0 , true );
33
25
assertEquals ('c' , puzzle [0 ][0 ]);
34
26
assertEquals ('a' , puzzle [1 ][0 ]);
@@ -42,11 +34,7 @@ public void testPlaceAndRemoveWord() {
42
34
43
35
@ Test
44
36
public void testSolveCrossword () {
45
- char [][] puzzle = {
46
- { ' ' , ' ' , ' ' },
47
- { ' ' , ' ' , ' ' },
48
- { ' ' , ' ' , ' ' }
49
- };
37
+ char [][] puzzle = {{' ' , ' ' , ' ' }, {' ' , ' ' , ' ' }, {' ' , ' ' , ' ' }};
50
38
List <String > words = Arrays .asList ("cat" , "dog" , "car" );
51
39
assertTrue (CrosswordSolver .solveCrossword (puzzle , words ));
52
40
@@ -71,11 +59,7 @@ public void testSolveCrossword() {
71
59
72
60
@ Test
73
61
public void testNoSolution () {
74
- char [][] puzzle = {
75
- { ' ' , ' ' , ' ' },
76
- { ' ' , ' ' , ' ' },
77
- { ' ' , ' ' , ' ' }
78
- };
62
+ char [][] puzzle = {{' ' , ' ' , ' ' }, {' ' , ' ' , ' ' }, {' ' , ' ' , ' ' }};
79
63
List <String > words = Arrays .asList ("cat" , "dog" , "elephant" ); // 'elephant' is too long for the grid
80
64
assertFalse (CrosswordSolver .solveCrossword (puzzle , words ));
81
65
}
0 commit comments