Tests: Various automations and de-duping

Also fix SetProDOSDate bit shifting

Author: inexorabletash

tests/calendar.lua

@@ -17,12 +17,7 @@ end)
 test.Step(
   "Calendar - without real-time clock",
   function()
-    -- Remove clock driver
-    a2d.OpenPath("/A2.DESKTOP/EXTRAS/BASIC.SYSTEM")
-    a2d.WaitForRestart()
-    apple2.TypeLine("DELETE /A2.DESKTOP/CLOCK.SYSTEM")
-    apple2.TypeLine("PR#7")
-    a2d.WaitForRestart()
+    RemoveClockDriverAndRestart()
 
     a2d.OpenPath("/A2.DESKTOP/APPLE.MENU/CALENDAR")
     a2d.WaitForRepaint()

tests/configs/iic4.lua

@@ -6,8 +6,6 @@ DISKARGS="-flop1 $FLOP1IMG"
 
 ======================================== ENDCONFIG ]]--
 
-emu.wait(50) -- IIc emulation is very slow
-
 test.Step(
   "Apple > About This Apple II",
   function()

tests/configs/iicplus.lua

@@ -6,8 +6,6 @@ DISKARGS="-flop3 $HARDIMG"
 
 ======================================== ENDCONFIG ]]--
 
-emu.wait(50) -- IIc emulation is very slow
-
 test.Step(
   "Apple > About This Apple II",
   function()

tests/control_panel.lua

@@ -6,8 +6,6 @@ DISKARGS="-flop3 $HARDIMG"
 
 ======================================== ENDCONFIG ]]--
 
-emu.wait(50) -- IIc emulation is very slow
-
 test.Step(
   "custom and default pattern",
   function()

tests/date_and_time.lua

@@ -77,12 +77,7 @@ test.Step(
     a2d.CloseAllWindows()
 end)
 
--- Remove clock driver
-a2d.OpenPath("/A2.DESKTOP/EXTRAS/BASIC.SYSTEM")
-a2d.WaitForRestart()
-apple2.TypeLine("DELETE /A2.DESKTOP/CLOCK.SYSTEM")
-apple2.TypeLine("PR#7")
-a2d.WaitForRestart()
+RemoveClockDriverAndRestart()
 
 test.Step(
   "Fresh disk image",

tests/international.lua

@@ -6,11 +6,7 @@
   ============================================================]]--
 
 -- Remove clock driver (to avoid build-relative dates)
-a2d.OpenPath("/A2.DESKTOP/EXTRAS/BASIC.SYSTEM")
-a2d.WaitForRestart()
-apple2.TypeLine("DELETE /A2.DESKTOP/CLOCK.SYSTEM")
-apple2.TypeLine("PR#7")
-a2d.WaitForRestart()
+RemoveClockDriverAndRestart()
 
 test.Step(
   "International - full repaint",

tests/key_caps_apple2c.lua

@@ -6,8 +6,6 @@ DISKARGS="-flop1 $FLOP1IMG -flop2 $FLOP2IMG"
 
 ======================================== ENDCONFIG ]]--
 
-emu.wait(50) -- IIc emulation is very slow
-
 test.Step(
   "Key Caps - Apple IIc",
   function()

tests/key_caps_apple2cp.lua

@@ -6,8 +6,6 @@ DISKARGS="-flop3 $HARDIMG"
 
 ======================================== ENDCONFIG ]]--
 
-emu.wait(50) -- IIc emulation is very slow
-
 test.Step(
   "Key Caps - Apple IIc+",
   function()

tests/lib/a2d.lua

@@ -81,7 +81,12 @@ function a2d.WaitForCopyToRAMCard()
 end
 
 function a2d.WaitForRestart()
-  emu.wait(10)
+  if manager.machine.system.name:match("^apple2c") then
+    -- Apple IIc drive emulation is very slow
+    emu.wait(50)
+  else
+    emu.wait(10)
+  end
 end
 
 function a2d.WaitForRepaint()
@@ -353,6 +358,18 @@ function a2d.CopyPath(src, dst)
   a2d.CopyTo(dst)
 end
 
+--------------------------------------------------
+-- Configuration
+--------------------------------------------------
+
+function RemoveClockDriverAndRestart()
+  a2d.OpenPath("/A2.DESKTOP/EXTRAS/BASIC.SYSTEM")
+  a2d.WaitForRestart()
+  apple2.TypeLine("DELETE /A2.DESKTOP/CLOCK.SYSTEM")
+  apple2.TypeLine("PR#7")
+  a2d.WaitForRestart()
+end
+
 --------------------------------------------------
 -- Mouse Keys
 --------------------------------------------------
@@ -519,7 +536,7 @@ end
 --------------------------------------------------
 
 function a2d.SetProDOSDate(y,m,d)
-  local hi = (y % 100) << 1 | (m >> 4)
+  local hi = (y % 100) << 1 | (m >> 3)
   local lo = (m << 5) | d
   apple2.WriteRAMDevice(0xBF90, lo)
   apple2.WriteRAMDevice(0xBF91, hi)

tests/options.lua

@@ -6,8 +6,6 @@ DISKARGS="-flop3 $HARDIMG"
 
 ======================================== ENDCONFIG ]]--
 
-emu.wait(50) -- IIc emulation is very slow
-
 test.Step(
   "No prompt if no change",
   function()