# and ⎕SE are now accepted as targets

aplteam · Mar 13, 2024 · 97ef63d · 97ef63d
1 parent 611368d
commit 97ef63d
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 21 deletions.
diff --git a/APLSource/CodeCoverage.aplc b/APLSource/CodeCoverage.aplc
@@ -54,11 +54,13 @@
 
     ∇ r←Version
       :Access Public Shared
-      r←'CodeCoverage' '0.10.5+52' '2024-01-12'
+      r←'CodeCoverage' '0.10.6+52' '2024-03-13'
     ∇
 
     ∇ History
-      :Access Public Shared   
+      :Access Public Shared
+    ⍝ * 0.10.6 from 2024-01-30      
+    ⍝   * Neither `#` nor `⎕SE` were allowed 
     ⍝ * 0.10.5 from 2024-01-12
     ⍝   * Link to `Tester2` in the documentation corrected
     ⍝ * 0.10.4 from 2024-01-12
@@ -139,8 +141,10 @@
           'Must be character vector'⎕SIGNAL 11/⍨' '≠1↑0⍴v
           ('Has invalid characters',b/v)⎕SIGNAL 11/⍨∨/b←~v∊APL_Chars,',⎕#.'
           v2←','(≠⊆⊢),v
-          :If ∨/~b←0<⎕NC↑v2
-              11 ⎕SIGNAL⍨'Unknown names: ',⊃{⍺,',',⍵}/(~b)/v2
+          :If ~v2∊,¨'#' '⎕SE'
+              :If ∨/~b←0<⎕NC↑v2
+                  11 ⎕SIGNAL⍨'Unknown names: ',⊃{⍺,',',⍵}/(~b)/v2
+              :EndIf
           :EndIf
           _watch←v2
         ∇

diff --git a/APLSource/TestCases/Prepare.aplf b/APLSource/TestCases/Prepare.aplf
@@ -25,6 +25,7 @@
  :EndIf
  :If flag
      3 ⎕MKDIR testPath  ⍝
-     T.codeCoverage←⎕NEW CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
+      ⍝TODO⍝ T.codeCoverage←⎕NEW CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
+     T.codeCoverage←⎕NEW ##.CodeCoverage(,⊂'#')
      T.codeCoverage.filename←testFilename
  :EndIf
diff --git a/APLSource/TestCases/RunTests.aplf b/APLSource/TestCases/RunTests.aplf
@@ -6,11 +6,11 @@
  Prepare
  T.Run 1
  :If 0<≢T.codeCoverage
-     {}CodeCoverage.ProcessData T.codeCoverage.filename
+     {}##.CodeCoverage.ProcessData T.codeCoverage.filename
      option←'Type of code coverage report' 0 1 CommTools.Select'Overview' 'Verbose' 'None'
      :If 3>option
          verbose←2=option
-         htmlFilename←verbose CodeCoverage.CreateReport T.codeCoverage.filename
+         htmlFilename←verbose ##.CodeCoverage.CreateReport T.codeCoverage.filename
          ⎕←']Open file://',htmlFilename
      :EndIf
  :EndIf
diff --git a/APLSource/TestCases/Test_Misc_001.aplf b/APLSource/TestCases/Test_Misc_001.aplf
@@ -32,6 +32,6 @@
 
 ∆TidyUp:
  ⎕FUNTIE tno
- 1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+ 1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_002.aplf b/APLSource/TestCases/Test_Misc_002.aplf
@@ -29,6 +29,6 @@
 
 ∆TidyUp:
  ⎕FUNTIE tno
- 1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+ 1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_003.aplf b/APLSource/TestCases/Test_Misc_003.aplf
@@ -30,6 +30,6 @@
 
 ∆TidyUp:
  ⎕FUNTIE tno
- 1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+ 1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_004.aplf b/APLSource/TestCases/Test_Misc_004.aplf
@@ -14,6 +14,6 @@
  R←T._OK
 
 ∆TidyUp:
-1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_005.aplf b/APLSource/TestCases/Test_Misc_005.aplf
@@ -20,6 +20,6 @@
  R←T._OK
 
 ∆TidyUp:
-1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_006.aplf b/APLSource/TestCases/Test_Misc_006.aplf
@@ -23,6 +23,6 @@
  R←T._OK
 
 ∆TidyUp:
-1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_007.aplf b/APLSource/TestCases/Test_Misc_007.aplf
@@ -22,6 +22,6 @@
  R←T._OK
 
 ∆TidyUp:
-1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_008.aplf b/APLSource/TestCases/Test_Misc_008.aplf
@@ -22,6 +22,6 @@
  R←T._OK
 
 ∆TidyUp:
-1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_009.aplf b/APLSource/TestCases/Test_Misc_009.aplf
@@ -14,6 +14,6 @@
 
 ∆TidyUp:
  ⎕FUNTIE tno
- 1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
+ 1 Data.T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_011.aplf b/APLSource/TestCases/Test_Misc_011.aplf
@@ -0,0 +1,31 @@
+ R←Test_Misc_011(stopFlag batchFlag);⎕TRAP;filename;C;a;b;c;d;html
+⍝ Specify # as source
+ ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
+
+ R←T._Failed
+
+ filename←(739⌶0),'/CodeCoverage_Tests_',⊃⎕SI
+
+ C←⎕NEW ##.CodeCoverage(,⊂,'#')
+ C.filename←filename
+ C.Start ⍬
+
+ a←1
+ b←2
+ c←3
+ d←a+b+c
+
+ C.Stop ⍬
+ {}C.Finalise ⍬
+ →T.GoToTidyUp 3≠≢C.data
+
+ {}1 ##.CodeCoverage.ProcessDataAndCreateReport C.filename
+ html←⊃⎕NGET C.filename,'.html'
+ →T.GoToTidyUp 0=+/'>→[3] '⍷html
+
+ R←T._OK
+
+∆TidyUp:
+ ⎕ndelete C.filename,'.html'
+ Data.⎕EX'T'
+⍝Done
diff --git a/APLSource/ToDo.apla b/APLSource/ToDo.apla
@@ -0,0 +1,3 @@
+(
+ ''
+)
diff --git a/TestResults/CodeCoverage.cr b/TestResults/CodeCoverage.cr
diff --git a/TestResults/CodeCoverage.profile b/TestResults/CodeCoverage.profile
diff --git a/apl-package.json b/apl-package.json
@@ -19,5 +19,5 @@
   source: "APLSource/CodeCoverage.aplc",
   tags: "code-coverage,test-framework,unit-tests",
   userCommandScript: "",
-  version: "0.10.5+65",
+  version: "0.10.6+67",
 }
diff --git a/packages_dev/apl-buildlist.json b/packages_dev/apl-buildlist.json
@@ -1,8 +1,8 @@
 {
   packageID: [
-    "aplteam-Tester2-3.6.0",
+    "aplteam-Tester2-3.7.0",
     "aplteam-CommTools-1.7.1",
-    "aplteam-CodeCoverage-0.10.3",
+    "aplteam-CodeCoverage-0.10.5",
     "aplteam-APLTreeUtils2-1.3.1",
     "aplteam-IniFiles-5.0.3",
   ],

diff --git a/packages_dev/apl-dependencies.txt b/packages_dev/apl-dependencies.txt
@@ -1,4 +1,4 @@
 aplteam-APLTreeUtils2-1.3.1
-aplteam-Tester2-3.6.0
+aplteam-Tester2-3.7.0
 aplteam-CommTools-1.7.1
-aplteam-CodeCoverage-0.10.3
+aplteam-CodeCoverage-0.10.5
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    (
+     ''
+    )