Splitting stopFlag and debugFlag

aplteam · Oct 2, 2024 · 3fa4d28 · 3fa4d28
1 parent 0fd2ed4
commit 3fa4d28
Show file tree

Hide file tree

Showing 135 changed files with 448 additions and 333 deletions.
diff --git a/APLSource/TestCases/TestCasesSimu/Test_009.aplf b/APLSource/TestCases/TestCasesSimu/Test_009.aplf
@@ -1,4 +1,4 @@
- r←Test_009(stopFlag batchFlag);⎕TRAP
+ r←Test_009(debugFlag batchFlag);⎕TRAP
 ⍝ Does not execute in batch mode but fails otherwise
  r←1
  :If batchFlag

diff --git a/APLSource/TestCases/TestCasesSimu/Test_010.aplf b/APLSource/TestCases/TestCasesSimu/Test_010.aplf
@@ -1,4 +1,4 @@
- r←Test_010(stopFlag batchFlag);⎕TRAP
+ r←Test_010(debugFlag batchFlag);⎕TRAP
 ⍝ Does not execute in batch mode but is okay otherwise
  r←1
  :If batchFlag

diff --git a/APLSource/TestCases/TestCasesSimu/Test_2.aplf b/APLSource/TestCases/TestCasesSimu/Test_2.aplf
@@ -1,3 +1,3 @@
- r←Test_2(stopFlag batchFlag);⎕TRAP
+ r←Test_2(debugFlag batchFlag);⎕TRAP
 ⍝ Successful test case
  r←##.T._OK
diff --git a/APLSource/TestCases/TestCasesSimu/Test_Grouping_001.aplf b/APLSource/TestCases/TestCasesSimu/Test_Grouping_001.aplf
@@ -1,3 +1,3 @@
- r←Test_Grouping_001(stopFlag batchFlag);⎕TRAP
+ r←Test_Grouping_001(debugFlag batchFlag);⎕TRAP
 ⍝ Exercise just grouping [1]
  r←##.T._OK
diff --git a/APLSource/TestCases/TestCasesSimu/Test_Grouping_002.aplf b/APLSource/TestCases/TestCasesSimu/Test_Grouping_002.aplf
@@ -1,3 +1,3 @@
- r←Test_Grouping_002(stopFlag batchFlag);⎕TRAP
+ r←Test_Grouping_002(debugFlag batchFlag);⎕TRAP
 ⍝ Exercise just grouping [2]
  r←##.T._OK
diff --git a/APLSource/TestCases/TestCasesSimu/Test_Grouping_003.aplf b/APLSource/TestCases/TestCasesSimu/Test_Grouping_003.aplf
@@ -1,3 +1,3 @@
- r←Test_Grouping_003(stopFlag batchFlag);⎕TRAP
+ r←Test_Grouping_003(debugFlag batchFlag);⎕TRAP
 ⍝ Exercise just grouping [3]
  r←##.T._OK
diff --git a/APLSource/TestCases/TestCasesSimu/Test_Grp1_001.aplf b/APLSource/TestCases/TestCasesSimu/Test_Grp1_001.aplf
@@ -1,3 +1,3 @@
- r←Test_Grp1_001(stopFlag batchFlag);⎕TRAP
+ r←Test_Grp1_001(debugFlag batchFlag);⎕TRAP
 ⍝ First in Grp1
  r←##.T._OK
diff --git a/APLSource/TestCases/TestCasesSimu/Test_Grp1_002.aplf b/APLSource/TestCases/TestCasesSimu/Test_Grp1_002.aplf
@@ -1,3 +1,3 @@
- r←Test_Grp1_002(stopFlag batchFlag);⎕TRAP
+ r←Test_Grp1_002(debugFlag batchFlag);⎕TRAP
 ⍝ Second in Grp1
  r←##.T._OK
diff --git a/APLSource/TestCases/TestCasesSimu/Test_Grp1_003.aplf b/APLSource/TestCases/TestCasesSimu/Test_Grp1_003.aplf
@@ -1,3 +1,3 @@
- r←Test_Grp1_003(stopFlag batchFlag);⎕TRAP
+ r←Test_Grp1_003(debugFlag batchFlag);⎕TRAP
 ⍝ Third in Grp1
  r←##.T._OK
