1 files changed, 14 insertions, 17 deletions
diff --git a/run_tests.lua b/run_tests.lua
index eab71ae..c5c4eff 100644
--- a/run_tests.lua
+++ b/run_tests.lua
@@ -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