Tests: Finish up RAMCard coverage

Also, make MultiSnap only take pictures if something changed and move
to a2dtest.

Author: inexorabletash

notes/testplan.md

@@ -882,7 +882,7 @@ For the following cases, open `/TESTS` and `/TESTS/FOLDER`:
 * Launch DeskTop. Using drag/drop, try to delete a GS/OS forked file. When the delete confirmation dialog is shown, click OK. When an alert is shown, click OK. Verify that the source window is updated.
 * Launch DeskTop. Using File > Delete try to delete a GS/OS forked file, where the containing window is visible. When the delete confirmation dialog is shown, click OK. When an alert is shown, click OK. Verify that the containing window is updated.
 
-## RAMCard - WIP in `tests/ramcard.lua` and `tests/no_ramcard.lua`
+## RAMCard - covered by `tests/ramcard*.lua` and `tests/progress_counts.lua`
 
 * Repeat the following:
   * For these permutations:

tests/close_window.lua

@@ -61,7 +61,7 @@ test.Step(
     a2d.InMouseKeysMode(function(m)
         m.MoveToApproximately(x, y)
         m.Click()
-        test.MultiSnap(10, "verify close animation ran")
+        a2dtest.MultiSnap(120, "verify close animation ran")
     end)
     a2d.CloseAllWindows()
 end)
@@ -73,7 +73,7 @@ test.Step(
 
     -- NOTE: This is extremely timing-sensitive
     a2d.OAShortcut("W", {no_wait=true})
-    test.MultiSnap(10, "verify close animation ran")
+    a2dtest.MultiSnap(120, "verify close animation ran")
 
     a2d.CloseAllWindows()
 end)
