Skip to content

Commit 4ba4475

Browse files
aplteamaplteam
committed
New function DeleteFiles added
1 parent 3ec41f9 commit 4ba4475

27 files changed

+253
-255
lines changed

‎APLSource/Admin/Make.aplf‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
Make flag
1+
{r}←{version}Make dummy;M;path;cfg;zipFilename
2+
⍝ Creates a new version in the Dist/ folder.\\
3+
⍝ `version` can be either a full-fledged version number or something like "+0.0.1".
4+
⍝ If no left argument is provided the user is questioned.\\
5+
⍝ Returns always ⍬
26
:If 0=⎕SE.⎕NC'MakeHelpers'
37
'The package https://github.com/aplteam/MakeHelpers is required in ⎕SE'⎕SIGNAL 6
4-
:Else
5-
:If flag
6-
⎕SE.MakeHelpers.CreateTatinPackageFromSingleScript ##.CodeCoverage
7-
:EndIf
88
:EndIf
9+
r←⍬
10+
M←⎕SE.MakeHelpers ⋄ T←⎕SE.Tatin ⋄ C←##.CiderConfig
11+
path←C.HOME,'/Dist/'
12+
cfg←M.GetPackageCfg C.HOME
13+
:If 0=⎕NC'version'
14+
version←M.CompileVersionNumberPattern cfg
15+
:EndIf
16+
M.RecreateFolder path
17+
zipFilename←T.BuildPackage C.HOME path version
18+
⎕←'*** New version build successfully:',(⎕UCS 13),' ',zipFilename
19+
⍝Done

‎APLSource/CodeCoverage.aplc‎

Lines changed: 135 additions & 99 deletions
Large diffs are not rendered by default.

‎APLSource/TestCases/Prepare.aplf‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
1-
Prepare;testPath;testFilename;ask;answer
1+
Prepare;testPath;testFilename;ask;answer;flag;ind
22
T←⎕NEW Tester2 ⎕THIS
3-
T.custom_1←'Not ready yet'
4-
testPath←(⊃1 ⎕NPARTS''),'TestResults'
3+
T.custom_1←'Not reay yet'
4+
testPath←##.CiderConfig.HOME,'/TestResults'
55
testFilename←testPath,'/CodeCoverage'
6+
flag←0
67
:If ⎕NEXISTS testPath
7-
:If ⎕NEXISTS testFilename,'.dcf'
8-
ask←{⎕←⍵,'; 1=append, 2=replace' ⋄ a←⎕ ⋄ ~(⊂a)∊1 2:∇ ⍵ ⋄ ⊃a}
9-
answer←⊃ask'Coverage file already exists'
10-
:If 2≡answer
11-
1 ⎕NDELETE testFilename,'.dcf'
8+
:If ⎕NEXISTS testFilename,'.profile'
9+
ind←('Code Coverage' 0 1)CommTools.Select'Append' 'Replace' 'Neither'
10+
→(3=ind)/0
11+
flag←1
12+
:If 2≡ind
13+
1 CodeCoverage.DeleteFiles testFilename
1214
:EndIf
15+
:Else
16+
flag←0 CommTools.YesOrNo'Code coverage?'
1317
:EndIf
18+
:Else
19+
flag←0 CommTools.YesOrNo'Code coverage?'
20+
:EndIf
21+
:If flag
22+
3 ⎕MKDIR testPath ⍝
23+
T.codeCoverage←⎕NEW CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
24+
T.codeCoverage.filename←testFilename
1425
:EndIf
15-
3 ⎕MKDIR testPath ⍝
16-
T.codeCoverage←⎕NEW ##.CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
17-
T.codeCoverage.filename←testFilename
1826
⍝Done

‎APLSource/TestCases/RunTests.aplf‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
RunTests;htmlFilename
1+
RunTests;htmlFilename;verbose
22
Prepare
33
T.Run 1
4-
htmlFilename←##.CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename
5-
:If 1 ∆YesOrNo'View CodeCoverage report?'
4+
htmlFilename←1 ##.CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename
5+
:If 1 CommTools.YesOrNo'View CodeCoverage report?'
6+
verbose←0 CommTools.YesOrNo'Detailed report?'
67
APLTreeUtils2.GoToWebPage'file://',htmlFilename
8+
⎕DL 1
9+
1 T.codeCoverage.DeleteFiles T.codeCoverage.filename
710
:EndIf
811
⍝Done

‎APLSource/TestCases/Test_Misc_001.aplf‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
R←T._Failed
55

