RunTests and Make polished

Author: aplteam

APLSource/EventCodes.aplc

@@ -62,7 +62,7 @@
 
     ∇ r←Version
       :Access Public Shared
-      r←({⍵}⍕⎕THIS)'3.0.0.16' '2020-09-21'
+      r←({⍵}⍕⎕THIS)'3.0.0.21' '2020-09-21'
     ∇
 
     ∇ History

APLSource/Initialize.aplf

@@ -1,6 +1,10 @@
- {r}←Initialize;⎕TRAP
+ {r}←Initialize;⎕TRAP;parent
  ⎕TRAP←0 'S'
  r←⍬
  {}⎕SE.UCMD'cd ',AcreConfig.ProjectFolder
- ⎕SE.aplteam.InitializeAPLTreeProject ⎕THIS
+ ⎕WSID←AcreConfig.ProjectFolder,'project.dws'
+ parent←⍕⎕THIS
+ ⍝ {}⎕SE.Tatin.LoadDependencies'./packages/'parent   ⍝ There are not any!
+ parent,←'.TestCases'
+ {}⎕SE.Tatin.LoadDependencies'./packages_dev/'parent
 ⍝Done

APLSource/TestCases/GetInstalledAPLs.aplf

@@ -1,7 +1,7 @@
  list←GetInstalledAPLs dummy
 ⍝ Examines the Registry in order to find out which versions of Dyalog are installed and return all of them
  list←''
- :If 0≠≢list←##.WinReg.GetAllSubKeyNames'Software\Dyalog'
+ :If 0≠≢list←WinReg.GetAllSubKeyNames'Software\Dyalog'
  :AndIf 0≠≢list←('Dyalog APL/W'{⍺∘≡¨(≢⍺)↑¨⍵}list)/list
-     list←(50<≢¨##.WinReg.GetAllValueNames¨(⊂'Software\Dyalog\'),¨list)/list
+     list←(50<≢¨WinReg.GetAllValueNames¨(⊂'Software\Dyalog\'),¨list)/list
  :EndIf

APLSource/TestCases/Prepare.aplf

@@ -1,6 +1,19 @@
- Prepare
+ Prepare;testPath;testFilename;ask;answer
  ⎕IO←1 ⋄ ⎕ML←1
- T←⎕NEW ##.Tester2 ⎕THIS
- T.codeCoverage←⎕NEW ##.CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
- T.codeCoverage.filename←(⊃1 ⎕NPARTS''),'TestResults/CodeCoverage'
+ T←⎕NEW Tester2 ⎕THIS
+ T.custom_1←'Not ready yet'
+ testPath←(⊃1 ⎕NPARTS''),'TestResults'
+ testFilename←testPath,'/CodeCoverage'
+ :If ⎕NEXISTS testPath
+     :If ⎕NEXISTS testFilename,'.dcf'
+         ask←{⎕←⍵,'; 1=append, 2=replace' ⋄ a←⎕ ⋄ ~(⊂a)∊1 2:∇ ⍵ ⋄ ⊃a}
+         answer←⊃ask'Coverage file already exists'
+         :If 2≡answer
+             1 ⎕NDELETE testFilename,'.dcf'
+         :EndIf
+     :EndIf
+ :EndIf
+ 3 ⎕MKDIR testPath  ⍝
+ T.codeCoverage←⎕NEW CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
+ T.codeCoverage.filename←testFilename
 ⍝Done

APLSource/TestCases/RunTests.aplf

@@ -1,12 +1,8 @@
- RunTests;dcfFilename;htmlFilename;tno
+ RunTests;htmlFilename
  Prepare
- dcfFilename←(⊃,/¯1↓⎕NPARTS T.codeCoverage.filename),'.dcf'
- :If ##.FilesAndDirs.IsFile dcfFilename
- :AndIf ∆YesOrNo'CodeCovarge data file already exists; override?'
-     tno←dcfFilename ⎕FTIE 0
-     dcfFilename ⎕FERASE tno
- :EndIf
  T.Run 1
- htmlFilename←##.CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename
- ##.APLTreeUtils2.GoToWebPage'file://',htmlFilename
+ htmlFilename←CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename
+ :If 1 ∆YesOrNo'View CodeCoverage report?'
+     APLTreeUtils2.GoToWebPage'file://',htmlFilename
+ :EndIf
 ⍝Done

APLSource/TestCases/Test_30.aplf

@@ -5,7 +5,7 @@
 
  list←⌽GetInstalledAPLs ⍬
  :Repeat
-     version←3⊃' '##.APLTreeUtils2.Split⊃list
+     version←3⊃' 'APLTreeUtils2.Split⊃list
      :If 0=≢errors←∆GetErrorsFromHelpPage'http://help.dyalog.com/',version,'/Content/Language/System%20Functions/trap.htm'
          list←1↓list
      :EndIf

APLSource/TestCases/Test_ZZZ_998.aplf renamed to APLSource/TestCases/Test_998.aplf

@@ -1,18 +1,18 @@
- R←Test_ZZZ_998(stopFlag batchFlag);⎕IO;⎕ML;⎕TRAP;report;buff;xml;source
+ R←Test_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←APLTreeUtils2
 
- xml←⎕XML⊃⎕NGET'publish.config'
- source←3⊃xml[xml[;2]⍳⊂'container';]
- buff←T.FindSpecialString'⍝CHECK⍝'
- buff←(buff[;1]≢¨⎕XSI[1])⌿buff ⍝ remove caller
+ buff←rf T.FindSpecialString'⍝CHECK⍝'
+ buff←(buff[;0]≢¨⎕XSI[0])⌿buff ⍝ remove caller
  :If 0≠≢buff
      report,←↓(⊂' ⍝CHECK⍝ found:'),(⊂'   '),¨buff
  :EndIf
- buff←T.FindSpecialString'⍝TODO⍝'
- buff←(buff[;1]≢¨⎕XSI[1])⌿buff ⍝ remove caller
+ buff←rf T.FindSpecialString'⍝TODO⍝'
+ buff←(buff[;0]≢¨⎕XSI[0])⌿buff ⍝ remove caller
  :If 0≠≢buff
      report,←↓(⊂' ⍝TODO⍝ found:'),(⊂'   '),¨buff
  :EndIf