Fully Tatin-compatible, RunTests and Make

aplteam · Jan 31, 2021 · 364b73a · 364b73a
1 parent 4ddb398
commit 364b73a
Show file tree

Hide file tree

Showing 39 changed files with 6,851 additions and 74 deletions.
diff --git a/APLSource/Initialize.aplf b/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
diff --git a/APLSource/TestCases/Cleanup.aplf b/APLSource/TestCases/Cleanup.aplf
@@ -1,7 +1,7 @@
  Cleanup;⎕USING;rk;rc
  rk←GetRegKey,∆Log
- :If ##.WinSys.IsRunningAsAdmin
- :AndIf 0≠rc←##.WinReg.DeleteSubKey rk
+ :If WinSys.IsRunningAsAdmin
+ :AndIf 0≠rc←WinReg.DeleteSubKey rk
      ⎕←'Delete this key:'
      ⎕←'   ',rk
      ⎕←'from the Windows Registry failed. Please delete with the RegEditor;'

diff --git a/APLSource/TestCases/Initial.aplf b/APLSource/TestCases/Initial.aplf
@@ -2,23 +2,23 @@
 ⍝ https://msdn.microsoft.com/en-us/library/system.diagnostics.eventlog(v=vs.110).aspx
  ⎕IO←0 ⋄ ⎕ML←1
  r←0
- ##.FilesAndDirs.PolishCurrentDir
+ FilesAndDirs.PolishCurrentDir
  rk←GetRegKey,∆Log
- :If 0=##.WinSys.IsRunningAsAdmin
+ :If 0=WinSys.IsRunningAsAdmin
      ⎕←'*** Sorry, but in order to run this test suite successfully this WS must be run as admin.'
      ⎕←'    This is because it will add a new source:'
      ⎕←'      ',rk
      ⎕←'    to the "Application" log; this requires the WS to run with elevated rights.'
  :Else
-     :If ##.WinReg.DoesKeyExist rk
-         rc←##.WinReg.DeleteSubKey rk   ⍝ This may well fail even if you have admin rights. Delete key via Registry Editor then!
+     :If WinReg.DoesKeyExist rk
+         rc←WinReg.DeleteSubKey rk   ⍝ This may well fail even if you have admin rights. Delete key via Registry Editor then!
          :If 0≠rc
              ⎕←'*** Attempt to delete:'
              ⎕←'      ',rk
