Tests amended

aplteam · aplteam · commit a7e5db58be6f · 2024-12-25T09:38:32.000+01:00
diff --git a/APLSource/TestCases/Test_Helpers_01.aplf b/APLSource/TestCases/Test_Helpers_01.aplf
@@ -1,5 +1,5 @@
  r←Test_Helpers_01(debugFlag batchFlag);⎕TRAP;list1;list2;list3
-⍝ Exercise `ListTestFunctions`.
+⍝ Exercise `ListTestFunctions` with a simple argumet
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
 
diff --git a/APLSource/TestCases/Test_Helpers_05.aplf b/APLSource/TestCases/Test_Helpers_05.aplf
@@ -1,5 +1,5 @@
- r←Test_Misc_18(debugFlag batchFlag);rc;list;tmp;expected;⎕TRAP;T2
-⍝ Exercise the `ListGroups` and the `ListTestFunctions` methods.
+ r←Test_Helpers_05(debugFlag batchFlag);rc;list;tmp;expected;⎕TRAP;T2
+⍝ Exercise the `ListTestFunctions` methods with wildcard argument
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
 
@@ -22,6 +22,5 @@
 ⍝ The tests
  →T.PassesIf(⊃⍴T2.ListTestFunctions'')=≢'T'tmp.⎕NL 3
  →T.PassesIf(+/'Test_Grp'{((≢⍺)↑[2]⍵)∧.=⍺}'T'tmp.⎕NL 3)=≢T2.ListTestFunctions'Grp*'
- →T.PassesIf 5=1↑⍴T2.ListGroups
 
  r←T._OK