diff --git a/APLSource/TestCases/TestCasesSimu/Test_Grp2_001.aplf b/APLSource/TestCases/TestCasesSimu/Test_Grp2_001.aplf
@@ -1,3 +1,3 @@
- r←Test_Grp2_001(stopFlag batchFlag);⎕TRAP
+ r←Test_Grp2_001(debugFlag batchFlag);⎕TRAP
 ⍝ First in Grp2
  r←##.T._OK
diff --git a/APLSource/TestCases/TestCasesSimu/Test_Grp2_002.aplf b/APLSource/TestCases/TestCasesSimu/Test_Grp2_002.aplf
@@ -1,3 +1,3 @@
- r←Test_Grp2_002(stopFlag batchFlag);⎕TRAP
+ r←Test_Grp2_002(debugFlag batchFlag);⎕TRAP
 ⍝ Second in Grp2
  r←##.T._OK
diff --git a/APLSource/TestCases/TestGroupInits/Test_01.aplf b/APLSource/TestCases/TestGroupInits/Test_01.aplf
@@ -1,4 +1,4 @@
- r←Test_01(stopFlag batchFlag);⎕TRAP
+ r←Test_01(debugFlag batchFlag);⎕TRAP
 ⍝ Pro-forma test to make sure we have one test function that does not belong to a group
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._OK

diff --git a/APLSource/TestCases/TestGroupInits/Test_Foo_01.aplf b/APLSource/TestCases/TestGroupInits/Test_Foo_01.aplf
@@ -1,4 +1,4 @@
- r←Test_Foo_01(stopFlag batchFlag);⎕TRAP
+ r←Test_Foo_01(debugFlag batchFlag);⎕TRAP
 ⍝ Pro-forma test for the group `Foo`. Used to test the execution of `Initial_Foo` and `Cleanup_Foo`.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/TestGroupInits/Test_Misc_01.aplf b/APLSource/TestCases/TestGroupInits/Test_Misc_01.aplf
@@ -1,4 +1,4 @@
- r←Test_Misc_01(stopFlag batchFlag);⎕TRAP
+ r←Test_Misc_01(debugFlag batchFlag);⎕TRAP
 ⍝ Pro-forma test for the group `Misc`. Used to test the execution of `Initial_Misc` and `Cleanup_Misc`.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
 

diff --git a/APLSource/TestCases/TestGroupInits/Test_Misc_02.aplf b/APLSource/TestCases/TestGroupInits/Test_Misc_02.aplf
@@ -1,4 +1,4 @@
- r←Test_Misc_02(stopFlag batchFlag);⎕TRAP
+ r←Test_Misc_02(debugFlag batchFlag);⎕TRAP
 ⍝ Pro-forma test for the group `Misc`. Used to test the execution of `Initial_Misc` and `Cleanup_Misc`.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/TestGroupInits/Test_More_01.aplf b/APLSource/TestCases/TestGroupInits/Test_More_01.aplf
@@ -1,4 +1,4 @@
- r←Test_More_01(stopFlag batchFlag);⎕TRAP
+ r←Test_More_01(debugFlag batchFlag);⎕TRAP
 ⍝ Pro-forma test for the group `Foo`. Used to test the execution of `Initial_More`
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
 

diff --git a/APLSource/TestCases/TestGroupInits/Test_Other_01.aplf b/APLSource/TestCases/TestGroupInits/Test_Other_01.aplf
@@ -1,4 +1,4 @@
- r←Test_Other_01(stopFlag batchFlag);⎕TRAP
+ r←Test_Other_01(debugFlag batchFlag);⎕TRAP
 ⍝ Pro-forma test for the group `Other`. Used to test the execution of `Initial_Other` and `Cleanup_Other`.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
 

diff --git a/APLSource/TestCases/TestGroupInits/Test_Other_02.aplf b/APLSource/TestCases/TestGroupInits/Test_Other_02.aplf
@@ -1,4 +1,4 @@
- r←Test_Other_02(stopFlag batchFlag);⎕TRAP
+ r←Test_Other_02(debugFlag batchFlag);⎕TRAP
 ⍝ Pro-forma test for the group `Other`. Used to test the execution of `Initial_Other` and `Cleanup_Other`.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
 

