Tests: More 'expect nothing happened' usage

Author: inexorabletash

tests/alerts.lua

@@ -10,11 +10,12 @@ test.Step(
   function()
     a2d.AddShortcut("/A2.DESKTOP/READ.ME")
     a2d.RenamePath("/A2.DESKTOP/READ.ME", "README")
-    a2d.OAShortcut("1")
-    test.Snap("verify alert shown")
-    apple2.EscapeKey()
-    a2d.WaitForRepaint()
-    test.Snap("verify alert dismissed")
+    a2dtest.ExpectNothingHappened(function()
+        a2d.OAShortcut("1")
+        test.Snap("verify alert shown")
+        apple2.EscapeKey()
+        a2d.WaitForRepaint()
+    end)
 end)
 
 test.Step(
@@ -24,12 +25,13 @@ test.Step(
     a2d.ToggleOptionShowShortcutsOnStartup() -- Enable
     a2d.Reboot()
 
-    apple2.Type("1")
-    a2d.DialogOK()
-    test.Snap("verify alert shown")
-    apple2.EscapeKey()
-    a2d.WaitForRepaint()
-    test.Snap("verify alert dismissed")
+    a2dtest.ExpectNothingHappened(function()
+        apple2.Type("1")
+        a2d.DialogOK()
+        test.Snap("verify alert shown")
+        apple2.EscapeKey()
+        a2d.WaitForRepaint()
+    end)
 
     apple2.Type("D") -- Desktop
     a2d.WaitForRestart()
@@ -84,8 +86,7 @@ test.Step(
         emu.wait(2/60)
         test.Snap("verify down on yes")
         m.MoveByApproximately(20, 20)
-        m.ButtonUp()
-        test.Snap("verify nothing happened")
+        a2dtest.ExpectNothingHappened(m.ButtonUp)
         m.MoveToApproximately(yes_x,btn_y)
         m.Click()
         emu.wait(5) -- allow copy to continue
@@ -95,8 +96,7 @@ test.Step(
         emu.wait(2/60)
         test.Snap("verify down on no")
         m.MoveByApproximately(20, 20)
-        m.ButtonUp()
-        test.Snap("verify nothing happened")
+        a2dtest.ExpectNothingHappened(m.ButtonUp)
         m.MoveToApproximately(yes_x,btn_y)
         m.Click()
         emu.wait(5) -- allow copy to continue
@@ -106,8 +106,7 @@ test.Step(
         emu.wait(2/60)
         test.Snap("verify down on all")
         m.MoveByApproximately(20, 20)
-        m.ButtonUp()
-        test.Snap("verify nothing happened")
+        a2dtest.ExpectNothingHappened(m.ButtonUp)
         m.MoveToApproximately(all_x,btn_y)
         m.Click()
         emu.wait(5) -- allow copy to continue

tests/close_all.lua

@@ -8,15 +8,19 @@
 test.Step(
   "Close all using modifier-click",
   function()
-    a2d.OpenPath("/A2.DESKTOP/EXTRAS", true) -- leave parent open
-    a2d.InMouseKeysMode(function(m)
-        m.MoveToApproximately(40, 26)
-        apple2.PressOA()
-        m.Click()
-        apple2.ReleaseOA()
+    a2dtest.ExpectNothingHappened(function()
+        a2d.ClearSelection()
+        a2d.OpenPath("/A2.DESKTOP/EXTRAS", true) -- leave parent open
+        a2d.InMouseKeysMode(function(m)
+            m.MoveToApproximately(40, 26)
+            apple2.PressOA()
+            m.Click()
+            apple2.ReleaseOA()
+            a2d.WaitForRepaint()
+            m.MoveToApproximately(0,0)
+        end)
+        a2d.ClearSelection()
     end)
-    a2d.WaitForRepaint()
-    test.Snap("verify all windows closed")
 end)
 
 test.Variants(
@@ -25,14 +29,17 @@ test.Variants(
     "Close all using shortcut - caps lock off",
   },
   function(idx)
-    a2d.OpenPath("/A2.DESKTOP/EXTRAS", true) -- leave parent open
-    if idx == 1 then
-      a2d.OASAShortcut("W")
-    else
-      a2d.OASAShortcut("w")
-    end
-    a2d.WaitForRepaint()
-    test.Snap("verify all windows closed")
+    a2d.ClearSelection()
+    a2dtest.ExpectNothingHappened(function()
+        a2d.OpenPath("/A2.DESKTOP/EXTRAS", true) -- leave parent open
+        if idx == 1 then
+          a2d.OASAShortcut("W")
+        else
+          a2d.OASAShortcut("w")
+        end
+        a2d.WaitForRepaint()
+        a2d.ClearSelection()
+    end)
 end)
 
 --[[

tests/date_and_time.lua

@@ -22,15 +22,20 @@ end)
 test.Step(
   "Escape and Return",
   function()
-    a2d.InvokeMenuItem(a2d.APPLE_MENU, a2d.CONTROL_PANELS)
-    a2d.SelectAndOpen("DATE.AND.TIME")
-    apple2.ReturnKey()
-    a2d.WaitForRepaint()
-    test.Snap("verify dialog closed")
-    a2d.SelectAndOpen("DATE.AND.TIME")
-    apple2.EscapeKey()
-    a2d.WaitForRepaint()
-    test.Snap("verify dialog closed")
+    a2d.SelectPath("/A2.DESKTOP/APPLE.MENU/CONTROL.PANELS/DATE.AND.TIME")
+
+    a2dtest.ExpectNothingHappened(function()
+        a2d.OpenSelection()
+        apple2.ReturnKey()
+        a2d.WaitForRepaint()
+    end)
+
+    a2dtest.ExpectNothingHappened(function()
+        a2d.OpenSelection()
+        apple2.EscapeKey()
+        a2d.WaitForRepaint()
+    end)
+
     a2d.CloseAllWindows()
 end)
 

tests/desk_accessories.lua

@@ -67,15 +67,19 @@ function CloseWindowTest(name, path, x, y)
   test.Step(
     name .. " closes on OA+W",
     function()
-      a2d.OpenPath(path)
-      a2d.OAShortcut("W")
-      a2d.WaitForRepaint()
-      test.Snap("verify window closed on OA+W")
-
-      a2d.OpenPath(path)
-      a2d.WaitForRepaint()
-      a2d.OAShortcut("w")
-      test.Snap("verify window closed on OA+w")
+      a2d.SelectPath(path)
+      a2dtest.ExpectNothingHappened(function()
+          a2d.OpenSelection()
+          a2d.OAShortcut("W")
+          a2d.WaitForRepaint()
+      end)
+
+      a2d.SelectPath(path)
+      a2dtest.ExpectNothingHappened(function()
+          a2d.OpenSelection()
+          a2d.WaitForRepaint()
+          a2d.OAShortcut("w")
+      end)
   end)
 end
 

tests/dos33_import.lua

@@ -17,8 +17,7 @@ test.Step(
   function()
     a2d.SelectAndOpen("DOS33.IMPORT")
     test.Snap("verify OK button is disabled ")
-    apple2.ReturnKey()
-    test.Snap("verify nothing happened")
+    a2dtest.ExpectNothingHappened(apple2.ReturnKey)
     apple2.DownArrowKey() -- select drive
     test.Snap("verify OK button is enabled")
     apple2.ReturnKey()
@@ -72,8 +71,7 @@ test.Step(
     apple2.DownArrowKey() -- select drive
     apple2.ReturnKey()
     emu.wait(10) -- floppy catalog
-    apple2.ReturnKey()
-    test.Snap("verify nothing happens")
+    a2dtest.ExpectNothingHappened(apple2.ReturnKey)
     apple2.DownArrowKey() -- select file
     apple2.ReturnKey()
     test.Snap("verify Import button flashes")

tests/image_preview.lua

@@ -10,19 +10,23 @@ apple2.SetMonitorType(apple2.MONITOR_TYPE_VIDEO7)
 test.Step(
   "Escape exits",
   function()
-    a2d.OpenPath("/A2.DESKTOP/SAMPLE.MEDIA/MONARCH")
-    apple2.EscapeKey()
-    a2d.WaitForRepaint()
-    test.Snap("verify preview exited")
+    a2d.SelectPath("/A2.DESKTOP/SAMPLE.MEDIA/MONARCH")
+    a2dtest.ExpectNothingHappened(function()
+        a2d.OpenSelection()
+        apple2.EscapeKey()
+        a2d.WaitForRepaint()
+    end)
 end)
 
 test.Step(
   "OA+W exits",
   function()
-    a2d.OpenPath("/A2.DESKTOP/SAMPLE.MEDIA/MONARCH")
-    a2d.OAShortcut("W")
-    a2d.WaitForRepaint()
-    test.Snap("verify preview exited")
+    a2d.SelectPath("/A2.DESKTOP/SAMPLE.MEDIA/MONARCH")
+    a2dtest.ExpectNothingHappened(function()
+        a2d.OpenSelection()
+        a2d.OAShortcut("W")
+        a2d.WaitForRepaint()
+    end)
 end)
 
 test.Step(

tests/lib/a2d.lua

@@ -274,8 +274,12 @@ function a2d.OpenPath(path, opt_leave_parent)
   end
 end
 
+function a2d.SplitPath(path)
+  return path:match("^(.*)/([^/]+)$")
+end
+
 function a2d.SelectPath(path)
-  local base, name = path:match("^(.*)/([^/]+)$")
+  local base, name = a2d.SplitPath(path)
   if base ~= "" then
     a2d.OpenPath(base)
   end
@@ -328,7 +332,7 @@ function a2d.CreateFolder(path)
   local name = path
   if path:match("/") then
     local base
-    base, name = path:match("^(.*)/([^/]+)$")
+    base, name = a2d.SplitPath(path)
     if base ~= "" then
       a2d.OpenPath(base)
     end

tests/lib/apple2.lua

@@ -819,7 +819,7 @@ end
 
 function apple2.GetDoubleHiresByte(row, col)
   local bank, addr = GetDHRByteAddress(row, col)
-  return apple2.ReadRAMDevice(addr + 0x10000 * (1-bank))
+  return apple2.ReadRAMDevice(addr + 0x10000 * (1-bank)) & 0x7F
 end
 
 function apple2.SetDoubleHiresByte(row, col, value)