-             ⎕←'    has failed: ',(##.WinSys.GetMsgFrom rc),'; rc=',⍕rc
+             ⎕←'    has failed: ',(WinSys.GetMsgFrom rc),'; rc=',⍕rc
          :EndIf
      :EndIf
-     :If ##.WinReg.DoesKeyExist rk
+     :If WinReg.DoesKeyExist rk
          ⎕←'*** This Windows Registry key:'
          ⎕←'      ',rk
          ⎕←'    does exist but MUST NOT before the test suite can be executed successfully again!'

diff --git a/APLSource/TestCases/Prepare.aplf b/APLSource/TestCases/Prepare.aplf
@@ -1,7 +1,18 @@
- Prepare
+ Prepare;testPath;testFilename;ask;answer
  ⎕IO←1 ⋄ ⎕ML←1
- T←⎕NEW ##.Tester2 ⎕THIS
- T.codeCoverage←⎕NEW ##.CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
-⍝ T.codeCoverage←⎕NEW ##.CodeCoverage(,⊂'#.WindowsEventLog')
- T.codeCoverage.filename←(⊃1 ⎕NPARTS''),'TestResults/CodeCoverage'
+ T←⎕NEW Tester2 ⎕THIS
+ 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
diff --git a/APLSource/TestCases/RunTests.aplf b/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
+ T.Run 1
+ htmlFilename←CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename
+ :If 1 ∆YesOrNo'View CodeCoverage report?'
+     APLTreeUtils2.GoToWebPage'file://',htmlFilename
  :EndIf
- 2 T.Run 1
- htmlFilename←##.CodeCoverage.ProcessDataAndCreateReport T.codeCoverage.filename
- ##.APLTreeUtils2.GoToWebPage'file://',htmlFilename
 ⍝Done
diff --git a/APLSource/TestCases/Test_010.aplf → APLSource/TestCases/Test_Misc_010.aplf b/APLSource/TestCases/Test_010.aplf → APLSource/TestCases/Test_Misc_010.aplf
@@ -1,4 +1,4 @@
- R←Test_010(stopFlag batchFlag);q;t;all;buffer;⎕TRAP;myLog;TS;noOf;rc;log;source
+ R←Test_Misc_010(stopFlag batchFlag);q;t;all;buffer;⎕TRAP;myLog;TS;noOf;rc;log;source
 ⍝ Creates a new source in the "Application" log and writes to it.
 ⍝ Does not only create stuff but also cleans up behind itself.
 
@@ -26,5 +26,5 @@
  R←T._OK
 
 ∆TidyUp:
- rc←##.WinReg.DeleteSubKey'HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\',source
+ rc←WinReg.DeleteSubKey'HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\',source
  ⍎(0≠rc)/'. ??'
diff --git a/APLSource/TestCases/Test_011.aplf → APLSource/TestCases/Test_Misc_011.aplf b/APLSource/TestCases/Test_011.aplf → APLSource/TestCases/Test_Misc_011.aplf
@@ -1,4 +1,4 @@
- R←Test_011(stopFlag batchFlag);q;t;all;buffer;⎕TRAP;noOf;TS;rc;log;source
+ R←Test_Misc_011(stopFlag batchFlag);q;t;all;buffer;⎕TRAP;noOf;TS;rc;log;source
 ⍝ Creates a new source without specifying the log (defaults to "Application") and writes to it.
 ⍝ Does not only create stuff but also cleans up behind itself.
  R←T._Failed
@@ -27,5 +27,5 @@
  R←T._OK
 
 ∆TidyUp:
- rc←##.WinReg.DeleteSubKey'HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\',source
+ rc←WinReg.DeleteSubKey'HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\',source
  ⍎(0≠rc)/'. ??'
diff --git a/APLSource/TestCases/Test_012.aplf → APLSource/TestCases/Test_Misc_012.aplf b/APLSource/TestCases/Test_012.aplf → APLSource/TestCases/Test_Misc_012.aplf
@@ -1,4 +1,4 @@
- R←Test_012(stopFlag batchFlag);q;t;all;buffer;⎕TRAP;TS;noOf;rc;source;log
+ R←Test_Misc_012(stopFlag batchFlag);q;t;all;buffer;⎕TRAP;TS;noOf;rc;source;log
 ⍝ Creates a custom log with a new source and writes to it.
 ⍝ Does not only create stuff but also cleans up behind itself.
  R←T._Failed
@@ -27,11 +27,11 @@
  R←T._OK
 
 ∆TidyUp:
- rc←##.WinReg.DeleteSubKey GetRegKey,log
+ rc←WinReg.DeleteSubKey GetRegKey,log
  :If 0≠rc
  :AndIf 0=batchFlag
      ⎕←'*** Attempt to delete:'
      ⎕←'    ',GetRegKey,log
-     ⎕←'  failed: ',##.WinSys.GetMsgFrom rc
+     ⎕←'  failed: ',WinSys.GetMsgFrom rc
      ⎕←'  Make sure that you delete this before executing the test suite again!'
  :EndIf
diff --git a/APLSource/TestCases/Test_ZZZ_998.aplf b/APLSource/TestCases/Test_ZZZ_998.aplf
@@ -1,16 +1,17 @@
- R←Test_ZZZ_998(stopFlag batchFlag);⎕IO;⎕ML;⎕TRAP;report;buff
+ R←Test_ZZZ_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←##.WindowsEventLog
 
- buff←T.FindSpecialString'⍝CHECK⍝'
+ 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←rf T.FindSpecialString'⍝TODO⍝'
  buff←(buff[;0]≢¨⎕XSI[0])⌿buff ⍝ remove caller
  :If 0≠≢buff
      report,←↓(⊂' ⍝TODO⍝ found:'),(⊂'   '),¨buff

diff --git a/APLSource/TestCases/Test_ZZZ_999.aplf b/APLSource/TestCases/Test_ZZZ_999.aplf
diff --git a/APLSource/WindowsEventLog.aplc b/APLSource/WindowsEventLog.aplc
@@ -28,7 +28,7 @@
 
     ∇ r←Version
       :Access Public Shared
-      r←'WindowsEventLog' '3.0.0.6' '2020-09-21'
+      r←'WindowsEventLog' '3.0.0.10' '2020-09-21'
     ∇
 
     ∇ History

diff --git a/Make/Make.DWS b/Make/Make.DWS
diff --git a/Packages_dev/apl-buildlist.json b/Packages_dev/apl-buildlist.json
@@ -0,0 +1 @@
+{  depth: [    1,    1,    1,    1,    1,    1,    1,    2,    2,    2,  ],  packageID: [    "aplteam-APLTreeUtils2-1.1.0",    "aplteam-FilesAndDirs-5.0.0",    "aplteam-OS-3.0.0",    "aplteam-Tester2-3.1.0.90",    "aplteam-CodeCoverage-0.7.1",    "aplteam-WinReg-5.0.1",    "aplteam-WinSys-5.0.0",    "aplteam-OS-3.0.0",    "aplteam-IniFiles-5.0.1",    "aplteam-APLTreeUtils2-1.1.0",  ],  url: [    "https://tatin.dev/aplteam-APLTreeUtils2-1.1.0",    "https://tatin.dev/aplteam-FilesAndDirs-5.0.0",    "https://tatin.dev/aplteam-OS-3.0.0",    "https://tatin.dev/aplteam-Tester2-3.1.0.90",    "https://tatin.dev/aplteam-CodeCoverage-0.7.1",    "https://tatin.dev/aplteam-WinReg-5.0.1",    "https://tatin.dev/aplteam-WinSys-5.0.0",    "https://tatin.dev/aplteam-OS-3.0.0",    "https://tatin.dev/aplteam-IniFiles-5.0.1",    "https://tatin.dev/aplteam-APLTreeUtils2-1.1.0",  ],}

diff --git a/Packages_dev/apl-dependencies.txt b/Packages_dev/apl-dependencies.txt
@@ -0,0 +1,7 @@
+aplteam-APLTreeUtils2-1.1.0
+aplteam-FilesAndDirs-5.0.0
+aplteam-OS-3.0.0
+aplteam-Tester2-3.1.0.90
+aplteam-CodeCoverage-0.7.1
+aplteam-WinReg-5.0.1
+aplteam-WinSys-5.0.0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{ depth: [ 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, ], packageID: [ "aplteam-APLTreeUtils2-1.1.0", "aplteam-FilesAndDirs-5.0.0", "aplteam-OS-3.0.0", "aplteam-Tester2-3.1.0.90", "aplteam-CodeCoverage-0.7.1", "aplteam-WinReg-5.0.1", "aplteam-WinSys-5.0.0", "aplteam-OS-3.0.0", "aplteam-IniFiles-5.0.1", "aplteam-APLTreeUtils2-1.1.0", ], url: [ "https://tatin.dev/aplteam-APLTreeUtils2-1.1.0", "https://tatin.dev/aplteam-FilesAndDirs-5.0.0", "https://tatin.dev/aplteam-OS-3.0.0", "https://tatin.dev/aplteam-Tester2-3.1.0.90", "https://tatin.dev/aplteam-CodeCoverage-0.7.1", "https://tatin.dev/aplteam-WinReg-5.0.1", "https://tatin.dev/aplteam-WinSys-5.0.0", "https://tatin.dev/aplteam-OS-3.0.0", "https://tatin.dev/aplteam-IniFiles-5.0.1", "https://tatin.dev/aplteam-APLTreeUtils2-1.1.0", ],}
Expand Down