Skip to content

Commit f89673b

Browse files
keiravillekodekeiravillekode
authored
tidy flower-field rectangles tests (#642)
[no important files changed]
1 parent 3610a77 commit f89673b

4 files changed

Lines changed: 91 additions & 91 deletions

File tree

‎exercises/practice/flower-field/.meta/spec_generator.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ end
99
local function render_garden(garden)
1010
return table.concat(map(garden, function(row)
1111
return "'" .. row .. "', --"
12-
end), ',\n ')
12+
end), '\n ')
1313
end
1414

1515
return {

‎exercises/practice/flower-field/flower-field_spec.lua‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -19,55 +19,55 @@ describe('flower-field', function()
1919

2020
it('no flowers', function()
2121
local garden = {
22-
' ', -- ,
23-
' ', -- ,
22+
' ', --
23+
' ', --
2424
' ' --
2525
}
2626
local expected = {
27-
' ', -- ,
28-
' ', -- ,
27+
' ', --
28+
' ', --
2929
' ' --
3030
}
3131
assert.same(expected, flower_field.annotate(garden))
3232
end)
3333

3434
it('garden full of flowers', function()
3535
local garden = {
36-
'***', -- ,
37-
'***', -- ,
36+
'***', --
37+
'***', --
3838
'***' --
3939
}
4040
local expected = {
41-
'***', -- ,
42-
'***', -- ,
41+
'***', --
42+
'***', --
4343
'***' --
4444
}
4545
assert.same(expected, flower_field.annotate(garden))
4646
end)
4747

4848
it('flower surrounded by spaces', function()
4949
local garden = {
50-
' ', -- ,
51-
' * ', -- ,
50+
' ', --
51+
' * ', --
5252
' ' --
5353
}
5454
local expected = {
55-
'111', -- ,
56-
'1*1', -- ,
55+
'111', --
56+
'1*1', --
5757
'111' --
5858
}
5959
assert.same(expected, flower_field.annotate(garden))
6060
end)
6161

6262
it('space surrounded by flowers', function()
6363
local garden = {
64-
'***', -- ,
65-
'* *', -- ,
64+
'***', --
65+
'* *', --
6666
'***' --
6767
}
6868
local expected = {
69-
'***', -- ,
70-
'*8*', -- ,
69+
'***', --
70+
'*8*', --
7171
'***' --
7272
}
7373
assert.same(expected, flower_field.annotate(garden))
@@ -95,73 +95,73 @@ describe('flower-field', function()
9595

9696
it('vertical line', function()
9797
local garden = {
98-
' ', -- ,
99-
'*', -- ,
100-
' ', -- ,
101-
'*', -- ,
98+
' ', --
99+
'*', --
100+
' ', --
101+
'*', --
102102
' ' --
103103
}
104104
local expected = {
105-
'1', -- ,
106-
'*', -- ,
107-
'2', -- ,
108-
'*', -- ,
105+
'1', --
106+
'*', --
107+
'2', --
108+
'*', --
109109
'1' --
110110
}
111111
assert.same(expected, flower_field.annotate(garden))
112112
end)
113113

114114
it('vertical line, flowers at edges', function()
115115
local garden = {
116-
'*', -- ,
117-
' ', -- ,
118-
' ', -- ,
119-
' ', -- ,
116+
'*', --
117+
' ', --
118+
' ', --
119+
' ', --
120120
'*' --
121121
}
122122
local expected = {
123-
'*', -- ,
124-
'1', -- ,
125-
' ', -- ,
126-
'1', -- ,
123+
'*', --
124+
'1', --
125+
' ', --
126+
'1', --
127127
'*' --
128128
}
129129
assert.same(expected, flower_field.annotate(garden))
130130
end)
131131

132132
it('cross', function()
133133
local garden = {
134-
' * ', -- ,
135-
' * ', -- ,
136-
'*****', -- ,
137-
' * ', -- ,
134+
' * ', --
135+
' * ', --
136+
'*****', --
137+
' * ', --
138138
' * ' --
139139
}
140140
local expected = {
141-
' 2*2 ', -- ,
142-
'25*52', -- ,
143-
'*****', -- ,
144-
'25*52', -- ,
141+
' 2*2 ', --
142+
'25*52', --
143+
'*****', --
144+
'25*52', --
145145
' 2*2 ' --
146146
}
147147
assert.same(expected, flower_field.annotate(garden))
148148
end)
149149

150150
it('large garden', function()
151151
local garden = {
152-
' * * ', -- ,
153-
' * ', -- ,
154-
' * ', -- ,
155-
' * *', -- ,
156-
' * * ', -- ,
152+
' * * ', --
153+
' * ', --
154+
' * ', --
155+
' * *', --
156+
' * * ', --
157157
' ' --
158158
}
159159
local expected = {
160-
'1*22*1', -- ,
161-
'12*322', -- ,
162-
' 123*2', -- ,
163-
'112*4*', -- ,
164-
'1*22*2', -- ,
160+
'1*22*1', --
161+
'12*322', --
162+
' 123*2', --
163+
'112*4*', --
164+
'1*22*2', --
165165
'111111' --
166166
}
167167
assert.same(expected, flower_field.annotate(garden))

‎exercises/practice/rectangles/.meta/spec_generator.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ end
99
local function render_strings(strings)
1010
return table.concat(map(strings, function(row)
1111
return "'" .. row .. "', --"
12-
end), ',\n ')
12+
end), '\n ')
1313
end
1414

1515
return {

‎exercises/practice/rectangles/rectangles_spec.lua‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,105 +19,105 @@ describe('rectangles', function()
1919

2020
it('one rectangle', function()
2121
assert.equal(1, rectangles.count({
22-
'+-+', -- ,
23-
'| |', -- ,
22+
'+-+', --
23+
'| |', --
2424
'+-+' --
2525
}))
2626
end)
2727

2828
it('two rectangles without shared parts', function()
2929
assert.equal(2, rectangles.count({
30-
' +-+', -- ,
31-
' | |', -- ,
32-
'+-+-+', -- ,
33-
'| | ', -- ,
30+
' +-+', --
31+
' | |', --
32+
'+-+-+', --
33+
'| | ', --
3434
'+-+ ' --
3535
}))
3636
end)
3737

3838
it('five rectangles with shared parts', function()
3939
assert.equal(5, rectangles.count({
40-
' +-+', -- ,
41-
' | |', -- ,
42-
'+-+-+', -- ,
43-
'| | |', -- ,
40+
' +-+', --
41+
' | |', --
42+
'+-+-+', --
43+
'| | |', --
4444
'+-+-+' --
4545
}))
4646
end)
4747

4848
it('rectangle of height 1 is counted', function()
4949
assert.equal(1, rectangles.count({
50-
'+--+', -- ,
50+
'+--+', --
5151
'+--+' --
5252
}))
5353
end)
5454

5555
it('rectangle of width 1 is counted', function()
5656
assert.equal(1, rectangles.count({
57-
'++', -- ,
58-
'||', -- ,
57+
'++', --
58+
'||', --
5959
'++' --
6060
}))
6161
end)
6262

6363
it('1x1 square is counted', function()
6464
assert.equal(1, rectangles.count({
65-
'++', -- ,
65+
'++', --
6666
'++' --
6767
}))
6868
end)
6969

7070
it('only complete rectangles are counted', function()
7171
assert.equal(1, rectangles.count({
72-
' +-+', -- ,
73-
' |', -- ,
74-
'+-+-+', -- ,
75-
'| | -', -- ,
72+
' +-+', --
73+
' |', --
74+
'+-+-+', --
75+
'| | -', --
7676
'+-+-+' --
7777
}))
7878
end)
7979

8080
it('rectangles can be of different sizes', function()
8181
assert.equal(3, rectangles.count({
82-
'+------+----+', -- ,
83-
'| | |', -- ,
84-
'+---+--+ |', -- ,
85-
'| | |', -- ,
82+
'+------+----+', --
83+
'| | |', --
84+
'+---+--+ |', --
85+
'| | |', --
8686
'+---+-------+' --
8787
}))
8888
end)
8989

9090
it('corner is required for a rectangle to be complete', function()
9191
assert.equal(2, rectangles.count({
92-
'+------+----+', -- ,
93-
'| | |', -- ,
94-
'+------+ |', -- ,
95-
'| | |', -- ,
92+
'+------+----+', --
93+
'| | |', --
94+
'+------+ |', --
95+
'| | |', --
9696
'+---+-------+' --
9797
}))
9898
end)
9999

100100
it('large input with many rectangles', function()
101101
assert.equal(60, rectangles.count({
102-
'+---+--+----+', -- ,
103-
'| +--+----+', -- ,
104-
'+---+--+ |', -- ,
105-
'| +--+----+', -- ,
106-
'+---+--+--+-+', -- ,
107-
'+---+--+--+-+', -- ,
108-
'+------+ | |', -- ,
102+
'+---+--+----+', --
103+
'| +--+----+', --
104+
'+---+--+ |', --
105+
'| +--+----+', --
106+
'+---+--+--+-+', --
107+
'+---+--+--+-+', --
108+
'+------+ | |', --
109109
' +-+' --
110110
}))
111111
end)
112112

113113
it('rectangles must have four sides', function()
114114
assert.equal(5, rectangles.count({
115-
'+-+ +-+', -- ,
116-
'| | | |', -- ,
117-
'+-+-+-+', -- ,
118-
' | | ', -- ,
119-
'+-+-+-+', -- ,
120-
'| | | |', -- ,
115+
'+-+ +-+', --
116+
'| | | |', --
117+
'+-+-+-+', --
118+
' | | ', --
119+
'+-+-+-+', --
120+
'| | | |', --
121121
'+-+ +-+' --
122122
}))
123123
end)

0 commit comments

Comments
 (0)
⚡