diff --git a/APLSource/TestCases/TestGroupInits/Test_ZZZ_01.aplf b/APLSource/TestCases/TestGroupInits/Test_ZZZ_01.aplf
@@ -1,4 +1,4 @@
- r←Test_ZZZ_01(stopFlag batchFlag);⎕TRAP
+ r←Test_ZZZ_01(debugFlag batchFlag);⎕TRAP
 ⍝ Check whether there are any variables startting their names with `∆`: if so then `Cleanup*` function have not been executed.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Custom_01.aplf b/APLSource/TestCases/Test_Custom_01.aplf
@@ -1,4 +1,4 @@
- r←Test_Custom_01(stopFlag batchFlag);⎕TRAP;qdmx;i;T2
+ r←Test_Custom_01(debugFlag batchFlag);⎕TRAP;qdmx;i;T2
 ⍝ Exercise `custom_{n}` properties with invalid settings
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Custom_02.aplf b/APLSource/TestCases/Test_Custom_02.aplf
@@ -1,4 +1,4 @@
- r←Test_Custom_02(stopFlag batchFlag);⎕TRAP;qdmx;i;T2;noOfConstants
+ r←Test_Custom_02(debugFlag batchFlag);⎕TRAP;qdmx;i;T2;noOfConstants
 ⍝ Set all custom messages and then call `ListSymbolicNames`
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Custom_03.aplf b/APLSource/TestCases/Test_Custom_03.aplf
@@ -1,4 +1,4 @@
- r←Test_Custom_03(stopFlag batchFlag);⎕TRAP;qdmx;i;T2;log;rc
+ r←Test_Custom_03(debugFlag batchFlag);⎕TRAP;qdmx;i;T2;log;rc
 ⍝ Run a test suite that uses all custom messages
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
@@ -31,5 +31,4 @@
  →T.PassesIf 10 0 0 2 1 1 1 1 1 1 1 1≡∆GetTotals log
 
  r←T._OK
-
  ⍝Done
diff --git a/APLSource/TestCases/Test_Custom_04.aplf b/APLSource/TestCases/Test_Custom_04.aplf
@@ -1,4 +1,4 @@
- r←Test_Custom_04(stopFlag batchFlag);⎕TRAP;qdmx;i;T2;log;rc
+ r←Test_Custom_04(debugFlag batchFlag);⎕TRAP;qdmx;i;T2;log;rc
 ⍝ Run a test suite that uses some custom messages
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Custom_05.aplf b/APLSource/TestCases/Test_Custom_05.aplf
@@ -1,4 +1,4 @@
- r←Test_Custom_05(stopFlag batchFlag);⎕TRAP;qdmx;i;T2;log;rc
+ r←Test_Custom_05(debugFlag batchFlag);⎕TRAP;qdmx;i;T2;log;rc
 ⍝ Run a test suite that uses some custom messages with GUI
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
 

diff --git a/APLSource/TestCases/Test_Exec_01.aplf b/APLSource/TestCases/Test_Exec_01.aplf
@@ -1,4 +1,4 @@
- r←Test_Exec_01(stopFlag batchFlag);⎕TRAP;rc;log;QDMX
+ r←Test_Exec_01(debugFlag batchFlag);⎕TRAP;rc;log;QDMX
 ⍝ Test `exec_before_each_test` without a valid assignment.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Exec_02.aplf b/APLSource/TestCases/Test_Exec_02.aplf
@@ -1,4 +1,4 @@
- r←Test_Exec_02(stopFlag batchFlag);⎕TRAP;rc;log;QDMX
+ r←Test_Exec_02(debugFlag batchFlag);⎕TRAP;rc;log;QDMX
 ⍝ Test `exec_after_each_test` without a valid assignment.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Exec_10.aplf b/APLSource/TestCases/Test_Exec_10.aplf
