diff --git a/APLSource/CodeCoverage.aplc b/APLSource/CodeCoverage.aplc index fbe16ec..2f54feb 100644 --- a/APLSource/CodeCoverage.aplc +++ b/APLSource/CodeCoverage.aplc @@ -54,11 +54,13 @@ ∇ r←Version :Access Public Shared - r←'CodeCoverage' '0.10.0+52' '2023-03-23' + r←'CodeCoverage' '0.10.1+52' '2023-04-08' ∇ ∇ History :Access Public Shared + ⍝ * 0.10.1 from 2023-04-08 + ⍝ The `CreateListingForFnsAndOpr` function deleted the "*.cr" file when it should not have ⍝ * 0.10.0 from 2023-03-23 ⍝ * New function `DeleteFiles` added for getting rid of the two reporting files create/used by `CodeCoverage`, and ⍝ optionally also of the HML file @@ -622,7 +624,6 @@ :EndFor ⎕FUNTIE cr.tno ⎕DL 0.1 - ⎕NDELETE cr.filename ∇ Shorten←{ diff --git a/APLSource/TestCases/Prepare.aplf b/APLSource/TestCases/Prepare.aplf index 531acc1..0791149 100644 --- a/APLSource/TestCases/Prepare.aplf +++ b/APLSource/TestCases/Prepare.aplf @@ -1,12 +1,15 @@ Prepare;testPath;testFilename;ask;answer;flag;ind T←⎕NEW Tester2 ⎕THIS - T.custom_1←'Not reay yet' + T.custom_1←'Not ready yet' 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' + :If ind=2 + CodeCoverage.DeleteFiles testFilename + :EndIf →(3=ind)/0 flag←1 :If 2≡ind diff --git a/APLSource/TestCases/RunTests.aplf b/APLSource/TestCases/RunTests.aplf index deede0a..a483164 100644 --- a/APLSource/TestCases/RunTests.aplf +++ b/APLSource/TestCases/RunTests.aplf @@ -1,11 +1,9 @@ RunTests;htmlFilename;verbose Prepare T.Run 1 - htmlFilename←1 ##.CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename - :If 1 CommTools.YesOrNo'View CodeCoverage report?' + :If 0<≢T.codeCoverage + :AndIf 0 CommTools.YesOrNo'Put Code Coverage Report on display?' verbose←0 CommTools.YesOrNo'Detailed report?' - APLTreeUtils2.GoToWebPage'file://',htmlFilename - ⎕DL 1 - 1 T.codeCoverage.DeleteFiles T.codeCoverage.filename + htmlFilename←verbose CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename + {}APLTreeUtils2.GoToWebPage htmlFilename :EndIf -⍝Done diff --git a/APLSource/TestCases/Test_Misc_998.aplf b/APLSource/TestCases/Test_Misc_998.aplf deleted file mode 100644 index 3d8c057..0000000 --- a/APLSource/TestCases/Test_Misc_998.aplf +++ /dev/null @@ -1,25 +0,0 @@ - R←Test_Misc_998(stopFlag batchFlag);⎕IO;⎕ML;⎕TRAP;report;buff;rf -⍝ Checks on two text vectors: "⍝TODO⍝" and "⍝CHECK⍝"; never fails, just reports. - ⎕IO←0 ⋄ ⎕ML←3 - ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N') - R←T._OK - report←'' - rf←#.CodeCoverage - - buff←rf T.FindSpecialString'⍝CHECK⍝' - buff←(buff[;0]≢¨⎕XSI[0])⌿buff ⍝ remove caller - :If 0≠≢buff - report,←↓(⊂' ⍝CHECK⍝ found:'),(⊂' '),¨buff - :EndIf - buff←rf T.FindSpecialString'⍝TODO⍝' - buff←(buff[;0]≢¨⎕XSI[0])⌿buff ⍝ remove caller - buff←({9≠⎕NC ⍵:1 ⋄ ⍵≡⍕⍎⍵}¨buff[;0])⌿buff ⍝ Remove references - :If 0≠≢buff - report,←↓(⊂' ⍝TODO⍝ found:'),(⊂' '),¨buff - :EndIf - :If 1=≢report - report,←⊂' Nothing found!' - :Else - ⎕←'Checking for ⍝TODO⍝ and ⍝CHECK⍝ '{⍵↑,'--- ',⍺,' ',⍵⍴'-'}80⌊⎕PW-1 - ⎕←⊃report - :EndIf diff --git a/apl-package.json b/apl-package.json index 87b6b4e..cfbe77c 100644 --- a/apl-package.json +++ b/apl-package.json @@ -1 +1 @@ -{ api: "CodeCoverage", assets: "", description: "Monitors which parts of an application got actually executed", documentation: "", files: "", group: "aplteam", io: 1, license: "MIT", lx: "", maintainer: "kai@aplteam.com", minimumAplVersion: "18.0", ml: 1, name: "CodeCoverage", os_lin: 1, os_mac: 1, os_win: 1, project_url: "https: //github.com/aplteam/CodeCoverage", source: "APLSource/CodeCoverage.aplc", tags: "code-coverage,test-framework,unit-tests", userCommandScript: "", version: "0.10.0+55", } +{ api: "CodeCoverage", assets: "", description: "Monitors which parts of an application got actually executed", documentation: "", files: "", group: "aplteam", io: 1, license: "MIT", lx: "", maintainer: "kai@aplteam.com", minimumAplVersion: "18.0", ml: 1, name: "CodeCoverage", os_lin: 1, os_mac: 1, os_win: 1, project_url: "https: //github.com/aplteam/CodeCoverage", source: "APLSource/CodeCoverage.aplc", tags: "code-coverage,test-framework,unit-tests", userCommandScript: "", version: "0.10.1+57", } diff --git a/packages_dev/apl-buildlist.json b/packages_dev/apl-buildlist.json index a75785d..a98a1cc 100644 --- a/packages_dev/apl-buildlist.json +++ b/packages_dev/apl-buildlist.json @@ -1 +1 @@ -{ packageID: [ "aplteam-Tester2-3.3.1", "aplteam-CommTools-1.3.0", "aplteam-CodeCoverage-0.10.0", "aplteam-APLTreeUtils2-1.1.3", "aplteam-IniFiles-5.0.3", ], principal: [ 1, 1, 1, 1, 0, ], url: [ "https://tatin.dev/", "https://localhost/", "https://localhost/", "https://tatin.dev/", "https://tatin.dev/", ], } +{ packageID: [ "aplteam-Tester2-3.3.1", "aplteam-CommTools-1.4.0", "aplteam-CodeCoverage-0.10.1", "aplteam-APLTreeUtils2-1.1.3", "aplteam-IniFiles-5.0.3", ], principal: [ 1, 1, 1, 1, 0, ], url: [ "https://tatin.dev/", "https://tatin.dev/", "https://tatin.dev/", "https://tatin.dev/", "https://tatin.dev/", ], } diff --git a/packages_dev/apl-dependencies.txt b/packages_dev/apl-dependencies.txt index 711d5be..20999f6 100644 --- a/packages_dev/apl-dependencies.txt +++ b/packages_dev/apl-dependencies.txt @@ -1,4 +1,4 @@ aplteam-APLTreeUtils2-1.1.3 aplteam-Tester2-3.3.1 -aplteam-CodeCoverage-0.10.0 -aplteam-CommTools-1.3.0 +aplteam-CodeCoverage-0.10.1 +aplteam-CommTools-1.4.0