From c678742f7913e2ec5d968f2d8411d5681e220b38 Mon Sep 17 00:00:00 2001 From: Eric Willigers Date: Sat, 4 Apr 2026 22:17:46 +1100 Subject: [PATCH] tidy flower-field rectangles tests [no important files changed] --- .../flower-field/.meta/spec_generator.lua | 2 +- .../flower-field/flower-field_spec.lua | 100 +++++++++--------- .../rectangles/.meta/spec_generator.lua | 2 +- .../practice/rectangles/rectangles_spec.lua | 78 +++++++------- 4 files changed, 91 insertions(+), 91 deletions(-) diff --git a/exercises/practice/flower-field/.meta/spec_generator.lua b/exercises/practice/flower-field/.meta/spec_generator.lua index c05659d5..ba087f75 100644 --- a/exercises/practice/flower-field/.meta/spec_generator.lua +++ b/exercises/practice/flower-field/.meta/spec_generator.lua @@ -9,7 +9,7 @@ end local function render_garden(garden) return table.concat(map(garden, function(row) return "'" .. row .. "', --" - end), ',\n ') + end), '\n ') end return { diff --git a/exercises/practice/flower-field/flower-field_spec.lua b/exercises/practice/flower-field/flower-field_spec.lua index c0a53314..1f291907 100644 --- a/exercises/practice/flower-field/flower-field_spec.lua +++ b/exercises/practice/flower-field/flower-field_spec.lua @@ -19,13 +19,13 @@ describe('flower-field', function() it('no flowers', function() local garden = { - ' ', -- , - ' ', -- , + ' ', -- + ' ', -- ' ' -- } local expected = { - ' ', -- , - ' ', -- , + ' ', -- + ' ', -- ' ' -- } assert.same(expected, flower_field.annotate(garden)) @@ -33,13 +33,13 @@ describe('flower-field', function() it('garden full of flowers', function() local garden = { - '***', -- , - '***', -- , + '***', -- + '***', -- '***' -- } local expected = { - '***', -- , - '***', -- , + '***', -- + '***', -- '***' -- } assert.same(expected, flower_field.annotate(garden)) @@ -47,13 +47,13 @@ describe('flower-field', function() it('flower surrounded by spaces', function() local garden = { - ' ', -- , - ' * ', -- , + ' ', -- + ' * ', -- ' ' -- } local expected = { - '111', -- , - '1*1', -- , + '111', -- + '1*1', -- '111' -- } assert.same(expected, flower_field.annotate(garden)) @@ -61,13 +61,13 @@ describe('flower-field', function() it('space surrounded by flowers', function() local garden = { - '***', -- , - '* *', -- , + '***', -- + '* *', -- '***' -- } local expected = { - '***', -- , - '*8*', -- , + '***', -- + '*8*', -- '***' -- } assert.same(expected, flower_field.annotate(garden)) @@ -95,17 +95,17 @@ describe('flower-field', function() it('vertical line', function() local garden = { - ' ', -- , - '*', -- , - ' ', -- , - '*', -- , + ' ', -- + '*', -- + ' ', -- + '*', -- ' ' -- } local expected = { - '1', -- , - '*', -- , - '2', -- , - '*', -- , + '1', -- + '*', -- + '2', -- + '*', -- '1' -- } assert.same(expected, flower_field.annotate(garden)) @@ -113,17 +113,17 @@ describe('flower-field', function() it('vertical line, flowers at edges', function() local garden = { - '*', -- , - ' ', -- , - ' ', -- , - ' ', -- , + '*', -- + ' ', -- + ' ', -- + ' ', -- '*' -- } local expected = { - '*', -- , - '1', -- , - ' ', -- , - '1', -- , + '*', -- + '1', -- + ' ', -- + '1', -- '*' -- } assert.same(expected, flower_field.annotate(garden)) @@ -131,17 +131,17 @@ describe('flower-field', function() it('cross', function() local garden = { - ' * ', -- , - ' * ', -- , - '*****', -- , - ' * ', -- , + ' * ', -- + ' * ', -- + '*****', -- + ' * ', -- ' * ' -- } local expected = { - ' 2*2 ', -- , - '25*52', -- , - '*****', -- , - '25*52', -- , + ' 2*2 ', -- + '25*52', -- + '*****', -- + '25*52', -- ' 2*2 ' -- } assert.same(expected, flower_field.annotate(garden)) @@ -149,19 +149,19 @@ describe('flower-field', function() it('large garden', function() local garden = { - ' * * ', -- , - ' * ', -- , - ' * ', -- , - ' * *', -- , - ' * * ', -- , + ' * * ', -- + ' * ', -- + ' * ', -- + ' * *', -- + ' * * ', -- ' ' -- } local expected = { - '1*22*1', -- , - '12*322', -- , - ' 123*2', -- , - '112*4*', -- , - '1*22*2', -- , + '1*22*1', -- + '12*322', -- + ' 123*2', -- + '112*4*', -- + '1*22*2', -- '111111' -- } assert.same(expected, flower_field.annotate(garden)) diff --git a/exercises/practice/rectangles/.meta/spec_generator.lua b/exercises/practice/rectangles/.meta/spec_generator.lua index a55a4def..dea9b98a 100644 --- a/exercises/practice/rectangles/.meta/spec_generator.lua +++ b/exercises/practice/rectangles/.meta/spec_generator.lua @@ -9,7 +9,7 @@ end local function render_strings(strings) return table.concat(map(strings, function(row) return "'" .. row .. "', --" - end), ',\n ') + end), '\n ') end return { diff --git a/exercises/practice/rectangles/rectangles_spec.lua b/exercises/practice/rectangles/rectangles_spec.lua index 5fb854fb..4a8c7dbe 100644 --- a/exercises/practice/rectangles/rectangles_spec.lua +++ b/exercises/practice/rectangles/rectangles_spec.lua @@ -19,105 +19,105 @@ describe('rectangles', function() it('one rectangle', function() assert.equal(1, rectangles.count({ - '+-+', -- , - '| |', -- , + '+-+', -- + '| |', -- '+-+' -- })) end) it('two rectangles without shared parts', function() assert.equal(2, rectangles.count({ - ' +-+', -- , - ' | |', -- , - '+-+-+', -- , - '| | ', -- , + ' +-+', -- + ' | |', -- + '+-+-+', -- + '| | ', -- '+-+ ' -- })) end) it('five rectangles with shared parts', function() assert.equal(5, rectangles.count({ - ' +-+', -- , - ' | |', -- , - '+-+-+', -- , - '| | |', -- , + ' +-+', -- + ' | |', -- + '+-+-+', -- + '| | |', -- '+-+-+' -- })) end) it('rectangle of height 1 is counted', function() assert.equal(1, rectangles.count({ - '+--+', -- , + '+--+', -- '+--+' -- })) end) it('rectangle of width 1 is counted', function() assert.equal(1, rectangles.count({ - '++', -- , - '||', -- , + '++', -- + '||', -- '++' -- })) end) it('1x1 square is counted', function() assert.equal(1, rectangles.count({ - '++', -- , + '++', -- '++' -- })) end) it('only complete rectangles are counted', function() assert.equal(1, rectangles.count({ - ' +-+', -- , - ' |', -- , - '+-+-+', -- , - '| | -', -- , + ' +-+', -- + ' |', -- + '+-+-+', -- + '| | -', -- '+-+-+' -- })) end) it('rectangles can be of different sizes', function() assert.equal(3, rectangles.count({ - '+------+----+', -- , - '| | |', -- , - '+---+--+ |', -- , - '| | |', -- , + '+------+----+', -- + '| | |', -- + '+---+--+ |', -- + '| | |', -- '+---+-------+' -- })) end) it('corner is required for a rectangle to be complete', function() assert.equal(2, rectangles.count({ - '+------+----+', -- , - '| | |', -- , - '+------+ |', -- , - '| | |', -- , + '+------+----+', -- + '| | |', -- + '+------+ |', -- + '| | |', -- '+---+-------+' -- })) end) it('large input with many rectangles', function() assert.equal(60, rectangles.count({ - '+---+--+----+', -- , - '| +--+----+', -- , - '+---+--+ |', -- , - '| +--+----+', -- , - '+---+--+--+-+', -- , - '+---+--+--+-+', -- , - '+------+ | |', -- , + '+---+--+----+', -- + '| +--+----+', -- + '+---+--+ |', -- + '| +--+----+', -- + '+---+--+--+-+', -- + '+---+--+--+-+', -- + '+------+ | |', -- ' +-+' -- })) end) it('rectangles must have four sides', function() assert.equal(5, rectangles.count({ - '+-+ +-+', -- , - '| | | |', -- , - '+-+-+-+', -- , - ' | | ', -- , - '+-+-+-+', -- , - '| | | |', -- , + '+-+ +-+', -- + '| | | |', -- + '+-+-+-+', -- + ' | | ', -- + '+-+-+-+', -- + '| | | |', -- '+-+ +-+' -- })) end)