@@ -1,4 +1,4 @@
- r←Test_Exec_10(stopFlag batchFlag);⎕TRAP;rc;log;QDMX
+ r←Test_Exec_10(debugFlag batchFlag);⎕TRAP;rc;log;QDMX
 ⍝ Test `exec_before_each_test` without returning a result
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Exec_11.aplf b/APLSource/TestCases/Test_Exec_11.aplf
@@ -1,4 +1,4 @@
- r←Test_Exec_11(stopFlag batchFlag);⎕TRAP;rc;log;QDMX
+ r←Test_Exec_11(debugFlag batchFlag);⎕TRAP;rc;log;QDMX
 ⍝ Test `exec_before_each_test` returning a result
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Exec_20.aplf b/APLSource/TestCases/Test_Exec_20.aplf
@@ -1,4 +1,4 @@
- r←Test_Exec_20(stopFlag batchFlag);⎕TRAP;rc;log;QDMX
+ r←Test_Exec_20(debugFlag batchFlag);⎕TRAP;rc;log;QDMX
 ⍝ Test `exec_after_each_test` without returning a result
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(888 'C' '→∆Error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_001.aplf b/APLSource/TestCases/Test_Group_001.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_001(stopFlag batchFlag);log;stopFlag;⎕TRAP;rc
+ r←Test_Group_001(debugFlag batchFlag);log;debugFlag;⎕TRAP;rc
 ⍝ Exercise the grouping mechanism with specific numbers
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_002.aplf b/APLSource/TestCases/Test_Group_002.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_002(stopFlag batchFlag);log;⎕TRAP;rc;T2
+ r←Test_Group_002(debugFlag batchFlag);log;⎕TRAP;rc;T2
 ⍝ Exercise the grouping mechanism without any specific numbers
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_003.aplf b/APLSource/TestCases/Test_Group_003.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_003(stopFlag batchFlag);log;⎕TRAP;rc;T2
+ r←Test_Group_003(debugFlag batchFlag);log;⎕TRAP;rc;T2
 ⍝ Exercise the grouping mechanism without any specific numbers (not even empty ones)
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_004.aplf b/APLSource/TestCases/Test_Group_004.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_004(stopFlag batchFlag);log;⎕TRAP;rc;T2
+ r←Test_Group_004(debugFlag batchFlag);log;⎕TRAP;rc;T2
 ⍝ Exercise `RunThese`: grouping mechanism but without any hits
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_006.aplf b/APLSource/TestCases/Test_Group_006.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_006(stopFlag batchFlag);ref;⎕TRAP;T2;names;res
+ r←Test_Group_006(debugFlag batchFlag);ref;⎕TRAP;T2;names;res
 ⍝ Exercise stop flags for test cases, Initial- and Cleanup functions  with `Run`; with a group.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_007.aplf b/APLSource/TestCases/Test_Group_007.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_007(stopFlag batchFlag);ref;⎕TRAP;T2;names;rc;log;parms
+ r←Test_Group_007(debugFlag batchFlag);ref;⎕TRAP;T2;names;rc;log;parms
 ⍝ Exercise stop flags for test cases, Initial- and Cleanup functions  with `RunGUI`; with a group in the GUI
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
@@ -22,7 +22,7 @@
 
  :Trap 1001
      parms←T2.CreateParms ⍬
-     parms.stopFlag←1
+     parms.stop←1
      (rc log)←parms T2.RunGUI'Foo'
      →T.FailsIf 1
  :Else
@@ -35,7 +35,7 @@
 
  :Trap 1001
      parms←T2.CreateParms ⍬
-     parms.stopFlag←2
+     parms.stop←2
      (rc log)←parms T2.RunGUI'Foo'
      →T.FailsIf 1
  :Else
@@ -47,7 +47,7 @@
 
  :Trap 1001
      parms←T2.CreateParms ⍬
-     parms.stopFlag←4
+     parms.stop←4
      (rc log)←parms T2.RunGUI'Foo'
      →T.FailsIf 1
  :Else
@@ -59,7 +59,7 @@
 
  :Trap 1001
      parms←T2.CreateParms ⍬
-     parms.stopFlag←3
+     parms.stop←3
      (rc log)←parms T2.RunGUI'Foo'
      →T.FailsIf 1
  :Else
@@ -71,7 +71,7 @@
 
  :Trap 1001
      parms←T2.CreateParms ⍬
-     parms.stopFlag←5
+     parms.stop←5
      (rc log)←parms T2.RunGUI'Foo'
      →T.FailsIf 1
  :Else
@@ -83,7 +83,7 @@
 
  :Trap 1001
      parms←T2.CreateParms ⍬
-     parms.stopFlag←7
+     parms.stop←7
      (rc log)←parms T2.RunGUI'Foo'
      →T.FailsIf 1
  :Else
@@ -95,7 +95,7 @@
 
  :Trap 1001
      parms←T2.CreateParms ⍬
-     parms.stopFlag←6
+     parms.stop←6
      (rc log)←parms T2.RunGUI'Foo'
      →T.FailsIf 1
  :Else

diff --git a/APLSource/TestCases/Test_Group_008.aplf b/APLSource/TestCases/Test_Group_008.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_008(stopFlag batchFlag);log;⎕TRAP;rc;T2
+ r←Test_Group_008(debugFlag batchFlag);log;⎕TRAP;rc;T2
 ⍝ Multiple groups
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
@@ -8,3 +8,4 @@
  →T.PassesIf∧/0<+/¨∨/¨'Test_Grouping_' 'Test_Grp2_'⍷¨⊂↑log
 
  r←T._OK
+⍝Done
diff --git a/APLSource/TestCases/Test_Group_009.aplf b/APLSource/TestCases/Test_Group_009.aplf
@@ -1,11 +1,11 @@
- r←Test_Group_009(stopFlag batchFlag);log;⎕TRAP;rc;T2;names
+ r←Test_Group_009(debugFlag batchFlag);log;⎕TRAP;rc;T2;names
 ⍝ Without multiple groups
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
 
  T2←⎕NEW ##.Tester2 TestCasesSimu
  (rc log)←T2.RunThese'~Grouping,Grp1'
  names←∆GetDetails log
- →T.PassesIf (,⊂'Grp1')≡∪(≢'test_')↓¨ 'Test_Grp1'∘{(≢⍺)↑⍵}¨names
+ →T.PassesIf(,⊂'Grp1')≡∪(≢'test_')↓¨'Test_Grp1'∘{(≢⍺)↑⍵}¨names
 
  r←T._OK
diff --git a/APLSource/TestCases/Test_Group_010.aplf b/APLSource/TestCases/Test_Group_010.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_010(stopFlag batchFlag);log;⎕TRAP;rc;T2;qdmx
+ r←Test_Group_010(debugFlag batchFlag);log;⎕TRAP;rc;T2;qdmx
 ⍝ RunThese with nested groups (illegal)
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_012.aplf b/APLSource/TestCases/Test_Group_012.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_012(stopFlag batchFlag);log;⎕TRAP;rc;T2;qdmx;names
+ r←Test_Group_012(debugFlag batchFlag);log;⎕TRAP;rc;T2;qdmx;names
 ⍝ Group definition that excludes all groups starting with "Gr" by a wildcard expression
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_014.aplf b/APLSource/TestCases/Test_Group_014.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_014(stopFlag batchFlag);log;⎕TRAP;rc;T2;qdmx;names;noOf
+ r←Test_Group_014(debugFlag batchFlag);log;⎕TRAP;rc;T2;qdmx;names;noOf
 ⍝ Group definition that specifies a wilcard expression and a specific test case
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_015.aplf b/APLSource/TestCases/Test_Group_015.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_015(stopFlag batchFlag);log;⎕TRAP;rc;T2;qdmx;names;noOf
+ r←Test_Group_015(debugFlag batchFlag);log;⎕TRAP;rc;T2;qdmx;names;noOf
 ⍝ Group definition that mixes "," (multiple groups) with "~" (without) and "*" (wildcard syntax)
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Group_016.aplf b/APLSource/TestCases/Test_Group_016.aplf
@@ -1,4 +1,4 @@
- r←Test_Group_016(stopFlag batchFlag);log;⎕TRAP;rc;T2;qdmx;names;noOf
+ r←Test_Group_016(debugFlag batchFlag);log;⎕TRAP;rc;T2;qdmx;names;noOf
 ⍝ Group definition that specifies three groups but in "wrong" order
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Helpers_01.aplf b/APLSource/TestCases/Test_Helpers_01.aplf
@@ -1,4 +1,4 @@
- r←Test_Helpers_01(stopFlag batchFlag);⎕TRAP;list1;list2;list3
+ r←Test_Helpers_01(debugFlag batchFlag);⎕TRAP;list1;list2;list3
 ⍝ Exercise `ListTestFunctions`.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Helpers_02.aplf b/APLSource/TestCases/Test_Helpers_02.aplf
@@ -1,4 +1,4 @@
- r←Test_Helpers_02(stopFlag batchFlag);⎕TRAP;list1;list
+ r←Test_Helpers_02(debugFlag batchFlag);⎕TRAP;list1;list
 ⍝ Exercise the `ListGroups` method.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed

diff --git a/APLSource/TestCases/Test_Helpers_03.aplf b/APLSource/TestCases/Test_Helpers_03.aplf
@@ -1,10 +1,10 @@
- r←Test_Helpers_03(stopFlag batchFlag);stopFlag;⎕TRAP;list1
+ r←Test_Helpers_03(debugFlag batchFlag);debugFlag;⎕TRAP;list1
 ⍝ Exercise the `EditTestFunctions` method.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
 
  :If 0  ⍝TODO⍝ Bring back once bug <02142> is fixed
      r←T._Inactive  ⍝ Because of bug <02142>
-     :return
+     :Return
  :EndIf
 
  :If batchFlag

diff --git a/APLSource/TestCases/Test_Helpers_04.aplf b/APLSource/TestCases/Test_Helpers_04.aplf
@@ -1,4 +1,4 @@
- r←Test_Helpers_04(stopFlag batchFlag);stopFlag;⎕TRAP;list1;expected;result
+ r←Test_Helpers_04(debugFlag batchFlag);debugFlag;⎕TRAP;list1;expected;result
 ⍝ Exercise the `ListSymbolicNames` method.
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
 

diff --git a/APLSource/TestCases/Test_IniFiles_01.aplf b/APLSource/TestCases/Test_IniFiles_01.aplf
@@ -1,4 +1,4 @@
- r←Test_IniFiles_01(stopFlag batchFlag);log;stopFlag;⎕TRAP;rc;ini;body;report;iniFilename;T2
+ r←Test_IniFiles_01(debugFlag batchFlag);log;debugFlag;⎕TRAP;rc;ini;body;report;iniFilename;T2
 ⍝ Exercise single INI file "testcase.ini"
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
@@ -12,7 +12,7 @@
  'TEMP'#.⎕NS''
  #.TEMP.T←⎕NEW ##.Tester2 #.TEMP
  #.TEMP.⎕EX'Test_000'
- body←⊂'r←Test_01(stopFlag batchFlag);⎕TRAP'
+ body←⊂'r←Test_01(debugFlag batchFlag);⎕TRAP'
  body,←⊂'⎕TRAP←(999 ''C'' ''∘∘∘ ⍝ Deliberate error'')(0 ''N'')'
  body,←⊂'r←T._Failed'
  body,←⊂'→T.FailsIf 2≠T.INI.⎕NC''foo'''

diff --git a/APLSource/TestCases/Test_IniFiles_02.aplf b/APLSource/TestCases/Test_IniFiles_02.aplf
@@ -1,4 +1,4 @@
- r←Test_IniFiles_02(stopFlag batchFlag);log;stopFlag;⎕TRAP;rc;ini;body;report;iniFilename
+ r←Test_IniFiles_02(debugFlag batchFlag);log;debugFlag;⎕TRAP;rc;ini;body;report;iniFilename
 ⍝ Exercise test case with a two INI files: "testcases.ini" & "testcases_{computername}.ini"
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
@@ -11,7 +11,7 @@
  #.⎕SHADOW'TEMP'
  'TEMP'#.⎕NS''
  #.TEMP.T←⎕NEW ##.Tester2 #.TEMP
- body←⊂'r←Test_02(stopFlag batchFlag);⎕TRAP'
+ body←⊂'r←Test_02(debugFlag batchFlag);⎕TRAP'
  body,←⊂'⎕TRAP←(999 ''C'' ''∘∘∘ ⍝ Deliberate error'')(0 ''N'')'
  body,←⊂'r←T._Failed'
  body,←⊂'→T.FailsIf 2≠T.INI.⎕NC''foo'''