deduce test names on failures
This commit is contained in:
parent
a28e57205d
commit
2a0a770c49
15
app.lua
15
app.lua
|
@ -134,7 +134,11 @@ end
|
|||
|
||||
function App.run_tests_and_initialize()
|
||||
App.load()
|
||||
Test_errors = {}
|
||||
App.run_tests()
|
||||
if #Test_errors > 0 then
|
||||
error('There were test failures:\n\n'..table.concat(Test_errors))
|
||||
end
|
||||
App.disable_tests()
|
||||
App.initialize_globals()
|
||||
App.initialize(love.arg.parseGameArguments(arg), arg)
|
||||
|
@ -365,7 +369,7 @@ function App.run_tests()
|
|||
table.sort(sorted_names)
|
||||
for _,name in ipairs(sorted_names) do
|
||||
App.initialize_for_test()
|
||||
_G[name]()
|
||||
xpcall(_G[name], function(err) prepend_debug_info_to_test_failure(name, err) end)
|
||||
end
|
||||
print()
|
||||
-- clean up all test methods
|
||||
|
@ -374,6 +378,15 @@ function App.run_tests()
|
|||
end
|
||||
end
|
||||
|
||||
-- prepend file/line/test
|
||||
function prepend_debug_info_to_test_failure(test_name, err)
|
||||
local err_without_line_number = err:gsub('^[^:]*:[^:]*: ', '')
|
||||
local stack_trace = debug.traceback('', --[[stack frame]]5)
|
||||
local file_and_line_number = stack_trace:gsub('stack traceback:\n', ''):gsub(': .*', '')
|
||||
local full_error = file_and_line_number..':'..test_name..' -- '..err_without_line_number
|
||||
table.insert(Test_errors, full_error)
|
||||
end
|
||||
|
||||
-- call this once all tests are run
|
||||
-- can't run any tests after this
|
||||
function App.disable_tests()
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
-- of specific shapes. In particular, no tests of freehand drawings.
|
||||
|
||||
function test_creating_drawing_saves()
|
||||
io.write('\ntest_creating_drawing_saves')
|
||||
App.screen.init{width=120, height=60}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.filename = 'foo'
|
||||
|
@ -14,16 +13,15 @@ function test_creating_drawing_saves()
|
|||
edit.run_after_mouse_click(Editor_state, 8,Editor_state.top+8, 1)
|
||||
-- file not immediately saved
|
||||
edit.update(Editor_state, 0.01)
|
||||
check_nil(App.filesystem['foo'], 'F - test_creating_drawing_saves/early')
|
||||
check_nil(App.filesystem['foo'], 'early')
|
||||
-- wait until save
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
-- filesystem contains drawing and an empty line of text
|
||||
check_eq(App.filesystem['foo'], '```lines\n```\n\n', 'F - test_creating_drawing_saves')
|
||||
check_eq(App.filesystem['foo'], '```lines\n```\n\n', 'check')
|
||||
end
|
||||
|
||||
function test_draw_line()
|
||||
io.write('\ntest_draw_line')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -32,24 +30,24 @@ function test_draw_line()
|
|||
Text.redraw_all(Editor_state)
|
||||
Editor_state.current_drawing_mode = 'line'
|
||||
edit.draw(Editor_state)
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_line/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_line/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_line/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_line/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_line/baseline/#shapes')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- draw a line
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_line/#shapes')
|
||||
check_eq(#drawing.points, 2, 'F - test_draw_line/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_draw_line/shape:1')
|
||||
check_eq(#drawing.shapes, 1, '#shapes')
|
||||
check_eq(#drawing.points, 2, '#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'shape:1')
|
||||
local p1 = drawing.points[drawing.shapes[1].p1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p1.x, 5, 'F - test_draw_line/p1:x')
|
||||
check_eq(p1.y, 6, 'F - test_draw_line/p1:y')
|
||||
check_eq(p2.x, 35, 'F - test_draw_line/p2:x')
|
||||
check_eq(p2.y, 36, 'F - test_draw_line/p2:y')
|
||||
check_eq(p1.x, 5, 'p1:x')
|
||||
check_eq(p1.y, 6, 'p1:y')
|
||||
check_eq(p2.x, 35, 'p2:x')
|
||||
check_eq(p2.y, 36, 'p2:y')
|
||||
-- wait until save
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
|
@ -58,19 +56,18 @@ function test_draw_line()
|
|||
load_from_disk(Editor_state)
|
||||
Text.redraw_all(Editor_state)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_line/save/#shapes')
|
||||
check_eq(#drawing.points, 2, 'F - test_draw_line/save/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_draw_line/save/shape:1')
|
||||
check_eq(#drawing.shapes, 1, 'save/#shapes')
|
||||
check_eq(#drawing.points, 2, 'save/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'save/shape:1')
|
||||
local p1 = drawing.points[drawing.shapes[1].p1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p1.x, 5, 'F - test_draw_line/save/p1:x')
|
||||
check_eq(p1.y, 6, 'F - test_draw_line/save/p1:y')
|
||||
check_eq(p2.x, 35, 'F - test_draw_line/save/p2:x')
|
||||
check_eq(p2.y, 36, 'F - test_draw_line/save/p2:y')
|
||||
check_eq(p1.x, 5, 'save/p1:x')
|
||||
check_eq(p1.y, 6, 'save/p1:y')
|
||||
check_eq(p2.x, 35, 'save/p2:x')
|
||||
check_eq(p2.y, 36, 'save/p2:y')
|
||||
end
|
||||
|
||||
function test_draw_horizontal_line()
|
||||
io.write('\ntest_draw_horizontal_line')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -78,28 +75,27 @@ function test_draw_horizontal_line()
|
|||
Text.redraw_all(Editor_state)
|
||||
Editor_state.current_drawing_mode = 'manhattan'
|
||||
edit.draw(Editor_state)
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_horizontal_line/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_horizontal_line/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_horizontal_line/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_horizontal_line/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_horizontal_line/baseline/#shapes')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- draw a line that is more horizontal than vertical
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+26, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_horizontal_line/#shapes')
|
||||
check_eq(#drawing.points, 2, 'F - test_draw_horizontal_line/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'manhattan', 'F - test_draw_horizontal_line/shape_mode')
|
||||
check_eq(#drawing.shapes, 1, '#shapes')
|
||||
check_eq(#drawing.points, 2, '#points')
|
||||
check_eq(drawing.shapes[1].mode, 'manhattan', 'shape_mode')
|
||||
local p1 = drawing.points[drawing.shapes[1].p1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p1.x, 5, 'F - test_draw_horizontal_line/p1:x')
|
||||
check_eq(p1.y, 6, 'F - test_draw_horizontal_line/p1:y')
|
||||
check_eq(p2.x, 35, 'F - test_draw_horizontal_line/p2:x')
|
||||
check_eq(p2.y, p1.y, 'F - test_draw_horizontal_line/p2:y')
|
||||
check_eq(p1.x, 5, 'p1:x')
|
||||
check_eq(p1.y, 6, 'p1:y')
|
||||
check_eq(p2.x, 35, 'p2:x')
|
||||
check_eq(p2.y, p1.y, 'p2:y')
|
||||
end
|
||||
|
||||
function test_draw_circle()
|
||||
io.write('\ntest_draw_circle')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -107,28 +103,27 @@ function test_draw_circle()
|
|||
Text.redraw_all(Editor_state)
|
||||
Editor_state.current_drawing_mode = 'line'
|
||||
edit.draw(Editor_state)
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_circle/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_circle/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_circle/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_circle/baseline/#shapes')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- draw a circle
|
||||
App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing
|
||||
edit.run_after_keychord(Editor_state, 'C-o')
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_circle/#shapes')
|
||||
check_eq(#drawing.points, 1, 'F - test_draw_circle/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'circle', 'F - test_draw_horizontal_line/shape_mode')
|
||||
check_eq(drawing.shapes[1].radius, 30, 'F - test_draw_circle/radius')
|
||||
check_eq(#drawing.shapes, 1, '#shapes')
|
||||
check_eq(#drawing.points, 1, '#points')
|
||||
check_eq(drawing.shapes[1].mode, 'circle', 'shape_mode')
|
||||
check_eq(drawing.shapes[1].radius, 30, 'radius')
|
||||
local center = drawing.points[drawing.shapes[1].center]
|
||||
check_eq(center.x, 35, 'F - test_draw_circle/center:x')
|
||||
check_eq(center.y, 36, 'F - test_draw_circle/center:y')
|
||||
check_eq(center.x, 35, 'center:x')
|
||||
check_eq(center.y, 36, 'center:y')
|
||||
end
|
||||
|
||||
function test_cancel_stroke()
|
||||
io.write('\ntest_cancel_stroke')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -137,22 +132,21 @@ function test_cancel_stroke()
|
|||
Text.redraw_all(Editor_state)
|
||||
Editor_state.current_drawing_mode = 'line'
|
||||
edit.draw(Editor_state)
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_cancel_stroke/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_cancel_stroke/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_cancel_stroke/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_cancel_stroke/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_cancel_stroke/baseline/#shapes')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- start drawing a line
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
-- cancel
|
||||
edit.run_after_keychord(Editor_state, 'escape')
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 0, 'F - test_cancel_stroke/#shapes')
|
||||
check_eq(#drawing.shapes, 0, '#shapes')
|
||||
end
|
||||
|
||||
function test_keys_do_not_affect_shape_when_mouse_up()
|
||||
io.write('\ntest_keys_do_not_affect_shape_when_mouse_up')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -164,12 +158,11 @@ function test_keys_do_not_affect_shape_when_mouse_up()
|
|||
App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing
|
||||
edit.run_after_keychord(Editor_state, 'o')
|
||||
-- no change to drawing mode
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_keys_do_not_affect_shape_when_mouse_up/drawing_mode')
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'drawing_mode')
|
||||
-- no change to text either because we didn't run the text_input event
|
||||
end
|
||||
|
||||
function test_draw_circle_mid_stroke()
|
||||
io.write('\ntest_draw_circle_mid_stroke')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -177,28 +170,27 @@ function test_draw_circle_mid_stroke()
|
|||
Text.redraw_all(Editor_state)
|
||||
Editor_state.current_drawing_mode = 'line'
|
||||
edit.draw(Editor_state)
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_circle_mid_stroke/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_circle_mid_stroke/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle_mid_stroke/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_circle_mid_stroke/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_circle_mid_stroke/baseline/#shapes')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- draw a circle
|
||||
App.mouse_move(Editor_state.left+4, Editor_state.top+Drawing_padding_top+4) -- hover on drawing
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
edit.run_after_text_input(Editor_state, 'o')
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_circle_mid_stroke/#shapes')
|
||||
check_eq(#drawing.points, 1, 'F - test_draw_circle_mid_stroke/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'circle', 'F - test_draw_horizontal_line/shape_mode')
|
||||
check_eq(drawing.shapes[1].radius, 30, 'F - test_draw_circle_mid_stroke/radius')
|
||||
check_eq(#drawing.shapes, 1, '#shapes')
|
||||
check_eq(#drawing.points, 1, '#points')
|
||||
check_eq(drawing.shapes[1].mode, 'circle', 'shape_mode')
|
||||
check_eq(drawing.shapes[1].radius, 30, 'radius')
|
||||
local center = drawing.points[drawing.shapes[1].center]
|
||||
check_eq(center.x, 35, 'F - test_draw_circle_mid_stroke/center:x')
|
||||
check_eq(center.y, 36, 'F - test_draw_circle_mid_stroke/center:y')
|
||||
check_eq(center.x, 35, 'center:x')
|
||||
check_eq(center.y, 36, 'center:y')
|
||||
end
|
||||
|
||||
function test_draw_arc()
|
||||
io.write('\ntest_draw_arc')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -206,43 +198,42 @@ function test_draw_arc()
|
|||
Text.redraw_all(Editor_state)
|
||||
Editor_state.current_drawing_mode = 'circle'
|
||||
edit.draw(Editor_state)
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_arc/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_arc/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_arc/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_arc/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_arc/baseline/#shapes')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- draw an arc
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
App.mouse_move(Editor_state.left+35+30, Editor_state.top+Drawing_padding_top+36)
|
||||
edit.run_after_text_input(Editor_state, 'a') -- arc mode
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35+50, Editor_state.top+Drawing_padding_top+36+50, 1) -- 45°
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_arc/#shapes')
|
||||
check_eq(#drawing.points, 1, 'F - test_draw_arc/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'arc', 'F - test_draw_horizontal_line/shape_mode')
|
||||
check_eq(#drawing.shapes, 1, '#shapes')
|
||||
check_eq(#drawing.points, 1, '#points')
|
||||
check_eq(drawing.shapes[1].mode, 'arc', 'shape_mode')
|
||||
local arc = drawing.shapes[1]
|
||||
check_eq(arc.radius, 30, 'F - test_draw_arc/radius')
|
||||
check_eq(arc.radius, 30, 'radius')
|
||||
local center = drawing.points[arc.center]
|
||||
check_eq(center.x, 35, 'F - test_draw_arc/center:x')
|
||||
check_eq(center.y, 36, 'F - test_draw_arc/center:y')
|
||||
check_eq(arc.start_angle, 0, 'F - test_draw_arc/start:angle')
|
||||
check_eq(arc.end_angle, math.pi/4, 'F - test_draw_arc/end:angle')
|
||||
check_eq(center.x, 35, 'center:x')
|
||||
check_eq(center.y, 36, 'center:y')
|
||||
check_eq(arc.start_angle, 0, 'start:angle')
|
||||
check_eq(arc.end_angle, math.pi/4, 'end:angle')
|
||||
end
|
||||
|
||||
function test_draw_polygon()
|
||||
io.write('\ntest_draw_polygon')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.lines = load_array{'```lines', '```', ''}
|
||||
Text.redraw_all(Editor_state)
|
||||
edit.draw(Editor_state)
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_polygon/baseline/drawing_mode')
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_polygon/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_polygon/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_polygon/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_polygon/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_polygon/baseline/#shapes')
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'baseline/drawing_mode')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- first point
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
edit.run_after_text_input(Editor_state, 'g') -- polygon mode
|
||||
|
@ -252,36 +243,35 @@ function test_draw_polygon()
|
|||
-- final point
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+26, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_polygon/#shapes')
|
||||
check_eq(#drawing.points, 3, 'F - test_draw_polygon/vertices')
|
||||
check_eq(#drawing.shapes, 1, '#shapes')
|
||||
check_eq(#drawing.points, 3, 'vertices')
|
||||
local shape = drawing.shapes[1]
|
||||
check_eq(shape.mode, 'polygon', 'F - test_draw_polygon/shape_mode')
|
||||
check_eq(#shape.vertices, 3, 'F - test_draw_polygon/vertices')
|
||||
check_eq(shape.mode, 'polygon', 'shape_mode')
|
||||
check_eq(#shape.vertices, 3, 'vertices')
|
||||
local p = drawing.points[shape.vertices[1]]
|
||||
check_eq(p.x, 5, 'F - test_draw_polygon/p1:x')
|
||||
check_eq(p.y, 6, 'F - test_draw_polygon/p1:y')
|
||||
check_eq(p.x, 5, 'p1:x')
|
||||
check_eq(p.y, 6, 'p1:y')
|
||||
local p = drawing.points[shape.vertices[2]]
|
||||
check_eq(p.x, 65, 'F - test_draw_polygon/p2:x')
|
||||
check_eq(p.y, 36, 'F - test_draw_polygon/p2:y')
|
||||
check_eq(p.x, 65, 'p2:x')
|
||||
check_eq(p.y, 36, 'p2:y')
|
||||
local p = drawing.points[shape.vertices[3]]
|
||||
check_eq(p.x, 35, 'F - test_draw_polygon/p3:x')
|
||||
check_eq(p.y, 26, 'F - test_draw_polygon/p3:y')
|
||||
check_eq(p.x, 35, 'p3:x')
|
||||
check_eq(p.y, 26, 'p3:y')
|
||||
end
|
||||
|
||||
function test_draw_rectangle()
|
||||
io.write('\ntest_draw_rectangle')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.lines = load_array{'```lines', '```', ''}
|
||||
Text.redraw_all(Editor_state)
|
||||
edit.draw(Editor_state)
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_rectangle/baseline/drawing_mode')
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_rectangle/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_rectangle/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_rectangle/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_rectangle/baseline/#shapes')
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'baseline/drawing_mode')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- first point
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
edit.run_after_text_input(Editor_state, 'r') -- rectangle mode
|
||||
|
@ -294,39 +284,38 @@ function test_draw_rectangle()
|
|||
-- release (decides 'thickness' of rectangle perpendicular to first edge)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Drawing_padding_top+26, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_rectangle/#shapes')
|
||||
check_eq(#drawing.points, 5, 'F - test_draw_rectangle/#points') -- currently includes every point added
|
||||
check_eq(#drawing.shapes, 1, '#shapes')
|
||||
check_eq(#drawing.points, 5, '#points') -- currently includes every point added
|
||||
local shape = drawing.shapes[1]
|
||||
check_eq(shape.mode, 'rectangle', 'F - test_draw_rectangle/shape_mode')
|
||||
check_eq(#shape.vertices, 4, 'F - test_draw_rectangle/vertices')
|
||||
check_eq(shape.mode, 'rectangle', 'shape_mode')
|
||||
check_eq(#shape.vertices, 4, 'vertices')
|
||||
local p = drawing.points[shape.vertices[1]]
|
||||
check_eq(p.x, 35, 'F - test_draw_rectangle/p1:x')
|
||||
check_eq(p.y, 36, 'F - test_draw_rectangle/p1:y')
|
||||
check_eq(p.x, 35, 'p1:x')
|
||||
check_eq(p.y, 36, 'p1:y')
|
||||
local p = drawing.points[shape.vertices[2]]
|
||||
check_eq(p.x, 75, 'F - test_draw_rectangle/p2:x')
|
||||
check_eq(p.y, 76, 'F - test_draw_rectangle/p2:y')
|
||||
check_eq(p.x, 75, 'p2:x')
|
||||
check_eq(p.y, 76, 'p2:y')
|
||||
local p = drawing.points[shape.vertices[3]]
|
||||
check_eq(p.x, 70, 'F - test_draw_rectangle/p3:x')
|
||||
check_eq(p.y, 81, 'F - test_draw_rectangle/p3:y')
|
||||
check_eq(p.x, 70, 'p3:x')
|
||||
check_eq(p.y, 81, 'p3:y')
|
||||
local p = drawing.points[shape.vertices[4]]
|
||||
check_eq(p.x, 30, 'F - test_draw_rectangle/p4:x')
|
||||
check_eq(p.y, 41, 'F - test_draw_rectangle/p4:y')
|
||||
check_eq(p.x, 30, 'p4:x')
|
||||
check_eq(p.y, 41, 'p4:y')
|
||||
end
|
||||
|
||||
function test_draw_rectangle_intermediate()
|
||||
io.write('\ntest_draw_rectangle_intermediate')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.lines = load_array{'```lines', '```', ''}
|
||||
Text.redraw_all(Editor_state)
|
||||
edit.draw(Editor_state)
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_rectangle_intermediate/baseline/drawing_mode')
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_rectangle_intermediate/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_rectangle_intermediate/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle_intermediate/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_rectangle_intermediate/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_rectangle_intermediate/baseline/#shapes')
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'baseline/drawing_mode')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- first point
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
edit.run_after_text_input(Editor_state, 'r') -- rectangle mode
|
||||
|
@ -337,33 +326,32 @@ function test_draw_rectangle_intermediate()
|
|||
App.mouse_move(Editor_state.left+75, Editor_state.top+Drawing_padding_top+76)
|
||||
edit.run_after_text_input(Editor_state, 'p')
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.points, 3, 'F - test_draw_rectangle_intermediate/#points') -- currently includes every point added
|
||||
check_eq(#drawing.points, 3, '#points') -- currently includes every point added
|
||||
local pending = drawing.pending
|
||||
check_eq(pending.mode, 'rectangle', 'F - test_draw_rectangle_intermediate/shape_mode')
|
||||
check_eq(#pending.vertices, 2, 'F - test_draw_rectangle_intermediate/vertices')
|
||||
check_eq(pending.mode, 'rectangle', 'shape_mode')
|
||||
check_eq(#pending.vertices, 2, 'vertices')
|
||||
local p = drawing.points[pending.vertices[1]]
|
||||
check_eq(p.x, 35, 'F - test_draw_rectangle_intermediate/p1:x')
|
||||
check_eq(p.y, 36, 'F - test_draw_rectangle_intermediate/p1:y')
|
||||
check_eq(p.x, 35, 'p1:x')
|
||||
check_eq(p.y, 36, 'p1:y')
|
||||
local p = drawing.points[pending.vertices[2]]
|
||||
check_eq(p.x, 75, 'F - test_draw_rectangle_intermediate/p2:x')
|
||||
check_eq(p.y, 76, 'F - test_draw_rectangle_intermediate/p2:y')
|
||||
check_eq(p.x, 75, 'p2:x')
|
||||
check_eq(p.y, 76, 'p2:y')
|
||||
-- outline of rectangle is drawn based on where the mouse is, but we can't check that so far
|
||||
end
|
||||
|
||||
function test_draw_square()
|
||||
io.write('\ntest_draw_square')
|
||||
-- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.lines = load_array{'```lines', '```', ''}
|
||||
Text.redraw_all(Editor_state)
|
||||
edit.draw(Editor_state)
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_draw_square/baseline/drawing_mode')
|
||||
check_eq(#Editor_state.lines, 2, 'F - test_draw_square/baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'F - test_draw_square/baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_square/baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'F - test_draw_square/baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_draw_square/baseline/#shapes')
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'baseline/drawing_mode')
|
||||
check_eq(#Editor_state.lines, 2, 'baseline/#lines')
|
||||
check_eq(Editor_state.lines[1].mode, 'drawing', 'baseline/mode')
|
||||
check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
|
||||
check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
|
||||
-- first point
|
||||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
edit.run_after_text_input(Editor_state, 's') -- square mode
|
||||
|
@ -376,26 +364,25 @@ function test_draw_square()
|
|||
-- release (decides which side of first edge to draw square on)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Drawing_padding_top+26, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_draw_square/#shapes')
|
||||
check_eq(#drawing.points, 5, 'F - test_draw_square/#points') -- currently includes every point added
|
||||
check_eq(drawing.shapes[1].mode, 'square', 'F - test_draw_square/shape_mode')
|
||||
check_eq(#drawing.shapes[1].vertices, 4, 'F - test_draw_square/vertices')
|
||||
check_eq(#drawing.shapes, 1, '#shapes')
|
||||
check_eq(#drawing.points, 5, '#points') -- currently includes every point added
|
||||
check_eq(drawing.shapes[1].mode, 'square', 'shape_mode')
|
||||
check_eq(#drawing.shapes[1].vertices, 4, 'vertices')
|
||||
local p = drawing.points[drawing.shapes[1].vertices[1]]
|
||||
check_eq(p.x, 35, 'F - test_draw_square/p1:x')
|
||||
check_eq(p.y, 36, 'F - test_draw_square/p1:y')
|
||||
check_eq(p.x, 35, 'p1:x')
|
||||
check_eq(p.y, 36, 'p1:y')
|
||||
local p = drawing.points[drawing.shapes[1].vertices[2]]
|
||||
check_eq(p.x, 65, 'F - test_draw_square/p2:x')
|
||||
check_eq(p.y, 66, 'F - test_draw_square/p2:y')
|
||||
check_eq(p.x, 65, 'p2:x')
|
||||
check_eq(p.y, 66, 'p2:y')
|
||||
local p = drawing.points[drawing.shapes[1].vertices[3]]
|
||||
check_eq(p.x, 35, 'F - test_draw_square/p3:x')
|
||||
check_eq(p.y, 96, 'F - test_draw_square/p3:y')
|
||||
check_eq(p.x, 35, 'p3:x')
|
||||
check_eq(p.y, 96, 'p3:y')
|
||||
local p = drawing.points[drawing.shapes[1].vertices[4]]
|
||||
check_eq(p.x, 5, 'F - test_draw_square/p4:x')
|
||||
check_eq(p.y, 66, 'F - test_draw_square/p4:y')
|
||||
check_eq(p.x, 5, 'p4:x')
|
||||
check_eq(p.y, 66, 'p4:y')
|
||||
end
|
||||
|
||||
function test_name_point()
|
||||
io.write('\ntest_name_point')
|
||||
-- create a drawing with a line
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -408,27 +395,27 @@ function test_name_point()
|
|||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_name_point/baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'F - test_name_point/baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_name_point/baseline/shape:1')
|
||||
check_eq(#drawing.shapes, 1, 'baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
|
||||
local p1 = drawing.points[drawing.shapes[1].p1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p1.x, 5, 'F - test_name_point/baseline/p1:x')
|
||||
check_eq(p1.y, 6, 'F - test_name_point/baseline/p1:y')
|
||||
check_eq(p2.x, 35, 'F - test_name_point/baseline/p2:x')
|
||||
check_eq(p2.y, 36, 'F - test_name_point/baseline/p2:y')
|
||||
check_nil(p2.name, 'F - test_name_point/baseline/p2:name')
|
||||
check_eq(p1.x, 5, 'baseline/p1:x')
|
||||
check_eq(p1.y, 6, 'baseline/p1:y')
|
||||
check_eq(p2.x, 35, 'baseline/p2:x')
|
||||
check_eq(p2.y, 36, 'baseline/p2:y')
|
||||
check_nil(p2.name, 'baseline/p2:name')
|
||||
-- enter 'name' mode without moving the mouse
|
||||
edit.run_after_keychord(Editor_state, 'C-n')
|
||||
check_eq(Editor_state.current_drawing_mode, 'name', 'F - test_name_point/mode:1')
|
||||
check_eq(Editor_state.current_drawing_mode, 'name', 'mode:1')
|
||||
edit.run_after_text_input(Editor_state, 'A')
|
||||
check_eq(p2.name, 'A', 'F - test_name_point')
|
||||
check_eq(p2.name, 'A', 'check1')
|
||||
-- still in 'name' mode
|
||||
check_eq(Editor_state.current_drawing_mode, 'name', 'F - test_name_point/mode:2')
|
||||
check_eq(Editor_state.current_drawing_mode, 'name', 'mode:2')
|
||||
-- exit 'name' mode
|
||||
edit.run_after_keychord(Editor_state, 'return')
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_name_point/mode:3')
|
||||
check_eq(p2.name, 'A', 'F - test_name_point')
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'mode:3')
|
||||
check_eq(p2.name, 'A', 'check2')
|
||||
-- wait until save
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
|
@ -436,11 +423,10 @@ function test_name_point()
|
|||
load_from_disk(Editor_state)
|
||||
Text.redraw_all(Editor_state)
|
||||
local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]
|
||||
check_eq(p2.name, 'A', 'F - test_name_point/save')
|
||||
check_eq(p2.name, 'A', 'save')
|
||||
end
|
||||
|
||||
function test_move_point()
|
||||
io.write('\ntest_move_point')
|
||||
-- create a drawing with a line
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -452,15 +438,15 @@ function test_move_point()
|
|||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_move_point/baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'F - test_move_point/baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_move_point/baseline/shape:1')
|
||||
check_eq(#drawing.shapes, 1, 'baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
|
||||
local p1 = drawing.points[drawing.shapes[1].p1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p1.x, 5, 'F - test_move_point/baseline/p1:x')
|
||||
check_eq(p1.y, 6, 'F - test_move_point/baseline/p1:y')
|
||||
check_eq(p2.x, 35, 'F - test_move_point/baseline/p2:x')
|
||||
check_eq(p2.y, 36, 'F - test_move_point/baseline/p2:y')
|
||||
check_eq(p1.x, 5, 'baseline/p1:x')
|
||||
check_eq(p1.y, 6, 'baseline/p1:y')
|
||||
check_eq(p2.x, 35, 'baseline/p2:x')
|
||||
check_eq(p2.y, 36, 'baseline/p2:y')
|
||||
-- wait until save
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
|
@ -469,25 +455,25 @@ function test_move_point()
|
|||
Text.redraw_all(Editor_state)
|
||||
local drawing = Editor_state.lines[1]
|
||||
local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]
|
||||
check_eq(p2.x, 35, 'F - test_move_point/save/x')
|
||||
check_eq(p2.y, 36, 'F - test_move_point/save/y')
|
||||
check_eq(p2.x, 35, 'save/x')
|
||||
check_eq(p2.y, 36, 'save/y')
|
||||
edit.draw(Editor_state)
|
||||
-- enter 'move' mode without moving the mouse
|
||||
edit.run_after_keychord(Editor_state, 'C-u')
|
||||
check_eq(Editor_state.current_drawing_mode, 'move', 'F - test_move_point/mode:1')
|
||||
check_eq(Editor_state.current_drawing_mode, 'move', 'mode:1')
|
||||
-- point is lifted
|
||||
check_eq(drawing.pending.mode, 'move', 'F - test_move_point/mode:2')
|
||||
check_eq(drawing.pending.target_point, p2, 'F - test_move_point/target')
|
||||
check_eq(drawing.pending.mode, 'move', 'mode:2')
|
||||
check_eq(drawing.pending.target_point, p2, 'target')
|
||||
-- move point
|
||||
App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44)
|
||||
edit.update(Editor_state, 0.05)
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p2.x, 26, 'F - test_move_point/x')
|
||||
check_eq(p2.y, 44, 'F - test_move_point/y')
|
||||
check_eq(p2.x, 26, 'x')
|
||||
check_eq(p2.y, 44, 'y')
|
||||
-- exit 'move' mode
|
||||
edit.run_after_mouse_click(Editor_state, Editor_state.left+26, Editor_state.top+Drawing_padding_top+44, 1)
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'F - test_move_point/mode:3')
|
||||
check_eq(drawing.pending, {}, 'F - test_move_point/pending')
|
||||
check_eq(Editor_state.current_drawing_mode, 'line', 'mode:3')
|
||||
check_eq(drawing.pending, {}, 'pending')
|
||||
-- wait until save
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
|
@ -495,12 +481,11 @@ function test_move_point()
|
|||
load_from_disk(Editor_state)
|
||||
Text.redraw_all(Editor_state)
|
||||
local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]
|
||||
check_eq(p2.x, 26, 'F - test_move_point/save/x')
|
||||
check_eq(p2.y, 44, 'F - test_move_point/save/y')
|
||||
check_eq(p2.x, 26, 'save/x')
|
||||
check_eq(p2.y, 44, 'save/y')
|
||||
end
|
||||
|
||||
function test_move_point_on_manhattan_line()
|
||||
io.write('\ntest_move_point_on_manhattan_line')
|
||||
-- create a drawing with a manhattan line
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -512,22 +497,21 @@ function test_move_point_on_manhattan_line()
|
|||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+46, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_move_point_on_manhattan_line/baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'F - test_move_point_on_manhattan_line/baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'manhattan', 'F - test_move_point_on_manhattan_line/baseline/shape:1')
|
||||
check_eq(#drawing.shapes, 1, 'baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'manhattan', 'baseline/shape:1')
|
||||
edit.draw(Editor_state)
|
||||
-- enter 'move' mode
|
||||
edit.run_after_keychord(Editor_state, 'C-u')
|
||||
check_eq(Editor_state.current_drawing_mode, 'move', 'F - test_move_point_on_manhattan_line/mode:1')
|
||||
check_eq(Editor_state.current_drawing_mode, 'move', 'mode:1')
|
||||
-- move point
|
||||
App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44)
|
||||
edit.update(Editor_state, 0.05)
|
||||
-- line is no longer manhattan
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_move_point_on_manhattan_line/baseline/shape:1')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
|
||||
end
|
||||
|
||||
function test_delete_lines_at_point()
|
||||
io.write('\ntest_delete_lines_at_point')
|
||||
-- create a drawing with two lines connected at a point
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -541,25 +525,24 @@ function test_delete_lines_at_point()
|
|||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 2, 'F - test_delete_lines_at_point/baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_delete_lines_at_point/baseline/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'F - test_delete_lines_at_point/baseline/shape:2')
|
||||
check_eq(#drawing.shapes, 2, 'baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'baseline/shape:2')
|
||||
-- hover on the common point and delete
|
||||
App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+36)
|
||||
edit.run_after_keychord(Editor_state, 'C-d')
|
||||
check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_lines_at_point/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'deleted', 'F - test_delete_lines_at_point/shape:2')
|
||||
check_eq(drawing.shapes[1].mode, 'deleted', 'shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'deleted', 'shape:2')
|
||||
-- wait for some time
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
-- deleted points disappear after file is reloaded
|
||||
load_from_disk(Editor_state)
|
||||
Text.redraw_all(Editor_state)
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'F - test_delete_lines_at_point/save')
|
||||
check_eq(#Editor_state.lines[1].shapes, 0, 'save')
|
||||
end
|
||||
|
||||
function test_delete_line_under_mouse_pointer()
|
||||
io.write('\ntest_delete_line_under_mouse_pointer')
|
||||
-- create a drawing with two lines connected at a point
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -572,19 +555,18 @@ function test_delete_line_under_mouse_pointer()
|
|||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 2, 'F - test_delete_line_under_mouse_pointer/baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_delete_line_under_mouse_pointer/baseline/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'F - test_delete_line_under_mouse_pointer/baseline/shape:2')
|
||||
check_eq(#drawing.shapes, 2, 'baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'baseline/shape:2')
|
||||
-- hover on one of the lines and delete
|
||||
App.mouse_move(Editor_state.left+25, Editor_state.top+Drawing_padding_top+26)
|
||||
edit.run_after_keychord(Editor_state, 'C-d')
|
||||
-- only that line is deleted
|
||||
check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_line_under_mouse_pointer/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'F - test_delete_line_under_mouse_pointer/shape:2')
|
||||
check_eq(drawing.shapes[1].mode, 'deleted', 'shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'shape:2')
|
||||
end
|
||||
|
||||
function test_delete_point_from_polygon()
|
||||
io.write('\ntest_delete_point_from_polygon')
|
||||
-- create a drawing with two lines connected at a point
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -604,19 +586,18 @@ function test_delete_point_from_polygon()
|
|||
-- fourth point
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Drawing_padding_top+16, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_delete_point_from_polygon/baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/baseline/mode')
|
||||
check_eq(#drawing.shapes[1].vertices, 4, 'F - test_delete_point_from_polygon/baseline/vertices')
|
||||
check_eq(#drawing.shapes, 1, 'baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'polygon', 'baseline/mode')
|
||||
check_eq(#drawing.shapes[1].vertices, 4, 'baseline/vertices')
|
||||
-- hover on a point and delete
|
||||
App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+26)
|
||||
edit.run_after_keychord(Editor_state, 'C-d')
|
||||
-- just the one point is deleted
|
||||
check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/shape')
|
||||
check_eq(#drawing.shapes[1].vertices, 3, 'F - test_delete_point_from_polygon/vertices')
|
||||
check_eq(drawing.shapes[1].mode, 'polygon', 'shape')
|
||||
check_eq(#drawing.shapes[1].vertices, 3, 'vertices')
|
||||
end
|
||||
|
||||
function test_delete_point_from_polygon()
|
||||
io.write('\ntest_delete_point_from_polygon')
|
||||
-- create a drawing with two lines connected at a point
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -633,18 +614,17 @@ function test_delete_point_from_polygon()
|
|||
-- third point
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Drawing_padding_top+16, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_delete_point_from_polygon/baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/baseline/mode')
|
||||
check_eq(#drawing.shapes[1].vertices, 3, 'F - test_delete_point_from_polygon/baseline/vertices')
|
||||
check_eq(#drawing.shapes, 1, 'baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'polygon', 'baseline/mode')
|
||||
check_eq(#drawing.shapes[1].vertices, 3, 'baseline/vertices')
|
||||
-- hover on a point and delete
|
||||
App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)
|
||||
edit.run_after_keychord(Editor_state, 'C-d')
|
||||
-- there's < 3 points left, so the whole polygon is deleted
|
||||
check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_point_from_polygon')
|
||||
check_eq(drawing.shapes[1].mode, 'deleted', 'check')
|
||||
end
|
||||
|
||||
function test_undo_name_point()
|
||||
io.write('\ntest_undo_name_point')
|
||||
-- create a drawing with a line
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -657,32 +637,32 @@ function test_undo_name_point()
|
|||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_undo_name_point/baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'F - test_undo_name_point/baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_name_point/baseline/shape:1')
|
||||
check_eq(#drawing.shapes, 1, 'baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
|
||||
local p1 = drawing.points[drawing.shapes[1].p1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p1.x, 5, 'F - test_undo_name_point/baseline/p1:x')
|
||||
check_eq(p1.y, 6, 'F - test_undo_name_point/baseline/p1:y')
|
||||
check_eq(p2.x, 35, 'F - test_undo_name_point/baseline/p2:x')
|
||||
check_eq(p2.y, 36, 'F - test_undo_name_point/baseline/p2:y')
|
||||
check_nil(p2.name, 'F - test_undo_name_point/baseline/p2:name')
|
||||
check_eq(#Editor_state.history, 1, 'F - test_undo_name_point/baseline/history:1')
|
||||
check_eq(p1.x, 5, 'baseline/p1:x')
|
||||
check_eq(p1.y, 6, 'baseline/p1:y')
|
||||
check_eq(p2.x, 35, 'baseline/p2:x')
|
||||
check_eq(p2.y, 36, 'baseline/p2:y')
|
||||
check_nil(p2.name, 'baseline/p2:name')
|
||||
check_eq(#Editor_state.history, 1, 'baseline/history:1')
|
||||
--? print('a', Editor_state.lines.current_drawing)
|
||||
-- enter 'name' mode without moving the mouse
|
||||
edit.run_after_keychord(Editor_state, 'C-n')
|
||||
edit.run_after_text_input(Editor_state, 'A')
|
||||
edit.run_after_keychord(Editor_state, 'return')
|
||||
check_eq(p2.name, 'A', 'F - test_undo_name_point/baseline')
|
||||
check_eq(#Editor_state.history, 3, 'F - test_undo_name_point/baseline/history:2')
|
||||
check_eq(Editor_state.next_history, 4, 'F - test_undo_name_point/baseline/next_history')
|
||||
check_eq(p2.name, 'A', 'baseline')
|
||||
check_eq(#Editor_state.history, 3, 'baseline/history:2')
|
||||
check_eq(Editor_state.next_history, 4, 'baseline/next_history')
|
||||
--? print('b', Editor_state.lines.current_drawing)
|
||||
-- undo
|
||||
edit.run_after_keychord(Editor_state, 'C-z')
|
||||
local drawing = Editor_state.lines[1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(Editor_state.next_history, 3, 'F - test_undo_name_point/next_history')
|
||||
check_eq(p2.name, '', 'F - test_undo_name_point') -- not quite what it was before, but close enough
|
||||
check_eq(Editor_state.next_history, 3, 'next_history')
|
||||
check_eq(p2.name, '', 'undo') -- not quite what it was before, but close enough
|
||||
-- wait until save
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
|
@ -690,11 +670,10 @@ function test_undo_name_point()
|
|||
load_from_disk(Editor_state)
|
||||
Text.redraw_all(Editor_state)
|
||||
local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]
|
||||
check_eq(p2.name, '', 'F - test_undo_name_point/save')
|
||||
check_eq(p2.name, '', 'save')
|
||||
end
|
||||
|
||||
function test_undo_move_point()
|
||||
io.write('\ntest_undo_move_point')
|
||||
-- create a drawing with a line
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -706,34 +685,34 @@ function test_undo_move_point()
|
|||
edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 1, 'F - test_undo_move_point/baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'F - test_undo_move_point/baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_move_point/baseline/shape:1')
|
||||
check_eq(#drawing.shapes, 1, 'baseline/#shapes')
|
||||
check_eq(#drawing.points, 2, 'baseline/#points')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
|
||||
local p1 = drawing.points[drawing.shapes[1].p1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p1.x, 5, 'F - test_undo_move_point/baseline/p1:x')
|
||||
check_eq(p1.y, 6, 'F - test_undo_move_point/baseline/p1:y')
|
||||
check_eq(p2.x, 35, 'F - test_undo_move_point/baseline/p2:x')
|
||||
check_eq(p2.y, 36, 'F - test_undo_move_point/baseline/p2:y')
|
||||
check_nil(p2.name, 'F - test_undo_move_point/baseline/p2:name')
|
||||
check_eq(p1.x, 5, 'baseline/p1:x')
|
||||
check_eq(p1.y, 6, 'baseline/p1:y')
|
||||
check_eq(p2.x, 35, 'baseline/p2:x')
|
||||
check_eq(p2.y, 36, 'baseline/p2:y')
|
||||
check_nil(p2.name, 'baseline/p2:name')
|
||||
-- move p2
|
||||
edit.run_after_keychord(Editor_state, 'C-u')
|
||||
App.mouse_move(Editor_state.left+26, Editor_state.top+Drawing_padding_top+44)
|
||||
edit.update(Editor_state, 0.05)
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(p2.x, 26, 'F - test_undo_move_point/x')
|
||||
check_eq(p2.y, 44, 'F - test_undo_move_point/y')
|
||||
check_eq(p2.x, 26, 'x')
|
||||
check_eq(p2.y, 44, 'y')
|
||||
-- exit 'move' mode
|
||||
edit.run_after_mouse_click(Editor_state, Editor_state.left+26, Editor_state.top+Drawing_padding_top+44, 1)
|
||||
check_eq(Editor_state.next_history, 4, 'F - test_undo_move_point/next_history')
|
||||
check_eq(Editor_state.next_history, 4, 'next_history')
|
||||
-- undo
|
||||
edit.run_after_keychord(Editor_state, 'C-z')
|
||||
edit.run_after_keychord(Editor_state, 'C-z') -- bug: need to undo twice
|
||||
local drawing = Editor_state.lines[1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(Editor_state.next_history, 2, 'F - test_undo_move_point/next_history')
|
||||
check_eq(p2.x, 35, 'F - test_undo_move_point/x')
|
||||
check_eq(p2.y, 36, 'F - test_undo_move_point/y')
|
||||
check_eq(Editor_state.next_history, 2, 'next_history')
|
||||
check_eq(p2.x, 35, 'x')
|
||||
check_eq(p2.y, 36, 'y')
|
||||
-- wait until save
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
|
@ -741,12 +720,11 @@ function test_undo_move_point()
|
|||
load_from_disk(Editor_state)
|
||||
Text.redraw_all(Editor_state)
|
||||
local p2 = Editor_state.lines[1].points[drawing.shapes[1].p2]
|
||||
check_eq(p2.x, 35, 'F - test_undo_move_point/save/x')
|
||||
check_eq(p2.y, 36, 'F - test_undo_move_point/save/y')
|
||||
check_eq(p2.x, 35, 'save/x')
|
||||
check_eq(p2.y, 36, 'save/y')
|
||||
end
|
||||
|
||||
function test_undo_delete_point()
|
||||
io.write('\ntest_undo_delete_point')
|
||||
-- create a drawing with two lines connected at a point
|
||||
App.screen.init{width=Test_margin_left+256, height=300} -- drawing coordinates 1:1 with pixels
|
||||
Editor_state = edit.initialize_test_state()
|
||||
|
@ -760,26 +738,26 @@ function test_undo_delete_point()
|
|||
edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
|
||||
edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1)
|
||||
local drawing = Editor_state.lines[1]
|
||||
check_eq(#drawing.shapes, 2, 'F - test_undo_delete_point/baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_delete_point/baseline/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'F - test_undo_delete_point/baseline/shape:2')
|
||||
check_eq(#drawing.shapes, 2, 'baseline/#shapes')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'baseline/shape:2')
|
||||
-- hover on the common point and delete
|
||||
App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+36)
|
||||
edit.run_after_keychord(Editor_state, 'C-d')
|
||||
check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_undo_delete_point/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'deleted', 'F - test_undo_delete_point/shape:2')
|
||||
check_eq(drawing.shapes[1].mode, 'deleted', 'shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'deleted', 'shape:2')
|
||||
-- undo
|
||||
edit.run_after_keychord(Editor_state, 'C-z')
|
||||
local drawing = Editor_state.lines[1]
|
||||
local p2 = drawing.points[drawing.shapes[1].p2]
|
||||
check_eq(Editor_state.next_history, 3, 'F - test_undo_move_point/next_history')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'F - test_undo_delete_point/shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'F - test_undo_delete_point/shape:2')
|
||||
check_eq(Editor_state.next_history, 3, 'next_history')
|
||||
check_eq(drawing.shapes[1].mode, 'line', 'shape:1')
|
||||
check_eq(drawing.shapes[2].mode, 'line', 'shape:2')
|
||||
-- wait until save
|
||||
Current_time = Current_time + 3.1
|
||||
edit.update(Editor_state, 0)
|
||||
-- undo is saved
|
||||
load_from_disk(Editor_state)
|
||||
Text.redraw_all(Editor_state)
|
||||
check_eq(#Editor_state.lines[1].shapes, 2, 'F - test_undo_delete_point/save')
|
||||
check_eq(#Editor_state.lines[1].shapes, 2, 'save')
|
||||
end
|
||||
|
|
|
@ -1,24 +1,22 @@
|
|||
function test_resize_window()
|
||||
io.write('\ntest_resize_window')
|
||||
App.screen.init{width=300, height=300}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.filename = 'foo'
|
||||
check_eq(App.screen.width, 300, 'F - test_resize_window/baseline/width')
|
||||
check_eq(App.screen.height, 300, 'F - test_resize_window/baseline/height')
|
||||
check_eq(Editor_state.left, Test_margin_left, 'F - test_resize_window/baseline/left_margin')
|
||||
check_eq(Editor_state.right, 300 - Test_margin_right, 'F - test_resize_window/baseline/left_margin')
|
||||
check_eq(App.screen.width, 300, 'baseline/width')
|
||||
check_eq(App.screen.height, 300, 'baseline/height')
|
||||
check_eq(Editor_state.left, Test_margin_left, 'baseline/left_margin')
|
||||
check_eq(Editor_state.right, 300 - Test_margin_right, 'baseline/left_margin')
|
||||
App.resize(200, 400)
|
||||
-- ugly; resize switches to real, non-test margins
|
||||
check_eq(App.screen.width, 200, 'F - test_resize_window/width')
|
||||
check_eq(App.screen.height, 400, 'F - test_resize_window/height')
|
||||
check_eq(Editor_state.left, Margin_left, 'F - test_resize_window/left_margin')
|
||||
check_eq(Editor_state.right, 200-Margin_right, 'F - test_resize_window/right_margin')
|
||||
check_eq(Editor_state.width, 200-Margin_left-Margin_right, 'F - test_resize_window/drawing_width')
|
||||
check_eq(App.screen.width, 200, 'width')
|
||||
check_eq(App.screen.height, 400, 'height')
|
||||
check_eq(Editor_state.left, Margin_left, 'left_margin')
|
||||
check_eq(Editor_state.right, 200-Margin_right, 'right_margin')
|
||||
check_eq(Editor_state.width, 200-Margin_left-Margin_right, 'drawing_width')
|
||||
-- TODO: how to make assertions about when App.update got past the early exit?
|
||||
end
|
||||
|
||||
function test_drop_file()
|
||||
io.write('\ntest_drop_file')
|
||||
App.screen.init{width=Editor_state.left+300, height=300}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
App.filesystem['foo'] = 'abc\ndef\nghi\n'
|
||||
|
@ -39,15 +37,14 @@ function test_drop_file()
|
|||
end,
|
||||
}
|
||||
App.filedropped(fake_dropped_file)
|
||||
check_eq(#Editor_state.lines, 3, 'F - test_drop_file/#lines')
|
||||
check_eq(Editor_state.lines[1].data, 'abc', 'F - test_drop_file/lines:1')
|
||||
check_eq(Editor_state.lines[2].data, 'def', 'F - test_drop_file/lines:2')
|
||||
check_eq(Editor_state.lines[3].data, 'ghi', 'F - test_drop_file/lines:3')
|
||||
check_eq(#Editor_state.lines, 3, '#lines')
|
||||
check_eq(Editor_state.lines[1].data, 'abc', 'lines:1')
|
||||
check_eq(Editor_state.lines[2].data, 'def', 'lines:2')
|
||||
check_eq(Editor_state.lines[3].data, 'ghi', 'lines:3')
|
||||
edit.draw(Editor_state)
|
||||
end
|
||||
|
||||
function test_drop_file_saves_previous()
|
||||
io.write('\ntest_drop_file_saves_previous')
|
||||
App.screen.init{width=Editor_state.left+300, height=300}
|
||||
-- initially editing a file called foo that hasn't been saved to filesystem yet
|
||||
Editor_state.lines = load_array{'abc', 'def'}
|
||||
|
@ -73,5 +70,5 @@ function test_drop_file_saves_previous()
|
|||
}
|
||||
App.filedropped(fake_dropped_file)
|
||||
-- filesystem now contains a file called foo
|
||||
check_eq(App.filesystem['foo'], 'abc\ndef\n', 'F - test_drop_file_saves_previous')
|
||||
check_eq(App.filesystem['foo'], 'abc\ndef\n', 'check')
|
||||
end
|
||||
|
|
|
@ -1,25 +1,23 @@
|
|||
function test_resize_window()
|
||||
io.write('\ntest_resize_window')
|
||||
App.screen.init{width=300, height=300}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
Editor_state.filename = 'foo'
|
||||
Log_browser_state = edit.initialize_test_state()
|
||||
check_eq(App.screen.width, 300, 'F - test_resize_window/baseline/width')
|
||||
check_eq(App.screen.height, 300, 'F - test_resize_window/baseline/height')
|
||||
check_eq(Editor_state.left, Test_margin_left, 'F - test_resize_window/baseline/left_margin')
|
||||
check_eq(Editor_state.right, 300 - Test_margin_right, 'F - test_resize_window/baseline/right_margin')
|
||||
check_eq(App.screen.width, 300, 'baseline/width')
|
||||
check_eq(App.screen.height, 300, 'baseline/height')
|
||||
check_eq(Editor_state.left, Test_margin_left, 'baseline/left_margin')
|
||||
check_eq(Editor_state.right, 300 - Test_margin_right, 'baseline/right_margin')
|
||||
App.resize(200, 400)
|
||||
-- ugly; resize switches to real, non-test margins
|
||||
check_eq(App.screen.width, 200, 'F - test_resize_window/width')
|
||||
check_eq(App.screen.height, 400, 'F - test_resize_window/height')
|
||||
check_eq(Editor_state.left, Margin_left, 'F - test_resize_window/left_margin')
|
||||
check_eq(Editor_state.right, 200-Margin_right, 'F - test_resize_window/right_margin')
|
||||
check_eq(Editor_state.width, 200-Margin_left-Margin_right, 'F - test_resize_window/drawing_width')
|
||||
check_eq(App.screen.width, 200, 'width')
|
||||
check_eq(App.screen.height, 400, 'height')
|
||||
check_eq(Editor_state.left, Margin_left, 'left_margin')
|
||||
check_eq(Editor_state.right, 200-Margin_right, 'right_margin')
|
||||
check_eq(Editor_state.width, 200-Margin_left-Margin_right, 'drawing_width')
|
||||
-- TODO: how to make assertions about when App.update got past the early exit?
|
||||
end
|
||||
|
||||
function test_show_log_browser_side()
|
||||
io.write('\ntest_show_log_browser_side')
|
||||
App.screen.init{width=300, height=300}
|
||||
Display_width = App.screen.width
|
||||
Current_app = 'source'
|
||||
|
@ -29,15 +27,14 @@ function test_show_log_browser_side()
|
|||
Log_browser_state = edit.initialize_test_state()
|
||||
Text.redraw_all(Log_browser_state)
|
||||
log_browser.parse(Log_browser_state)
|
||||
check(not Show_log_browser_side, 'F - test_show_log_browser_side/baseline')
|
||||
check(not Show_log_browser_side, 'baseline')
|
||||
-- pressing ctrl+l shows log-browser side
|
||||
Current_time = Current_time + 0.1
|
||||
App.run_after_keychord('C-l')
|
||||
check(Show_log_browser_side, 'F - test_show_log_browser_side')
|
||||
check(Show_log_browser_side, 'check')
|
||||
end
|
||||
|
||||
function test_show_log_browser_side_doubles_window_width_if_possible()
|
||||
io.write('\ntest_show_log_browser_side_doubles_window_width_if_possible')
|
||||
-- initialize screen dimensions to half width
|
||||
App.screen.init{width=300, height=300}
|
||||
Display_width = App.screen.width*2
|
||||
|
@ -59,17 +56,16 @@ function test_show_log_browser_side_doubles_window_width_if_possible()
|
|||
Current_time = Current_time + 0.1
|
||||
App.run_after_keychord('C-l')
|
||||
-- window width is doubled
|
||||
check_eq(App.screen.width, 600, 'F - test_show_log_browser_side_doubles_window_width_if_possible/display:width')
|
||||
check_eq(App.screen.width, 600, 'display:width')
|
||||
-- left side margins are unchanged
|
||||
check_eq(Editor_state.left, Margin_left, 'F - test_show_log_browser_side_doubles_window_width_if_possible/edit:left')
|
||||
check_eq(Editor_state.right, old_editor_right, 'F - test_show_log_browser_side_doubles_window_width_if_possible/edit:right')
|
||||
check_eq(Editor_state.left, Margin_left, 'edit:left')
|
||||
check_eq(Editor_state.right, old_editor_right, 'edit:right')
|
||||
-- log browser margins are adjusted
|
||||
check_eq(Log_browser_state.left, App.screen.width/2 + Margin_left, 'F - test_show_log_browser_side_doubles_window_width_if_possible/log:left')
|
||||
check_eq(Log_browser_state.right, App.screen.width - Margin_right, 'F - test_show_log_browser_side_doubles_window_width_if_possible/log:right')
|
||||
check_eq(Log_browser_state.left, App.screen.width/2 + Margin_left, 'log:left')
|
||||
check_eq(Log_browser_state.right, App.screen.width - Margin_right, 'log:right')
|
||||
end
|
||||
|
||||
function test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width()
|
||||
io.write('\ntest_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width')
|
||||
-- initialize screen dimensions and indicate that it is maximized
|
||||
App.screen.init{width=300, height=300}
|
||||
Display_width = 300
|
||||
|
@ -90,14 +86,13 @@ function test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_w
|
|||
Current_time = Current_time + 0.1
|
||||
App.run_after_keychord('C-l')
|
||||
-- margins are now adjusted
|
||||
check_eq(Editor_state.left, Margin_left, 'F - test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width/edit:left')
|
||||
check_eq(Editor_state.right, App.screen.width/2 - Margin_right, 'F - test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width/edit:right')
|
||||
check_eq(Log_browser_state.left, App.screen.width/2 + Margin_left, 'F - test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width/log:left')
|
||||
check_eq(Log_browser_state.right, App.screen.width - Margin_right, 'F - test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width/log:right')
|
||||
check_eq(Editor_state.left, Margin_left, 'edit:left')
|
||||
check_eq(Editor_state.right, App.screen.width/2 - Margin_right, 'edit:right')
|
||||
check_eq(Log_browser_state.left, App.screen.width/2 + Margin_left, 'log:left')
|
||||
check_eq(Log_browser_state.right, App.screen.width - Margin_right, 'log:right')
|
||||
end
|
||||
|
||||
function test_drop_file()
|
||||
io.write('\ntest_drop_file')
|
||||
App.screen.init{width=Editor_state.left+300, height=300}
|
||||
Editor_state = edit.initialize_test_state()
|
||||
App.filesystem['foo'] = 'abc\ndef\nghi\n'
|
||||
|
@ -118,15 +113,14 @@ function test_drop_file()
|
|||
end,
|
||||
}
|
||||
App.filedropped(fake_dropped_file)
|
||||
check_eq(#Editor_state.lines, 3, 'F - test_drop_file/#lines')
|
||||
check_eq(Editor_state.lines[1].data, 'abc', 'F - test_drop_file/lines:1')
|
||||
check_eq(Editor_state.lines[2].data, 'def', 'F - test_drop_file/lines:2')
|
||||
check_eq(Editor_state.lines[3].data, 'ghi', 'F - test_drop_file/lines:3')
|
||||
check_eq(#Editor_state.lines, 3, '#lines')
|
||||
check_eq(Editor_state.lines[1].data, 'abc', 'lines:1')
|
||||
check_eq(Editor_state.lines[2].data, 'def', 'lines:2')
|
||||
check_eq(Editor_state.lines[3].data, 'ghi', 'lines:3')
|
||||
edit.draw(Editor_state)
|
||||
end
|
||||
|
||||
function test_drop_file_saves_previous()
|
||||
io.write('\ntest_drop_file_saves_previous')
|
||||
App.screen.init{width=Editor_state.left+300, height=300}
|
||||
-- initially editing a file called foo that hasn't been saved to filesystem yet
|
||||
Editor_state.lines = load_array{'abc', 'def'}
|
||||
|
@ -152,5 +146,5 @@ function test_drop_file_saves_previous()
|
|||
}
|
||||
App.filedropped(fake_dropped_file)
|
||||
-- filesystem now contains a file called foo
|
||||
check_eq(App.filesystem['foo'], 'abc\ndef\n', 'F - test_drop_file_saves_previous')
|
||||
check_eq(App.filesystem['foo'], 'abc\ndef\n', 'check')
|
||||
end
|
||||
|
|
File diff suppressed because it is too large
Load Diff
15
test.lua
15
test.lua
|
@ -1,28 +1,19 @@
|
|||
-- Some primitives for tests.
|
||||
--
|
||||
-- Success indicators go to the terminal; failures go to the window.
|
||||
-- I don't know what I am doing.
|
||||
|
||||
function check(x, msg)
|
||||
if x then
|
||||
io.write('.')
|
||||
else
|
||||
if not x then
|
||||
error(msg)
|
||||
end
|
||||
end
|
||||
|
||||
function check_nil(x, msg)
|
||||
if x == nil then
|
||||
io.write('.')
|
||||
else
|
||||
if x ~= nil then
|
||||
error(msg..'; should be nil but got "'..x..'"')
|
||||
end
|
||||
end
|
||||
|
||||
function check_eq(x, expected, msg)
|
||||
if eq(x, expected) then
|
||||
io.write('.')
|
||||
else
|
||||
if not eq(x, expected) then
|
||||
error(msg..'; got "'..x..'"')
|
||||
end
|
||||
end
|
||||
|
|
971
text_tests.lua
971
text_tests.lua
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user