Skip to content

Commit 311db5c

Browse files
Tests: Don't need to shell out to delete now
1 parent d4ab73f commit 311db5c

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

tests/lib/a2d.lua

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -363,42 +363,39 @@ end
363363
--------------------------------------------------
364364

365365
function a2d.RemoveClockDriverAndRestart()
366-
a2d.OpenPath("/A2.DESKTOP/EXTRAS/BASIC.SYSTEM")
367-
a2d.WaitForRestart()
368-
apple2.TypeLine("DELETE /A2.DESKTOP/CLOCK.SYSTEM")
369-
apple2.TypeLine("PR#7")
370-
a2d.WaitForRestart()
366+
a2d.DeletePath("/A2.DESKTOP/CLOCK.SYSTEM")
367+
a2d.Restart()
371368
end
372369

373370
function a2d.ToggleOptionCopyToRAMCard()
374-
a2d.OpenPath("/A2.DESKTOP/APPLE.MENU/CONTROL.PANELS/OPTIONS")
375-
a2d.OAShortcut("1") -- Toggle "Copy to RAMCard"
376-
a2d.CloseWindow()
377-
a2d.CloseAllWindows()
371+
a2d.OpenPath("/A2.DESKTOP/APPLE.MENU/CONTROL.PANELS/OPTIONS")
372+
a2d.OAShortcut("1") -- Toggle "Copy to RAMCard"
373+
a2d.CloseWindow()
374+
a2d.CloseAllWindows()
378375
end
379376
function a2d.ToggleOptionShowShortcutsOnStartup()
380-
a2d.OpenPath("/A2.DESKTOP/APPLE.MENU/CONTROL.PANELS/OPTIONS")
381-
a2d.OAShortcut("2") -- Toggle "Show shortcuts on startup"
382-
a2d.CloseWindow()
383-
a2d.CloseAllWindows()
377+
a2d.OpenPath("/A2.DESKTOP/APPLE.MENU/CONTROL.PANELS/OPTIONS")
378+
a2d.OAShortcut("2") -- Toggle "Show shortcuts on startup"
379+
a2d.CloseWindow()
380+
a2d.CloseAllWindows()
384381
end
385382

386383
-- Reboot via menu equivalent of PR#7
387384
function a2d.Restart()
388-
a2d.InvokeMenuItem(a2d.STARTUP_MENU, 1) -- startup volume index
389-
a2d.WaitForRestart()
385+
a2d.InvokeMenuItem(a2d.STARTUP_MENU, 1) -- startup volume index
386+
a2d.WaitForRestart()
390387
end
391388

392389
--------------------------------------------------
393390
-- Mouse Keys
394391
--------------------------------------------------
395392

396393
function a2d.EnterMouseKeysMode()
397-
a2d.OASAShortcut(" ")
394+
a2d.OASAShortcut(" ")
398395
end
399396

400397
function a2d.ExitMouseKeysMode()
401-
apple2.EscapeKey()
398+
apple2.EscapeKey()
402399
end
403400

404401
function a2d.InMouseKeysMode(func)

0 commit comments

Comments
 (0)