Tests: add test for window restoration

Author: inexorabletash

notes/testplan.md

@@ -762,7 +762,7 @@ For the following cases, open `/TESTS` and `/TESTS/FOLDER`:
 * Open a window. Drag the window so that the left edge of the window is offscreen. Verify that the "X Items" display gets cut off. Drag the window so that the right edge of the window is offscreen. Verify that the "XK available" display gets cut off. Repeat with the window sized so that both scrollbars appear and thumbs moved to the middle of the scrollbars.
 
 
-## Window Restoration
+## Window Restoration - mostly covered by `tests/window_restoration.lua`
 
 * Launch DeskTop. Open a subdirectory folder. Quit and relaunch DeskTop. Verify that the used/free numbers in the restored windows are non-zero.
 

tests/alerts.lua

@@ -22,7 +22,7 @@ test.Step(
   function()
     a2d.AddShortcut("/A2.DESKTOP/APPLE.MENU/CALCULATOR")
     a2d.ToggleOptionShowShortcutsOnStartup() -- Enable
-    a2d.Restart()
+    a2d.Reboot()
 
     apple2.Type("1")
     a2d.DialogOK()

tests/calendar.lua

@@ -17,7 +17,7 @@ end)
 test.Step(
   "Calendar - without real-time clock",
   function()
-    a2d.RemoveClockDriverAndRestart()
+    a2d.RemoveClockDriverAndReboot()
 
     a2d.OpenPath("/A2.DESKTOP/APPLE.MENU/CALENDAR")
     a2d.WaitForRepaint()

tests/control_panel_ramcard.lua

@@ -9,7 +9,7 @@ test.Step(
   "Settings saved back to boot volume",
   function()
     a2d.ToggleOptionCopyToRAMCard() -- enable
-    a2d.Restart()
+    a2d.Reboot()
 
     a2d.OpenPath("/A2.DESKTOP/APPLE.MENU/CONTROL.PANELS/CONTROL.PANEL")
     apple2.RightArrowKey()
@@ -18,7 +18,7 @@ test.Step(
     a2d.WaitForRepaint()
     a2d.CloseWindow()
     a2d.CloseAllWindows()
-    a2d.Restart()
+    a2d.Reboot()
 
     test.Snap("verify changed desktop is retained")
 end)

tests/date_and_time.lua

@@ -16,7 +16,7 @@ test.Step(
     a2dtest.ExpectFullRepaint(a2d.DialogOK)
     test.Snap("verify 24-hour format shown")
     a2d.CloseAllWindows()
-    a2d.Restart()
+    a2d.Reboot()
 end)
 
 test.Step(
@@ -75,7 +75,7 @@ test.Step(
     a2d.CloseAllWindows()
 end)
 
-a2d.RemoveClockDriverAndRestart()
+a2d.RemoveClockDriverAndReboot()
 
 test.Step(
   "Fresh disk image",
@@ -88,7 +88,7 @@ test.Step(
     test.Snap("verify dates now Today")
     a2d.SelectAndOpen("DATE.AND.TIME")
     a2dtest.ExpectMinimalRepaint(a2d.DialogOK)
-    a2d.Restart()
+    a2d.Reboot()
 end)
 
 test.Step(
@@ -104,7 +104,7 @@ test.Step(
     test.Snap("verify date is modified")
     a2d.DialogOK()
     -- Should write timestamp to DESKTOP.SYSTEM. Restart to verify.
-    a2d.Restart()
+    a2d.Reboot()
 
     -- Create new folder
     a2d.CreateFolder("/RAM1/NOT.TODAY")

tests/desk_accessories.lua

@@ -41,7 +41,7 @@ function MoveDoesntRepaintTest(name, path, x, y, opt_threshold)
 
       a2d.CloseWindow()
       a2d.CloseAllWindows()
-      a2d.Restart()
+      a2d.Reboot()
   end)
 end
 

tests/international.lua

@@ -6,7 +6,7 @@
   ============================================================]]--
 
 -- Remove clock driver (to avoid build-relative dates)
-a2d.RemoveClockDriverAndRestart()
+a2d.RemoveClockDriverAndReboot()
 
 test.Step(
   "International - full repaint",

tests/lib/a2d.lua

@@ -378,9 +378,9 @@ end
 -- Configuration
 --------------------------------------------------
 
-function a2d.RemoveClockDriverAndRestart()
+function a2d.RemoveClockDriverAndReboot()
   a2d.DeletePath("/A2.DESKTOP/CLOCK.SYSTEM")
-  a2d.Restart()
+  a2d.Reboot()
 end
 
 function a2d.ToggleOptionCopyToRAMCard()
@@ -396,8 +396,19 @@ function a2d.ToggleOptionShowShortcutsOnStartup()
   a2d.CloseAllWindows()
 end
 
+function a2d.Quit()
+  a2d.InvokeMenuItem(a2d.FILE_MENU, -1)
+  a2d.WaitForRestart()
+end
+
+function a2d.QuitAndRestart()
+  a2d.Quit()
+  apple2.ReturnKey() -- Launch PRODOS in Bitsy Bye
+  a2d.WaitForRestart()
+end
+
 -- Reboot via menu equivalent of PR#7
-function a2d.Restart()
+function a2d.Reboot()
   a2d.InvokeMenuItem(a2d.STARTUP_MENU, 1) -- startup volume index
   a2d.WaitForRestart()
 end
@@ -533,6 +544,16 @@ function a2d.GrowWindowBy(x, y)
   a2d.WaitForRepaint()
 end
 
+function a2d.DragSelectMultipleVolumes()
+  a2d.InMouseKeysMode(function(m)
+      m.MoveToApproximately(560,20)
+      m.ButtonDown()
+      m.MoveByApproximately(-80, 130)
+      m.ButtonUp()
+      a2d.WaitForRepaint()
+  end)
+end
+
 --------------------------------------------------
 -- Modifier Key Combos
 --------------------------------------------------

tests/lib/apple2.lua

@@ -814,7 +814,7 @@ function apple2.CompareDHR(bytes)
       local expected = bytes[row*80+col]
       local actual = apple2.GetDoubleHiresByte(row, col)
       if actual ~= expected then
-        print(string.format("difference at %04X - %02X vs. %02X", (row*80+col), actual, expected))
+        print(string.format("difference at row %d col %d - %02X vs. %02X", row, col, actual, expected))
         return false
       end
     end

tests/lib/test.lua

@@ -52,7 +52,7 @@ end
 -- test.Variants({"v1", "v2"}, function(idx) ... end}
 function test.Variants(t, func)
   for idx, name in pairs(t) do
-    test.Step(name, function() return func(idx) end)
+    test.Step(name, function() return func(idx, name) end)
   end
 end