diff --git a/APLSource/TestCases/Test_Helpers_06.aplf b/APLSource/TestCases/Test_Helpers_06.aplf
@@ -0,0 +1,30 @@
+ r←Test_Helpers_06(debugFlag batchFlag);rc;list;tmp;expected;⎕TRAP;T2;res
+⍝ Exercise the `ListTestFunctions` methods with multiple arguments
+ ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
+ r←T._Failed
+
+⍝ Pre-conditions
+ tmp←⎕NS''
+ tmp.⎕FX'r←Test_001 (x y)' '   ⍝ Comment: Test_001' 'r←0'
+ tmp.⎕FX'r←Test_002 (x y)' '   ⍝ Comment: Test_002' 'r←0'
+ tmp.⎕FX'r←Test_003 (x y)' '   ⍝ Comment: Test_003' 'r←0'
+ tmp.⎕FX'r←Test_Grp1_001 (x y)' '   ⍝ Comment: Grp1_001' 'r←0'
+ tmp.⎕FX'r←Test_Grp1_002 (x y)' '   ⍝ Comment: Grp1_002' 'r←0'
+ tmp.⎕FX'r←Test_Grp1_003 (x y)' '   ⍝ Comment: Grp1_003' 'r←0'
+ tmp.⎕FX'r←Test_Grp2_001 (x y)' '   ⍝ Comment: Grp2_001' 'r←0'
+ tmp.⎕FX'r←Test_Grp2_002 (x y)' '   ⍝ Comment: Grp2_002' 'r←0'
+ tmp.⎕FX'r←Test_Grp3_AAA_001 (x y)' '   ⍝ Comment: Grp3_AAA_001' 'r←0'
+ tmp.⎕FX'r←Test_Grp3_AAA_002 (x y)' '   ⍝ Comment: Grp3_AAA_002' 'r←0'
+ tmp.⎕FX'r←Test_Grp3_BBB_001 (x y)' '   ⍝ Comment: Grp3_BBB_001' 'r←0'
+ tmp.⎕FX'r←Test_Grp4_CCC_001 (x y)' '   ⍝ Comment: Grp4_CCC_001' 'r←0'
+ tmp.⎕FX'r←Test_Foo_001 (x y)' '   ⍝ Comment: Foo_001' 'r←0'
+ tmp.⎕FX'r←Test_Foo_002 (x y)' '   ⍝ Comment: Foo_002' 'r←0'
+ T2←⎕NEW ##.Tester2 tmp
+
+ res←T2.ListTestFunctions'Foo*,Grp*'
+ →T.PassesIf∧/'Comment:'∘{⍺≡(≢⍺)↑⍵}¨res[;2]
+ expected←'Test_Foo' 'Test_Grp1' 'Test_Grp2' 'Test_Grp3' 'Test_Grp4'
+ →T.PassesIf∧/({⍵↑⍨+/2>+\'_'=⍵}¨res[;1])∊expected
+
+
+ r←T._OK
diff --git a/APLSource/TestCases/Test_Helpers_07.aplf b/APLSource/TestCases/Test_Helpers_07.aplf
@@ -0,0 +1,28 @@
+ r←Test_Helpers_07(debugFlag batchFlag);rc;list;tmp;⎕TRAP;T2;res
+⍝ Exercise the `ListTestFunctions` methods with multiple arguments and a left argument
+ ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
+ r←T._Failed
+
+⍝ Pre-conditions
+ tmp←⎕NS''
+ tmp.⎕FX'r←Test_001 (x y)' '   ⍝ Comment: Test_001' 'r←0'
+ tmp.⎕FX'r←Test_002 (x y)' '   ⍝ Comment: Test_002' 'r←0'
+ tmp.⎕FX'r←Test_003 (x y)' '   ⍝ Comment: Test_003' 'r←0'
+ tmp.⎕FX'r←Test_Grp1_001 (x y)' '   ⍝ Comment: Grp1_001' 'r←0'
+ tmp.⎕FX'r←Test_Grp1_002 (x y)' '   ⍝ Comment: Grp1_002' 'r←0'
+ tmp.⎕FX'r←Test_Grp1_003 (x y)' '   ⍝ Comment: Grp1_003' 'r←0'
+ tmp.⎕FX'r←Test_Grp2_001 (x y)' '   ⍝ Comment: Grp2_001' 'r←0'
+ tmp.⎕FX'r←Test_Grp2_002 (x y)' '   ⍝ Comment: Grp2_002' 'r←0'
+ tmp.⎕FX'r←Test_Grp3_AAA_001 (x y)' '   ⍝ Comment: Grp3_AAA_001' 'r←0'
+ tmp.⎕FX'r←Test_Grp3_AAA_002 (x y)' '   ⍝ Comment: Grp3_AAA_002' 'r←0'
+ tmp.⎕FX'r←Test_Grp3_BBB_001 (x y)' '   ⍝ Comment: Grp3_BBB_001' 'r←0'
+ tmp.⎕FX'r←Test_Grp4_CCC_001 (x y)' '   ⍝ Comment: Grp4_CCC_001' 'r←0'
+ tmp.⎕FX'r←Test_Foo_001 (x y)' '   ⍝ Comment: Foo_001' 'r←0'
+ tmp.⎕FX'r←Test_Foo_002 (x y)' '   ⍝ Comment: Foo_002' 'r←0'
+ T2←⎕NEW ##.Tester2 tmp
+
+ res←2 T2.ListTestFunctions'Foo*,Grp*'
+ →T.PassesIf∧/'Comment:'∘{⍺≡(≢⍺)↑⍵}¨res[;2]
+ →T.PassesIf 2∧.=⊃∘APLTreeUtils2.ToNum¨{⍵↑⍨-¯1+'_'⍳⍨⌽⍵}¨res[;1]
+
+ r←T._OK
diff --git a/APLSource/TestCases/Test_Helpers_20.aplf b/APLSource/TestCases/Test_Helpers_20.aplf
@@ -1,4 +1,4 @@
- r←Test_Misc_20(debugFlag batchFlag);⎕TRAP;list
+ r←Test_Helpers_20(debugFlag batchFlag);⎕TRAP;list
 ⍝ Test whether local vars spreading over more than one line are handled correctly
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  r←T._Failed
diff --git a/APLSource/TestCases/Test_Misc_81.aplf b/APLSource/TestCases/Test_Misc_81.aplf
@@ -7,12 +7,12 @@
 
  Assert 0=≢#.TEMP.⎕NL 3
 
- ##.CommTools.YesOrNo_Answers←1 2⍴'Helpers@' 'N'
+ ##.CommTools.AddAutomation'YesOrNo' 'Helpers@' 'N'
  res←##.Tester2.EstablishHelpers #.TEMP
  →T.GoToTidyUp~0=≢res
  →T.GoToTidyUp 0≠≢#.TEMP.⎕NL 3
 
- ##.CommTools.YesOrNo_Answers←1 2⍴'Helpers@' 'Y'
+ 1 ##.CommTools.AddAutomation'YesOrNo' 'Helpers@' 'Y'
  res←##.Tester2.EstablishHelpers #.TEMP
  →T.GoToTidyUp 0=≢res
  →T.GoToTidyUp 3≠≢#.TEMP.⎕NL 3
diff --git a/APLSource/TestCases/Test_Stop_001.aplf b/APLSource/TestCases/Test_Stop_001.aplf
@@ -5,7 +5,7 @@
 
  T2←⎕NEW ##.Tester2 TestCasesSimu
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS'' ⋄ #.TEMP.success←0
- ##.CommTools.Select_Choices←1 2⍴'WhereToStop@' 1
+ ##.CommTools.AddAutomation'Select' 'WhereToStop@' 1
 
  ⎕TRAP←(⊂1001 'E' '→PassesIf ∆stop_before_test=⊃⎕lc ⋄ →⎕lc,#.TEMP.success←1'),⎕TRAP
  {}'?'T2.RunThese 1
