Skip to content

Commit 307cffb

Browse files
committed
minesweeper: revert changes to testfile that put input and expected results on single lines.
1 parent 4ca3791 commit 307cffb

File tree

1 file changed

+79
-20
lines changed

1 file changed

+79
-20
lines changed

exercises/minesweeper/minesweeper_test.py

Lines changed: 79 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,39 @@ def test_no_columns(self):
2222
self.assertEqual(annotate([""]), [""])
2323

2424
def test_no_mines(self):
25-
minefield = [" ", " ", " "]
26-
out = [" ", " ", " "]
25+
minefield = [" ",
26+
" ",
27+
" "]
28+
out = [" ",
29+
" ",
30+
" "]
2731
self.assertEqual(annotate(minefield), out)
2832

2933
def test_annotate_with_only_mines(self):
30-
minefield = ["***", "***", "***"]
31-
out = ["***", "***", "***"]
34+
minefield = ["***",
35+
"***",
36+
"***"]
37+
out = ["***",
38+
"***",
39+
"***"]
3240
self.assertEqual(annotate(minefield), out)
3341

3442
def test_mine_surrounded_by_spaces(self):
35-
minefield = [" ", " * ", " "]
36-
out = ["111", "1*1", "111"]
43+
minefield = [" ",
44+
" * ",
45+
" "]
46+
out = ["111",
47+
"1*1",
48+
"111"]
3749
self.assertEqual(annotate(minefield), out)
3850

3951
def test_space_surrounded_by_mines(self):
40-
minefield = ["***", "* *", "***"]
41-
out = ["***", "*8*", "***"]
52+
minefield = ["***",
53+
"* *",
54+
"***"]
55+
out = ["***",
56+
"*8*",
57+
"***"]
4258
self.assertEqual(annotate(minefield), out)
4359

4460
def test_horizontal_line(self):
@@ -52,34 +68,77 @@ def test_horizontal_line_mines_at_edges(self):
5268
self.assertEqual(annotate(minefield), out)
5369

5470
def test_vertical_line(self):
55-
minefield = [" ", "*", " ", "*", " "]
56-
out = ["1", "*", "2", "*", "1"]
71+
minefield = [" ",
72+
"*",
73+
" ",
74+
"*",
75+
" "]
76+
out = ["1",
77+
"*",
78+
"2",
79+
"*",
80+
"1"]
5781
self.assertEqual(annotate(minefield), out)
5882

5983
def test_vertical_line_mines_at_edges(self):
60-
minefield = ["*", " ", " ", " ", "*"]
61-
out = ["*", "1", " ", "1", "*"]
84+
minefield = ["*",
85+
" ",
86+
" ",
87+
" ",
88+
"*"]
89+
out = ["*",
90+
"1",
91+
" ",
92+
"1",
93+
"*"]
6294
self.assertEqual(annotate(minefield), out)
6395

6496
def test_cross(self):
65-
minefield = [" * ", " * ", "*****", " * ", " * "]
66-
out = [" 2*2 ", "25*52", "*****", "25*52", " 2*2 "]
97+
minefield = [" * ",
98+
" * ",
99+
"*****",
100+
" * ",
101+
" * "]
102+
out = [" 2*2 ",
103+
"25*52",
104+
"*****",
105+
"25*52",
106+
" 2*2 "]
67107
self.assertEqual(annotate(minefield), out)
68108

69109
def test_large_annotate(self):
70-
minefield = [" * * ", " * ", " * ",
71-
" * *", " * * ", " "]
72-
out = ["1*22*1", "12*322", " 123*2", "112*4*", "1*22*2", "111111"]
110+
minefield = [" * * ",
111+
" * ",
112+
" * ",
113+
" * *",
114+
" * * ",
115+
" "]
116+
out = ["1*22*1",
117+
"12*322",
118+
" 123*2",
119+
"112*4*",
120+
"1*22*2",
121+
"111111"]
73122
self.assertEqual(annotate(minefield), out)
74123

75124
# Additional test for this track
76125
def test_annotate9(self):
77-
minefield = [" ", " * ", " ", " ", " * "]
78-
out = [" 111", " 1*1", " 111", "111 ", "1*1 "]
126+
minefield = [" ",
127+
" * ",
128+
" ",
129+
" ",
130+
" * "]
131+
out = [" 111",
132+
" 1*1",
133+
" 111",
134+
"111 ",
135+
"1*1 "]
79136
self.assertEqual(annotate(minefield), out)
80137

81138
def test_different_len(self):
82-
minefield = [" ", "* ", " "]
139+
minefield = [" ",
140+
"* ",
141+
" "]
83142
with self.assertRaisesWithMessage(ValueError):
84143
annotate(minefield)
85144

0 commit comments

Comments
 (0)