Fix for #14

aplteam · Jun 5, 2024 · 3320c55 · 3320c55
1 parent 97ef63d
commit 3320c55
Show file tree

Hide file tree

Showing 19 changed files with 7,264 additions and 37 deletions.
diff --git a/APLSource/CodeCoverage.aplc b/APLSource/CodeCoverage.aplc
@@ -54,13 +54,17 @@
 
     ∇ r←Version
       :Access Public Shared
-      r←'CodeCoverage' '0.10.6+52' '2024-03-13'
+      r←'CodeCoverage' '0.10.7+52' '2024-06-05'
     ∇
 
     ∇ History
       :Access Public Shared
-    ⍝ * 0.10.6 from 2024-01-30      
-    ⍝   * Neither `#` nor `⎕SE` were allowed 
+    ⍝ * 0.10.7 from 2024-06-05 
+    ⍝   * Bug fixes
+    ⍝     * A comma-separated list as argument to ⎕NEW caused a LENGTH ERROR
+    ⍝     * CodeCoverage tests attempted to act on itself - that cannot work properly because the tests overwrite ⎕PROFILE
+    ⍝ * 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
@@ -141,7 +145,7 @@
           'Must be character vector'⎕SIGNAL 11/⍨' '≠1↑0⍴v
           ('Has invalid characters',b/v)⎕SIGNAL 11/⍨∨/b←~v∊APL_Chars,',⎕#.'
           v2←','(≠⊆⊢),v
-          :If ~v2∊,¨'#' '⎕SE'
+          :If ~∧/v2∊,¨'#' '⎕SE'
               :If ∨/~b←0<⎕NC↑v2
                   11 ⎕SIGNAL⍨'Unknown names: ',⊃{⍺,',',⍵}/(~b)/v2
               :EndIf
@@ -419,7 +423,7 @@
     ⍝ again, for example.
       :Access Public Instance
       r←⍬
-      {Stop ⍵}⍣(~⊃∆STOPPED)⊣⍬
+      0 0⍴{Stop ⍵}⍣(~⊃∆STOPPED)⊣⍬
       _data←_data[;1]{(⊃⍺)(∪⊃,/⍵)}⌸_data[;2]
       names←CollectDataForCoverageReport _watch
       details←0 4⍴⍬
@@ -568,7 +572,7 @@
       :If ⎕NEXISTS cr.filename
           cr.tno←cr.filename ⎕FTIE 0
           cr.names←⎕FREAD cr.tno,1
-          ⎕←'tied ',cr.filename,' for listings'
+          ⎕←'Tied ',cr.filename,' for listings'
       :Else
           ⎕←'Did not find file "',cr.filename,'" with CRs collected by fn "Finalize" - will try to work without it'
           cr.tno←0

diff --git a/APLSource/TestCases/Assert.aplf b/APLSource/TestCases/Assert.aplf
@@ -0,0 +1 @@
+Assert←{⍺←'' ⋄ (,1)≡,⍵:r←1 ⋄ ⎕ML←1 ⋄ ⍺ ⎕SIGNAL 1↓(⊃∊⍵),11}
diff --git a/APLSource/TestCases/Prepare.aplf b/APLSource/TestCases/Prepare.aplf
@@ -8,24 +8,29 @@
  T←⎕NEW Tester2 ⎕THIS
  testPath←##.CiderConfig.HOME,'/TestResults'
  testFilename←testPath,'/CodeCoverage'
- flag←0
- :If ⎕NEXISTS testPath
-     :If ⎕NEXISTS testFilename,'.profile'
-         ind←('Code Coverage' 0 1)CommTools.Select'Append' 'Replace' 'Neither'
-         →(3=ind)/0
-         flag←1
-         :If 2=ind
-             1 CodeCoverage.DeleteFiles testFilename
+ :If 0
+ ⍝ We cannot use CodeCoverage on its own test cases yet, because the tests would overwrite
+ ⍝ ⎕PROFILE data over and over again, leaving hardly anything useful at the end. For that to
+ ⍝ work every single test case that is using ⎕PROIFLE data needs to be executed in its own
+ ⍝ APL thread.
+     flag←0
+     :If ⎕NEXISTS testPath
+         :If ⎕NEXISTS testFilename,'.profile'
+             ind←('Code Coverage' 0 1)CommTools.Select'Append' 'Replace' 'Neither'
+             →(3=ind)/0
+             flag←1
+             :If 2=ind
+                 1 CodeCoverage.DeleteFiles testFilename
+             :EndIf
+         :Else
+             flag←0 CommTools.YesOrNo'Code coverage?'
          :EndIf
      :Else
          flag←0 CommTools.YesOrNo'Code coverage?'
      :EndIf
- :Else
-     flag←0 CommTools.YesOrNo'Code coverage?'
- :EndIf
- :If flag
-     3 ⎕MKDIR testPath  ⍝
-      ⍝TODO⍝ T.codeCoverage←⎕NEW CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
-     T.codeCoverage←⎕NEW ##.CodeCoverage(,⊂'#')
-     T.codeCoverage.filename←testFilename
+     :If flag
+         3 ⎕MKDIR testPath  ⍝
+         T.codeCoverage←⎕NEW ##.CodeCoverage(,⊂'#')
+         T.codeCoverage.filename←testFilename
+     :EndIf
  :EndIf
