diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2022-09-07 10:20:19 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2022-09-07 10:20:19 -0700 |
| commit | 81b0646ec1c3f9deae5e4b2c0b538102aa973a6e (patch) | |
| tree | 2a933c4945f3d27a97f65c31ffcfa3b15fcd2f20 | |
| parent | 326eca796dbe42af8e3a2a3d623a052c4669fb9a (diff) | |
| parent | 901dd1fd945588c3c8334ca86d57726911c3a908 (diff) | |
| download | view.love-81b0646ec1c3f9deae5e4b2c0b538102aa973a6e.tar.gz | |
Merge text.love
| -rw-r--r-- | edit.lua | 5 | ||||
| -rw-r--r-- | run_tests.lua | 7 | ||||
| -rw-r--r-- | source_edit.lua | 5 | ||||
| -rw-r--r-- | source_tests.lua | 7 |
4 files changed, 16 insertions, 8 deletions
diff --git a/edit.lua b/edit.lua index ce13798..3c56ae0 100644 --- a/edit.lua +++ b/edit.lua @@ -250,14 +250,17 @@ end --== some methods for tests +-- Insulate tests from some key globals so I don't have to change the vast +-- majority of tests when they're modified for the real app. Test_margin_left = 25 +Test_margin_right = 0 function edit.initialize_test_state() -- if you change these values, tests will start failing return edit.initialize_state( 15, -- top margin Test_margin_left, - App.screen.width, -- right margin = 0 + App.screen.width - Test_margin_right, 14, -- font height assuming default LÖVE font 15) -- line height end diff --git a/run_tests.lua b/run_tests.lua index 5c72064..d2c6a3e 100644 --- a/run_tests.lua +++ b/run_tests.lua @@ -6,13 +6,14 @@ function test_resize_window() 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') 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, Test_margin_left, 'F - test_resize_window/left_margin') - -- ugly; right margin switches from 0 after resize + 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-Test_margin_left-Margin_right, 'F - test_resize_window/drawing_width') + check_eq(Editor_state.width, 200-Margin_left-Margin_right, 'F - test_resize_window/drawing_width') -- TODO: how to make assertions about when App.update got past the early exit? end diff --git a/source_edit.lua b/source_edit.lua index a65537d..bcb1297 100644 --- a/source_edit.lua +++ b/source_edit.lua @@ -515,14 +515,17 @@ end --== some methods for tests +-- Insulate tests from some key globals so I don't have to change the vast +-- majority of tests when they're modified for the real app. Test_margin_left = 25 +Test_margin_right = 0 function edit.initialize_test_state() -- if you change these values, tests will start failing return edit.initialize_state( 15, -- top margin Test_margin_left, - App.screen.width, -- right margin = 0 + App.screen.width - Test_margin_right, 14, -- font height assuming default LÖVE font 15) -- line height end diff --git a/source_tests.lua b/source_tests.lua index dde4ec4..519c311 100644 --- a/source_tests.lua +++ b/source_tests.lua @@ -7,13 +7,14 @@ function test_resize_window() 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') 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, Test_margin_left, 'F - test_resize_window/left_margin') - -- ugly; right margin switches from 0 after resize + 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-Test_margin_left-Margin_right, 'F - test_resize_window/drawing_width') + check_eq(Editor_state.width, 200-Margin_left-Margin_right, 'F - test_resize_window/drawing_width') -- TODO: how to make assertions about when App.update got past the early exit? end |