QuitEvents fixed

aplteam · Mar 9, 2023 · ef7928d · ef7928d
1 parent 5a80008
commit ef7928d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/APLSource/Admin/Make.aplf b/APLSource/Admin/Make.aplf
@@ -3,10 +3,9 @@
      M←⎕SE.MakeHelpers
      C←##.CiderConfig
      path←C.HOME,'/Dist/'
-     version←M.CompileVersionNumberPattern C.HOME
+     cfg←M.GetPackageCfg C.HOME
+     version←M.CompileVersionNumberPattern cfg
      M.RecreateFolder path
-⍝    cfg←M.GetPackageCfg C.HOME
-⍝     M.CreateAPI refTosourceNS ##.T cfg.api
      zipFilename←⎕SE.Tatin.BuildPackage C.HOME path version
      ⎕←'*** New version build successfully:',M.CR,'   ',zipFilename
  :EndIf

diff --git a/APLSource/Tester2.aplc b/APLSource/Tester2.aplc
@@ -22,11 +22,14 @@
 
     ∇ r←Version
       :Access Public shared
-      r←'Tester2' '3.3.0+5' '2023-02-10'
+      r←'Tester2' '3.3.1+5' '2023-03-08'
     ∇
 
     ∇ History
       :Access Public shared
+      ⍝ * 3.3.1 ⋄ 2023-03-08
+      ⍝   * Bug fix: The QuitTests would not work with "Options > Disable traps in session" being ticked and
+      ⍝     therefore this is now temporarily disabled with 600⌶
       ⍝ * 3.3.0 ⋄ 2023-02-09
       ⍝   * Syntax of `RenameTestFnsTo` clarified and enhanced
       ⍝   * `EditTestFunctions` now accepts a trailing wildcard (*)
@@ -493,6 +496,10 @@
       ps.stopFlag←2⊥⌽buff
       ProcessTestCases _ref ps
      ∆GetOutOfHere:
+      :If 0<⎕NC'∆TRAPS_IN_SESSION'
+          {}600⌶∆TRAPS_IN_SESSION ⍝ Restore former setting
+          ⎕EX'∆TRAPS_IN_SESSION'
+      :EndIf
       :If ps.guiFlag
       :AndIf {6::1 ⋄ 0⊣⍵.Type}ps.ref2Gui.∆n.Form
           ⎕←'*** Tests cancelled'
@@ -925,11 +932,11 @@
     ⍝Done
     ∇
 
-    ∇ {r}←QuitTests
-    ⍝ Use this method to end running test cases prematurely but make sure that everything is tidied up,
-    ⍝ meaning that a `Cleanup` function (if any) is executed etc.\\
+    ∇ QuitTests;was
+    ⍝ Use this method to quit a test run prematurely and make sure that everything is tidied up,
+    ⍝ meaning that a `Cleanup` function (if any) is executed.\\
       :Access Public Instance
-      r←⍬
+      ∆TRAPS_IN_SESSION←600⌶0  ⍝ Enable traps in the session and save original setting
       ⎕SIGNAL QuitEvent
     ∇
 

diff --git a/apl-package.json b/apl-package.json
@@ -1 +1 @@
-{  api: "Tester2",  assets: "",  description: "Dyalog APL test framework",  documentation: "",  files: "",  group: "aplteam",  io: 1,  license: "MIT",  lx: "",  maintainer: "",  minimumAplVersion: "18.0",  ml: 1,  name: "Tester2",  os_lin: 0,  os_mac: 0,  os_win: 1,  project_url: "https://github.com/aplteam/Tester2",  source: "APLSource/Tester2.aplc",  tags: "test,test-framework",  userCommandScript: "",  version: "3.3.0+13",}
+{  api: "Tester2",  assets: "",  description: "Dyalog APL test framework",  documentation: "",  files: "",  group: "aplteam",  io: 1,  license: "MIT",  lx: "",  maintainer: "[email protected]",  minimumAplVersion: "18.0",  ml: 1,  name: "Tester2",  os_lin: 1,  os_mac: 1,  os_win: 1,  project_url: "https://github.com/aplteam/Tester2",  source: "APLSource/Tester2.aplc",  tags: "test,test-framework",  userCommandScript: "",  version: "3.3.1+16",}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ api: "Tester2", assets: "", description: "Dyalog APL test framework", documentation: "", files: "", group: "aplteam", io: 1, license: "MIT", lx: "", maintainer: "", minimumAplVersion: "18.0", ml: 1, name: "Tester2", os_lin: 0, os_mac: 0, os_win: 1, project_url: "https://github.com/aplteam/Tester2", source: "APLSource/Tester2.aplc", tags: "test,test-framework", userCommandScript: "", version: "3.3.0+13",}
		{ api: "Tester2", assets: "", description: "Dyalog APL test framework", documentation: "", files: "", group: "aplteam", io: 1, license: "MIT", lx: "", maintainer: "[email protected]", minimumAplVersion: "18.0", ml: 1, name: "Tester2", os_lin: 1, os_mac: 1, os_win: 1, project_url: "https://github.com/aplteam/Tester2", source: "APLSource/Tester2.aplc", tags: "test,test-framework", userCommandScript: "", version: "3.3.1+16",}
Expand Down