diff --git a/APLSource/TestCases/Test_Stop_002.aplf b/APLSource/TestCases/Test_Stop_002.aplf
@@ -5,7 +5,7 @@
 
  T2←⎕NEW ##.Tester2 TestCasesSimu
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS'' ⋄ #.TEMP.success←0
- ##.CommTools.Select_Choices←1 2⍴'WhereToStop@' 2
+ ##.CommTools.AddAutomation'Select' 'WhereToStop@' 2
 
  ⎕TRAP←(⊂1001 'E' '→PassesIf ∆stop_before_initial_3=⊃⎕lc ⋄ →⎕lc,#.TEMP.success←1'),⎕TRAP
  {}'?'T2.RunThese 1
diff --git a/APLSource/TestCases/Test_Stop_003.aplf b/APLSource/TestCases/Test_Stop_003.aplf
@@ -5,7 +5,7 @@
 
  T2←⎕NEW ##.Tester2 TestCasesSimu
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS'' ⋄ #.TEMP.success←0
- ##.CommTools.Select_Choices←1 2⍴'WhereToStop@' 3
+ ##.CommTools.AddAutomation'Select' 'WhereToStop@' 3
 
  ⎕TRAP←(⊂1001 'E' '→PassesIf ∆stop_before_cleanup_2=⊃⎕lc ⋄ →⎕lc,#.TEMP.success←1'),⎕TRAP
  {}'?'T2.RunThese 1
diff --git a/APLSource/TestCases/Test_Stop_004.aplf b/APLSource/TestCases/Test_Stop_004.aplf
@@ -7,7 +7,7 @@
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
  #.TEMP.counter←0
  #.TEMP.labels←'∆stop_before_test' '∆stop_before_initial_1' '∆stop_before_initial_2' '∆stop_before_initial_3' '∆stop_before_initial_4'
- ##.CommTools.Select_Choices←1 2⍴'WhereToStop@' 4
+ ##.CommTools.AddAutomation'Select' 'WhereToStop@' 4
 
  ⎕TRAP←(⊂1001 'E' 'Assert (⊃⎕lc)∊{⍎¨(⎕nc ⍵)/⍵}#.TEMP.labels ⋄ #.TEMP.counter+←1 ⋄ →⎕lc'),⎕TRAP
  {}'?'T2.RunThese'Grouping'
diff --git a/APLSource/TestCases/Test_Stop_005.aplf b/APLSource/TestCases/Test_Stop_005.aplf
@@ -7,7 +7,7 @@
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
  #.TEMP.counter←0
  #.TEMP.labels←'∆stop_before_test' '∆stop_before_cleanup_1' '∆stop_before_cleanup_2'
- ##.CommTools.Select_Choices←1 2⍴'WhereToStop@' 5
+ ##.CommTools.AddAutomation'Select' 'WhereToStop@' 5
 
  ⎕TRAP←(⊂1001 'E' 'Assert (⊃⎕lc)∊{⍎¨(⎕nc ⍵)/⍵}#.TEMP.labels ⋄ #.TEMP.counter+←1 ⋄ →⎕lc'),⎕TRAP
  {}'?'T2.RunThese'Grouping'
diff --git a/APLSource/TestCases/Test_Stop_006.aplf b/APLSource/TestCases/Test_Stop_006.aplf
@@ -7,7 +7,7 @@
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
  #.TEMP.counter←0
  #.TEMP.labels←'∆stop_before_initial_1' '∆stop_before_initial_2' '∆stop_before_initial_3' '∆stop_before_initial_4' '∆stop_before_cleanup_1' '∆stop_before_cleanup_2'
- ##.CommTools.Select_Choices←1 2⍴'WhereToStop@' 6
+ ##.CommTools.AddAutomation'Select' 'WhereToStop@' 6
 
  ⎕TRAP←(⊂1001 'E' 'Assert (⊃⎕lc)∊{⍎¨(⎕nc ⍵)/⍵}#.TEMP.labels ⋄ #.TEMP.counter+←1 ⋄ →⎕lc'),⎕TRAP
  {}'?'T2.RunThese'Grouping'
diff --git a/APLSource/TestCases/Test_Stop_007.aplf b/APLSource/TestCases/Test_Stop_007.aplf
@@ -7,7 +7,7 @@
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
  #.TEMP.counter←0
  #.TEMP.labels←'∆stop_before_test' '∆stop_before_initial_1' '∆stop_before_initial_2' '∆stop_before_initial_3' '∆stop_before_initial_4' '∆stop_before_cleanup_1' '∆stop_before_cleanup_2'