@@ -118,8 +118,8 @@ test.Step(
     a2d.CloseWindow()
 
     -- NOTE: This is extremely timing-sensitive
-    apple2.OAKey("W")
-    test.MultiSnap(8, "verify windows animates into volume icon")
+    a2d.OAShortcut("W", {no_wait=true})
+    a2dtest.MultiSnap(120, "verify windows animates into volume icon")
 
     a2d.WaitForRepaint()
     test.Snap("verify volume icon is selected")
@@ -135,8 +135,8 @@ test.Step(
     a2d.SelectAndOpen("SUBFOLDER")
 
     -- NOTE: This is extremely timing-sensitive
-    apple2.OAKey("W")
-    test.MultiSnap(32, "verify windows animates into folder icon")
+    a2d.OAShortcut("W", {no_wait=true})
+    a2dtest.MultiSnap(120, "verify windows animates into folder icon")
 
     a2d.WaitForRepaint()
     test.Snap("verify SUBFOLDER icon is selected")
@@ -155,8 +155,8 @@ test.Step(
     a2d.CycleWindows() -- put FOLDER on top
 
     -- NOTE: This is extremely timing-sensitive
-    apple2.OAKey("W")
-    test.MultiSnap(10, "verify windows animates into volume icon")
+    a2d.OAShortcut("W", {no_wait=true})
+    a2dtest.MultiSnap(120, "verify windows animates into volume icon")
 
     a2d.WaitForRepaint()
     test.Snap("verify volume icon is selected")

tests/control_panel.lua

@@ -74,11 +74,11 @@ test.Step(
   function()
     a2d.OpenPath("/A2.DESKTOP/APPLE.MENU/CONTROL.PANELS/CONTROL.PANEL")
     apple2.MoveMouse(apple2.SCREEN_WIDTH/2, apple2.SCREEN_HEIGHT/2)
-    a2d.OAShortcut("2")
+    a2d.OAShortcut("2", {no_wait=true})
     -- NOTE: Mouse shouldn't move at all, but POSMOUSE in emulators is sketch
-    test.MultiSnap(3, "verify mouse cursor doesn't move significantly")
-    a2d.OAShortcut("3")
-    test.MultiSnap(3, "verify mouse cursor doesn't move significantly")
-    a2d.OAShortcut("2")
-    test.MultiSnap(3, "verify mouse cursor doesn't move significantly")
+    a2dtest.MultiSnap(30, "verify mouse cursor doesn't move significantly")
+    a2d.OAShortcut("3", {no_wait=true})
+    a2dtest.MultiSnap(30, "verify mouse cursor doesn't move significantly")
+    a2d.OAShortcut("2", {no_wait=true})
+    a2dtest.MultiSnap(30, "verify mouse cursor doesn't move significantly")
 end)

tests/lib/a2d.lua

@@ -305,9 +305,11 @@ function a2d.ClearSelection()
   a2d.WaitForRepaint()
 end
 
-function a2d.DialogOK()
+function a2d.DialogOK(options)
   apple2.ReturnKey()
-  a2d.WaitForRepaint()
+  if not options or not options.no_wait then
+    a2d.WaitForRepaint()
+  end
 end
 
 function a2d.DialogCancel()
@@ -396,20 +398,29 @@ function a2d.CycleWindows()
   a2d.WaitForRepaint()
 end
 
-function a2d.AddShortcut(path)
+function a2d.AddShortcut(path, options)
   a2d.SelectPath(path)
   a2d.InvokeMenuItem(a2d.SHORTCUTS_MENU, a2d.SHORTCUTS_ADD_A_SHORTCUT)
+
+  if options then
+    if options.copy == "boot" then
+      a2d.OAShortcut("3")
+    elseif options.copy == "use" then
+      a2d.OAShortcut("4")
+    end
+  end
+
   a2d.DialogOK()
 end
 
-function a2d.CopySelectionTo(path)
+function a2d.CopySelectionTo(path, is_volume, options)
   -- Assert: there is a selection
   --[[
     But we don't know if it's 1 or more than 1 so we index
     from the bottom of the menu, which is a fixed number.
     TODO: Make this less hacky
   ]]--
-  a2d.InvokeMenuItem(a2d.FILE_MENU, -3)
+  a2d.InvokeMenuItem(a2d.FILE_MENU, is_volume and -2 or -3)
 
   --Automate file picker dialog
   apple2.ControlKey("D") -- Drives
@@ -419,13 +430,17 @@ function a2d.CopySelectionTo(path)
     apple2.ControlKey("O") -- Open
     a2d.WaitForRepaint()
   end
-  a2d.DialogOK()
-  emu.wait(10)
+  a2d.DialogOK(options)
+
+  if not options or not options.no_wait then
+    emu.wait(10)
+  end
 end
 
-function a2d.CopyPath(src, dst)
+function a2d.CopyPath(src, dst, options)
   a2d.SelectPath(src)
-  a2d.CopySelectionTo(dst)
+  local is_volume = not src:match("^/.*/")
+  a2d.CopySelectionTo(dst, is_volume, options)
 end
 
 --------------------------------------------------

tests/lib/a2dtest.lua

@@ -254,14 +254,18 @@ function a2dtest.ExpectAlertNotShowing()
   test.Expect(not a2dtest.IsAlertShowing(), "an alert should not be showing", nil, 1)
 end
 
-function a2dtest.WaitForAlert()
-  for i = 1, 30 do
+function a2dtest.WaitForAlert(options)
+  local timeout = 30
+  if options and options.timeout then
+    timeout = options.timeout
+  end
+  for i = 1, timeout do
     if a2dtest.IsAlertShowing() then
       return
     end
     emu.wait(1)
   end
-  test.Failure("Timeout (30s) waiting for alert")
+  test.Failure(string.format("Timeout (%ds) waiting for alert", timeout))
 end
 
 --------------------------------------------------
@@ -276,4 +280,18 @@ end
 
 --------------------------------------------------
 
+function a2dtest.MultiSnap(frames, opt_title)
+  local last = nil
+  for i=1,frames/2 do
+    local dhr = a2dtest.SnapshotDHRWithoutClock()
+    if not last or not a2dtest.CompareDHR(last, dhr) then
+      test.Snap(opt_title)
+      last = dhr
+    end
+    emu.wait(2/60)
+  end
+end
+
+--------------------------------------------------
+
 return a2dtest

tests/lib/test.lua

@@ -82,13 +82,6 @@ function test.Snap(opt_title)
   snap(opt_title)
 end
 
-function test.MultiSnap(frames, opt_title)
-  for i=1,frames do
-    snap(opt_title)
-    emu.wait(1/60)
-  end
-end
-
 --------------------------------------------------
 -- Expectations
 --------------------------------------------------

tests/open.lua

@@ -107,7 +107,7 @@ test.Step(
   function()
     a2d.SelectPath("/A2.DESKTOP")
     a2d.OAShortcut("O", {no_wait=true})
-    test.MultiSnap(12, "verify open animation starts at volume icon")
+    a2dtest.MultiSnap(120, "verify open animation starts at volume icon")
     a2d.CloseAllWindows()
     a2d.ClearSelection()
 end)

tests/progress_counts.lua

@@ -0,0 +1,44 @@
+--[[ BEGINCONFIG ========================================
+
+MODELARGS="-sl1 ramfactor -sl2 mouse -sl7 cffa2 -aux ext80"
+DISKARGS="-hard1 $HARDIMG -hard2 res/disk_a.2mg"
+
+======================================== ENDCONFIG ]]--
+
+test.Step(
+  "Copy progress of shortcut in root directory",
+  function()
+    -- configuration
+    a2d.ToggleOptionCopyToRAMCard()
+    a2d.CloseAllWindows()
+    a2d.Reboot()
+    a2d.WaitForCopyToRAMCard()
+
+    -- Copy to RAMDisk, (shortcut in root directory)
+    a2d.OpenPath("/A")
+    a2d.InvokeMenuItem(a2d.APPLE_MENU, a2d.RUN_BASIC_HERE)
+    a2d.WaitForRestart()
+    apple2.TypeLine("CREATE DUMMY,T$01")
+    apple2.TypeLine("BSAVE DUMMY,T$01,,A$2000,L123")
+    apple2.TypeLine("BYE")
+    a2d.WaitForRestart()
+    a2d.AddShortcut("/A/DUMMY", {copy="use"})
+    a2d.OAShortcut("1", {no_wait=true})
+    a2dtest.MultiSnap(120, "shortcut copy progress bottoms out at 0")
+    a2dtest.WaitForAlert()
+    a2d.DialogOK()
+
+    -- cleanup
+    a2d.EraseVolume("RAM1")
+    a2d.DeletePath("/A2.DESKTOP/LOCAL")
+    a2d.Reboot()
+end)
+
+test.Step(
+  "Copy progress of a volume",
+  function()
+    a2d.CopyPath("/A2.DESKTOP/READ.ME", "/A")
+    a2d.CopyPath("/A", "/RAM1", {no_wait=true})
+    emu.wait(20/60)
+    a2dtest.MultiSnap(120, "volume copy progress bottoms out at 0")
+end)

tests/ramcard.lua

@@ -5,14 +5,6 @@ DISKARGS="-hard1 $HARDIMG"
 
 ======================================== ENDCONFIG ]]--
 
-
---[[============================================================
-
-  "RAMCard" tests (poor naming)
-
-  ============================================================]]--
-
-
 function RenameTest(name, proc)
   test.Variants(
     {
@@ -185,4 +177,3 @@ RenameTest(
     a2d.DialogCancel()
     a2d.WaitForRepaint()
 end)
-

tests/ramcard_ejected.lua

@@ -0,0 +1,55 @@
+--[[ BEGINCONFIG ========================================
+
+MODEL="apple2cp"
+MODELARGS="-ramsize 1152K"
+DISKARGS="-flop3 $HARDIMG -flop1 res/prodos_floppy1.dsk"
+
+======================================== ENDCONFIG ]]--
+
+test.Step(
+  "Volume order",
+  function()
+    test.Snap("verify A2.DESKTOP volume in top right")
+
+    a2d.SelectPath("/A2.DESKTOP")
+    a2d.InvokeMenuItem(a2d.FILE_MENU, a2d.FILE_COPY_TO-4)
+    apple2.ControlKey("D") -- Drives
+    a2d.WaitForRepaint()
+
+    test.Snap("verify A2.DESKTOP volume is first")
+
+    a2d.DialogCancel()
+end)
+
+
+test.Step(
+  "Volume order when copied to RAMCard, ejected",
+  function()
+    a2d.ToggleOptionCopyToRAMCard() -- Enable
+    a2d.CloseAllWindows()
+    a2d.InvokeMenuItem(a2d.STARTUP_MENU, 2) -- Slot 5
+    emu.wait(240) -- copying from floppy is very slow
+
+    test.Snap("verify A2.DESKTOP volume in top right")
+
+    a2d.SelectPath("/A2.DESKTOP")
+    a2d.InvokeMenuItem(a2d.FILE_MENU, a2d.FILE_COPY_TO-4)
+    apple2.ControlKey("D") -- Drives
+    a2d.WaitForRepaint()
+
+    test.Snap("verify A2.DESKTOP volume is first")
+
+    a2d.DialogCancel()
+
+    a2d.OpenPath("/RAM4/DESKTOP/EXTRAS/BASIC.SYSTEM")
+    local drive = apple2.Get35Drive1()
+    local current = drive.filename
+    drive:unload()
+    apple2.TypeLine("BYE")
+    a2d.WaitForRestart()
+
+    test.Snap("verify volumes appear in order")
+
+    drive:load(current)
+end)
+