diff --git a/APLSource/TestCases/Test_Misc_002.aplf b/APLSource/TestCases/Test_Misc_002.aplf
@@ -1,5 +1,5 @@
  R←Test_Misc_002(stopFlag batchFlag);⎕TRAP;htmlFilename;tno;result;toc;b;row;name;could;did
-⍝ Just runs all sorts of functions and then checks the coverage results
+⍝ Just runs stuff in a script and then checks the coverage results
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 

diff --git a/APLSource/TestCases/Test_Misc_010.aplf b/APLSource/TestCases/Test_Misc_010.aplf
@@ -29,6 +29,6 @@
  R←T._OK
 
 ∆TidyUp:
- 1 T.codeCoverage.DeleteFiles C.filename
+ 1 C.DeleteFiles C.filename
  Data.⎕EX'T'
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_021.aplf b/APLSource/TestCases/Test_Misc_021.aplf
@@ -0,0 +1,35 @@
+ R←Test_Misc_021(stopFlag batchFlag);⎕TRAP;htmlFilename;html;ref;C;body1;body2
+⍝ Spcify comma-separated list to watch
+ ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
+
+ R←T._Failed
+
+ #.⎕SHADOW'TEMP1' ⋄ 'TEMP1'#.⎕NS''
+ #.⎕SHADOW'TEMP2' ⋄ 'TEMP2'#.⎕NS''
+
+ body1←':Namespace Foo' '∇r←Hello' 'r←''Hello world''' '→0' 'a←1' '∇' ':EndNamespace'
+ ref←#.TEMP1.⎕FIX body1
+
+ body2←':Namespace Goo' '∇r←Hello' 'r←''Hello galaxy''' '→0' 'b←1' '∇' ':EndNamespace'
+ ref←#.TEMP2.⎕FIX body2
+
+ C←⎕NEW ##.CodeCoverage(,⊂'#.TEMP1,#.TEMP2')
+
+ C.Start ⍬
+ Assert'Hello world'≡#.TEMP1.Foo.Hello
+ Assert'Hello galaxy'≡#.TEMP2.Goo.Hello
+
+ C.Stop ⍬
+ {}C.Finalise ⍬
+ →T.PassesIf 2=≢C.data
+ {}1 ##.CodeCoverage.ProcessDataAndCreateReport C.filename
+ html←⊃⎕NGET C.filename,'.html'
+ →T.GoToTidyUp 0=+/'>→[3] '⍷html
+ →T.GoToTidyUp 2≠≢'>→\[[0-9]+] '⎕S 0⊣html
+
+ R←T._OK
+
+∆TidyUp:
+ 1 C.DeleteFiles C.filename
+ Data.⎕EX'T'
+⍝Done
diff --git a/APLSource/TestCases/Test_Misc_031.aplf b/APLSource/TestCases/Test_Misc_031.aplf
@@ -25,5 +25,5 @@
 
 ∆TidyUp:
  ##.CodeCoverage.Info←''
- 1 T.codeCoverage.DeleteFiles C.filename
+ 1 C.DeleteFiles C.filename
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_032.aplf b/APLSource/TestCases/Test_Misc_032.aplf
@@ -21,5 +21,5 @@
 
 ∆TidyUp:
  ##.CodeCoverage.Info←''
- 1 T.codeCoverage.DeleteFiles C.filename
+ 1 C.DeleteFiles C.filename
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_033.aplf b/APLSource/TestCases/Test_Misc_033.aplf
@@ -21,5 +21,5 @@
  R←T._OK
 
 ∆TidyUp:
- 1 T.codeCoverage.DeleteFiles C.filename
+ 1 C.DeleteFiles C.filename
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_040.aplf b/APLSource/TestCases/Test_Misc_040.aplf
@@ -24,5 +24,5 @@
  R←T._OK
 
 ∆TidyUp:
- 1 T.codeCoverage.DeleteFiles C.filename
+ 1 C.DeleteFiles C.filename
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_041.aplf b/APLSource/TestCases/Test_Misc_041.aplf
@@ -23,5 +23,5 @@
 
 ∆TidyUp:
  ⎕FUNTIE tno
- 1 T.codeCoverage.DeleteFiles T2.codeCoverage.filename
+ 1 T2.codeCoverage.DeleteFiles T2.codeCoverage.filename
 ⍝Done
diff --git a/APLSource/TestCases/Test_Misc_051.aplf b/APLSource/TestCases/Test_Misc_051.aplf
@@ -21,6 +21,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_061.aplf b/APLSource/TestCases/Test_Misc_061.aplf
@@ -1,5 +1,5 @@
  R←Test_Misc_061(stopFlag batchFlag);⎕TRAP;htmlFilename;row;name;could;did;html
-⍝ Calls ProcessData and CreateReport rather than ProcessDataAndCreateReport
+⍝ Calls ProcessData and CreateReport rather than ProcessDataAndCreateReport and ignore a function
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
@@ -16,6 +16,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/TestResults/CodeCoverage.cr b/TestResults/CodeCoverage.cr
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Assert←{⍺←'' ⋄ (,1)≡,⍵:r←1 ⋄ ⎕ML←1 ⋄ ⍺ ⎕SIGNAL 1↓(⊃∊⍵),11}