66
Data.Prepare
7-
Data.T.codeCoverage.filename←(739⌶0),'/CodeCoverage_',(⊃⎕SI),'.dcf'
7+
Data.T.codeCoverage.filename←(739⌶0),'/CodeCoverage_',(⊃⎕SI)
88
{}Data.T.RunThese'Test_001' ⍝ Twice in order to force CodeCoverage...
99
{}Data.T.RunThese'Test_001' ⍝ ... to aggregate the data
1010
htmlFilename←##.CodeCoverage.ProcessDataAndCreateReport Data.T.codeCoverage.filename
11-
tno←Data.T.codeCoverage.filename ⎕FTIE 0
11+
tno←(Data.T.codeCoverage.filename,'.profile')⎕FTIE 0
1212
→T.GoToTidyUp 12≠2⊃⎕FSIZE tno ⍝ First 9 are reserved, 10+11 hold data (we called the test suite twice!)
1313

1414
result←⎕FREAD tno,10
@@ -32,7 +32,6 @@
3232

3333
∆TidyUp:
3434
⎕FUNTIE tno
35-
1 ⎕NDELETE Data.T.codeCoverage.filename,'.dcf'
36-
1 ⎕NDELETE Data.T.codeCoverage.filename,'.html'
35+
1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
3736
Data.⎕EX'T'
3837
⍝Done

‎APLSource/TestCases/Test_Misc_002.aplf‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
R←T._Failed
55

66
Data.Prepare
7-
Data.T.codeCoverage.filename←(739⌶0),'/CodeCoverage_',(⊃⎕SI),'.dcf'
7+
Data.T.codeCoverage.filename←(739⌶0),'/CodeCoverage_',(⊃⎕SI)
88
{}Data.T.RunThese'Test_002'
99
{}Data.T.RunThese'Test_002'
1010
htmlFilename←##.CodeCoverage.ProcessDataAndCreateReport Data.T.codeCoverage.filename
11-
tno←Data.T.codeCoverage.filename ⎕FTIE 0
11+
tno←(Data.T.codeCoverage.filename,'.profile')⎕FTIE 0
1212
→T.GoToTidyUp 12≠2⊃⎕FSIZE tno ⍝ First 9 are reserved, 10+11 hold data (two times!)
1313

1414
result←⎕FREAD tno,10
@@ -29,7 +29,6 @@
2929

3030
∆TidyUp:
3131
⎕FUNTIE tno
32-
⎕NDELETE Data.T.codeCoverage.filename,'.dcf'
33-
⎕NDELETE Data.T.codeCoverage.filename,'.html'
32+
1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
3433
Data.⎕EX'T'
3534
⍝Done

‎APLSource/TestCases/Test_Misc_003.aplf‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
R←T._Failed
55

66
Data.Prepare
7-
Data.T.codeCoverage.filename←(739⌶0),'/CodeCoverage_',(⊃⎕SI),'.dcf'
7+
Data.T.codeCoverage.filename←(739⌶0),'/CodeCoverage_',(⊃⎕SI)
88
{}Data.T.RunThese'Test_002'
99
{}Data.T.RunThese'Test_002'
1010
##.CodeCoverage.ProcessData Data.T.codeCoverage.filename
1111
htmlFilename←##.CodeCoverage.CreateReport Data.T.codeCoverage.filename
12-
tno←Data.T.codeCoverage.filename ⎕FTIE 0
12+
tno←(Data.T.codeCoverage.filename,'.profile')⎕FTIE 0
1313
→T.GoToTidyUp 12≠2⊃⎕FSIZE tno ⍝ First 9 are reserved, 10+11 hold data (two times!)
1414

1515
result←⎕FREAD tno,10
@@ -30,7 +30,6 @@
3030

3131
∆TidyUp:
3232
⎕FUNTIE tno
33-
⎕NDELETE Data.T.codeCoverage.filename,'.dcf'
34-
⎕NDELETE Data.T.codeCoverage.filename,'.html'
33+
1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
3534
Data.⎕EX'T'
3635
⍝Done

‎APLSource/TestCases/Test_Misc_004.aplf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
R←T._OK
1515

1616
∆TidyUp:
17-
⎕NDELETE Data.T.codeCoverage.filename,'.dcf'
18-
⎕NDELETE Data.T.codeCoverage.filename,'.html'
17+
1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
1918
Data.⎕EX'T'
2019
⍝Done

‎APLSource/TestCases/Test_Misc_005.aplf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
R←T._OK
2121

2222
∆TidyUp:
23-
⎕NDELETE C.filename,'.dcf'
24-
⎕NDELETE C.filename,'.html'
23+
1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
2524
Data.⎕EX'T'
2625
⍝Done

‎APLSource/TestCases/Test_Misc_006.aplf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
R←T._OK
2424

2525
∆TidyUp:
26-
⎕NDELETE C.filename,'.dcf'
27-
⎕NDELETE C.filename,'.html'
26+
1 T.codeCoverage.DeleteFiles Data.T.codeCoverage.filename
2827
Data.⎕EX'T'
2928
⍝Done

0 commit comments

Comments
 (0)