pijul nest
guest › [sign in] [explore]

Merge upstream into main

[?]
Jul 17, 2022, 2:31 AM
7S6CIN7I56U6DYB2F2LKGA2BDDYY5X7W4P4USZPZP42PFFMCVMNQC

Dependencies

  • [2] 7CEOB56D Merge upstream into main
  • [3] TGZAJUEF bring back a set of constants
  • [4] 42LVB4DE test: naming a point
  • [5] OWK3U6VD tests for drawing polygons
  • [6] UHB4GARJ left/right margin -> left/right coordinates
  • [7] KAUD3YIK tests: deleting points/shapes
  • [8] APYPFFS3 call edit rather than App callbacks in tests
  • [9] 2JLVAYHB start decoupling editor tests from App
  • [10] WDMPH4AN drop support for squares
  • [11] CRYGI3LR more drawing tests
  • [12] LF7BWEG4 group all editor globals
  • [13] W7JMT5V2 rip out most support for polygons
  • [14] LNUHQOGH start passing in Editor_state explicitly
  • [*] K2X6G75Z start writing some tests for drawings

Change contents

  • edit in drawing_tests.lua at line 233
    [4.113295]→[4.27565:27688](∅→∅),[4.113295]→[4.27565:27688](∅→∅)
    check_eq(Editor_state.lines[1].y, Editor_state.top+Editor_state.drawing_padding_top, 'F - test_draw_polygon/baseline/y')
  • resurrect zombie in drawing_tests.lua at line 234
    [3.3148]→[4.113425:113589](∅→∅),[4.27688]→[4.113425:113589](∅→∅),[4.113425]→[4.113425:113589](∅→∅),[4.27688]→[4.113425:113589](∅→∅)
    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')
  • replacement in drawing_tests.lua at line 237
    [2.4014]→[2.4014:4136](∅→∅)
    edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Editor_state.drawing_padding_top+36, 1)
    [2.4014]
    [2.4136]
    edit.run_after_mouse_press(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
  • edit in drawing_tests.lua at line 240
    [2.4209]→[2.4209:4333](∅→∅),[4.1489]→[3.3149:3256](∅→∅),[4.1489]→[3.3149:3256](∅→∅),[4.1489]→[3.3149:3256](∅→∅),[4.1634]→[3.3257:3337](∅→∅),[4.1634]→[3.3257:3337](∅→∅),[4.1634]→[3.3257:3337](∅→∅),[4.1763]→[3.3338:3449](∅→∅),[4.1763]→[3.3338:3449](∅→∅)
    edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Editor_state.drawing_padding_top+26, 1)
    edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
    App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)
    edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+26, 1)
  • resolve order conflict in drawing_tests.lua at line 240
    [2.4209]
  • edit in drawing_tests.lua at line 240
    [0.127]
    [4.113941]
    edit.run_after_mouse_release(Editor_state, Editor_state.left+55, Editor_state.top+Drawing_padding_top+26, 1)
  • edit in drawing_tests.lua at line 329
    [4.116845]→[3.4345:4454](∅→∅),[4.116845]→[3.4345:4454](∅→∅),[4.7901]→[3.4455:4564](∅→∅),[4.7901]→[3.4455:4564](∅→∅),[4.7901]→[3.4455:4564](∅→∅),[4.8058]→[3.4565:4645](∅→∅),[4.8058]→[3.4565:4645](∅→∅),[4.8058]→[3.4565:4645](∅→∅),[4.8194]→[3.4646:4726](∅→∅),[4.8194]→[3.4646:4726](∅→∅),[4.8194]→[3.4646:4726](∅→∅),[4.8358]→[3.4727:4838](∅→∅),[4.8358]→[3.4727:4838](∅→∅),[4.8358]→[3.4727:4838](∅→∅)
    check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_square/baseline/y')
    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+42, Editor_state.top+Drawing_padding_top+45)
    App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+66)
    edit.run_after_mouse_release(Editor_state, Editor_state.left+15, Editor_state.top+Drawing_padding_top+26, 1)
  • edit in drawing_tests.lua at line 507
    [4.3062]→[3.6808:6915](∅→∅),[4.3062]→[3.6808:6915](∅→∅),[4.3062]→[3.6808:6915](∅→∅),[4.3207]→[3.6916:6996](∅→∅),[4.3207]→[3.6916:6996](∅→∅),[4.3207]→[3.6916:6996](∅→∅),[4.3336]→[3.6997:7077](∅→∅),[4.3336]→[3.6997:7077](∅→∅),[4.3336]→[3.6997:7077](∅→∅),[4.3466]→[3.7078:7189](∅→∅),[4.3466]→[3.7078:7189](∅→∅),[4.3466]→[3.7078:7189](∅→∅),[4.3893]→[3.7190:7270](∅→∅),[4.3893]→[3.7190:7270](∅→∅),[4.3893]→[3.7190:7270](∅→∅),[4.4575]→[3.7271:7378](∅→∅),[4.4575]→[3.7271:7378](∅→∅),[4.4575]→[3.7271:7378](∅→∅),[4.4720]→[3.7379:7459](∅→∅),[4.4720]→[3.7379:7459](∅→∅),[4.4720]→[3.7379:7459](∅→∅),[4.4849]→[3.7460:7571](∅→∅),[4.4849]→[3.7460:7571](∅→∅),[4.4849]→[3.7460:7571](∅→∅),[4.5276]→[3.7572:7652](∅→∅),[4.5276]→[3.7572:7652](∅→∅),[4.5276]→[3.7572:7652](∅→∅)
    edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
    App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)
    App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+26)
    edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Drawing_padding_top+16, 1)
    App.mouse_move(Editor_state.left+35, Editor_state.top+Drawing_padding_top+26)
    edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
    App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)
    edit.run_after_mouse_release(Editor_state, Editor_state.left+14, Editor_state.top+Drawing_padding_top+16, 1)
    App.mouse_move(Editor_state.left+65, Editor_state.top+Drawing_padding_top+36)