- ##.CommTools.Select_Choices←1 2⍴'WhereToStop@' 7
+ ##.CommTools.AddAutomation'Select' 'WhereToStop@' 7
 
  ⎕TRAP←(⊂1001 'E' 'Assert (⊃⎕lc)∊{⍎¨(⎕nc ⍵)/⍵}#.TEMP.labels ⋄ #.TEMP.counter+←1 ⋄ →⎕lc'),⎕TRAP
  {}'?'T2.RunThese'Grouping'
diff --git a/APLSource/TestCases/Test_Stop_008.aplf b/APLSource/TestCases/Test_Stop_008.aplf
@@ -4,7 +4,7 @@
  r←T._Failed
 
  T2←⎕NEW ##.Tester2 TestCasesSimu
- ##.CommTools.Select_Choices←1 2⍴'WhereToStop@' 8
+ ##.CommTools.AddAutomation'Select' 'WhereToStop@' 8
 
  (rc log)←'?'T2.RunThese'Grouping'
  →T.PassesIf 0=rc
diff --git a/APLSource/Tester2.aplc b/APLSource/Tester2.aplc
@@ -19,13 +19,22 @@
 
     ⎕IO←1 ⋄ ⎕ML←1
 
-    ∇ r←Version
+    ∇ r←Version;buff;history;date
       :Access Public shared
-      r←'Tester2' '3.10.0' '2024-11-30'
+    ⍝ Returns the version number from the package config file
+    ⍝ See also `History`
+      buff←(⎕JSON⍠('Dialect' 'JSON5')⊢((⊃⊃⎕CLASS ⎕THIS).##).TatinVars.CONFIG).version
+      history←History
+      date←{⍵↑⍨¯1+⍵⍳' '}'⋄'{⍵↓⍨(≢⍺)+1⍳⍨⍺⍷⍵}history[1;]
+      r←'Tester2'buff date
+    ⍝Done
     ∇
 
     ∇ r←History
       :Access Public shared
+      ⍝ * 3.11.0 ⋄ 2024-12-25
+      ⍝   * `ListTestFunctions` enhanced
+      ⍝   * `Version` extracts the version number now from the package config file
       ⍝ * 3.10.0 ⋄ 2024-11-30
       ⍝   * Dependencies updated in order to make Tester2 ready for 20.0 (IniFiles)
       ⍝ * 3.9.1 ⋄ 2024-10-03
@@ -1353,11 +1362,13 @@
     ∇
 
     ∇ r←{x}ListTestFunctions groupName;r2;b;max;longestName;buff;numbers;view
-⍝ Returns a matrix with two columns with the names of all test cases in the first column and the
-⍝ first comment line in the second column.\\
-⍝ If `groupName` is not empty then it will return only the members of that group (case dependent) or,
+⍝ Returns a matrix with two columns:
+⍝ * `[;1]` Carries the names of all test cases
+⍝ * `[;2]` The first comment line\\
+⍝ If `groupName` is not empty, then it will return only the members of that group (case dependent) or,
 ⍝ if the expression carries a wildcard, all groups matching the given string.\\
 ⍝ `groupName` may or may not start with `Test_`.\\
+⍝ Since version 3.11.0 `groupName` can be a comma-separated list of group names.
 ⍝ If the optional left argument (`numbers`)" is defined only those numbers are returned.
       :Access Public Instance
       x←{(0<⎕NC ⍵):⍎⍵ ⋄ ⍬}'x'
@@ -1376,6 +1387,13 @@
       :EndIf
       r2←↓'Test_'{⍵⌿⍨((≢⍺)↑[2]⍵)∧.=⍺}'T'_ref.⎕NL 3
       :If 0≠≢groupName
+          :If ','∊groupName
+              groupName←','(≠⊆⊢)groupName
+              buff←x∘ListTestFunctions¨groupName
+              buff←(0<≢¨buff)/buff
+              r←⊃⍪/buff
+              :Return
+          :EndIf
           groupName←'Test_'{⍵↓⍨(≢⍺)×⍺≡(≢⍺)↑⍵}groupName
           groupName←'Test_'{((⍺≢(≢⍺)↑⍵)/⍺),⍵}groupName
           groupName,←('*'≠¯1↑groupName)/'_'
diff --git a/TestResults/CodeCoverage.cr b/TestResults/CodeCoverage.cr
diff --git a/TestResults/CodeCoverage.profile b/TestResults/CodeCoverage.profile

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- r←Test_Misc_20(debugFlag batchFlag);⎕TRAP;list`
	`1`	`+ r←Test_Helpers_20(debugFlag batchFlag);⎕TRAP;list`
`2`	`2`	`⍝ Test whether local vars spreading over more than one line are handled correctly`
`3`	`3`	`⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')`
`4`	`4`	`r←T._Failed`