Tests: Let --only specify a pattern; helpers for window grow/move

Author: inexorabletash

bin/mametest

@@ -6,7 +6,7 @@
 #
 # Options
 #
-#    --only NAME         Run only the named test step
+#    --only PATTERN      Run only matching named test steps (wildcards * and ?)
 #    --visible           Don't run headless (i.e. do present video)
 #    --audible           Don't run silent (i.e. do present audio)
 #    --nosnaps           Don't show snapshots once tests are complete

tests/README.md

@@ -16,7 +16,7 @@ bin/mametest tests/SCRIPTNAME.lua
 
 Options:
 
-* `--only NAME` - run only the named test step; useful for fast iteration
+* `--only PATTERN` - run only matching named test step (`*` and `?` are wildcards); useful for fast iteration
 * `--console` - don't ask MAME to run the script (but do load its config, see below), launch the Lua console instead
 * `--visible` - show the emulator window (default is headless)
 * `--audible` - play the emulator audio (default is silent)

tests/date_and_time.lua

@@ -327,13 +327,8 @@ test.Step(
     -- Show window and resize/move it
     a2d.OpenPath("/RAM1")
     a2d.InvokeMenuItem(a2d.VIEW_MENU, a2d.VIEW_BY_NAME)
-    a2d.OAShortcut("G") -- grow window
-    for i=1,35 do apple2.RightArrowKey() end
-    apple2.ReturnKey()
-    a2d.OAShortcut("M") -- move window
-    for i=1,25 do apple2.DownArrowKey() end
-    apple2.ReturnKey()
-    a2d.WaitForRepaint()
+    a2d.GrowWindowBy(250,0)
+    a2d.MoveWindowBy(0,100)
     test.Snap("verify date is shown in full")
 
     -- Use Date & Time to set date

tests/lib/a2d.lua

@@ -338,6 +338,7 @@ function a2d.InMouseKeysMode(func)
       ButtonUp = a2d.MouseKeysButtonUp,
       Click = a2d.MouseKeysClick,
       DoubleClick = a2d.MouseKeysDoubleClick,
+      OAClick = a2d.MouseKeysOAClick,
 
       Up = a2d.MouseKeysUp,
       Down = a2d.MouseKeysDown,
@@ -366,6 +367,14 @@ function a2d.MouseKeysClick()
   emu.wait(1/60)
 end
 
+function a2d.MouseKeysOAClick()
+  apple2.PressOA()
+  emu.wait(1/60)
+  a2d.MouseKeysClick()
+  emu.wait(1/60)
+  apple2.ReleaseOA()
+end
+
 function a2d.MouseKeysUp(n)
   for i=1,n do
     apple2.UpArrowKey()
@@ -427,6 +436,20 @@ function a2d.MouseKeysMoveByApproximately(x,y)
   end
 end
 
+function a2d.MoveWindowBy(x, y)
+  a2d.OAShortcut("M")
+  a2d.MouseKeysMoveByApproximately(x,y)
+  apple2.ReturnKey()
+  a2d.WaitForRepaint()
+end
+
+function a2d.GrowWindowBy(x, y)
+  a2d.OAShortcut("G")
+  a2d.MouseKeysMoveByApproximately(x,y)
+  apple2.ReturnKey()
+  a2d.WaitForRepaint()
+end
+
 --------------------------------------------------
 -- Modifier Key Combos
 --------------------------------------------------

tests/lib/test.lua

@@ -7,6 +7,20 @@
 local test = {}
 
 local test_name = emu.subst_env("$TEST_NAME")
+-- Convert from "wildcard" pattern (with * and ?) to Lua pattern
+local test_pattern = "^" ..
+  string.gsub(
+    test_name, "([%^$()%%.%[%]*+%-?])", -- pattern special characters
+    function(s)
+      if s == "*" then
+        return ".*"
+      elseif s == "?" then
+        return "."
+      else
+        return "%" .. s
+      end
+  end) .. "$"
+
 test.count = 0
 
 local snapnum = -1
@@ -23,7 +37,7 @@ end
 
 -- test.Step("do a thing", function() ... end)
 function test.Step(title, func)
-  if test_name ~= "" and test_name ~= title then
+  if test_name ~= "" and not string.match(title, test_pattern) then
     return
   end
   test.count = test.count+1