.NET-Handling improved (test cases)

aplteam · Jun 27, 2024 · f783f13 · f783f13
1 parent 2d3de10
commit f783f13
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 20 deletions.
diff --git a/APLSource/Admin/InstallCider.aplf b/APLSource/Admin/InstallCider.aplf
@@ -17,13 +17,13 @@
          selectFlag←1
      :EndIf
  :Case 'Lin'
-     :If ~⎕NEXISTS installFolder←if1←'/home/',⎕AN,'/dyalog.files/SessionExtensions/CiderTatin/Cider'
-     :AndIf ~⎕NEXISTS installFolder←if2←'/home/',⎕AN,'/','dyalog.',('.'~⍨{⍵/⍨2>+\⍵='.'}2⊃aplVersion),'U',(¯2↑1⊃aplVersion),'.files/SessionExtensions/CiderTatin/Cider'
+     :If ~⎕NEXISTS installFolder←if1←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/dyalog.files/SessionExtensions/CiderTatin/Cider'
+     :AndIf ~⎕NEXISTS installFolder←if2←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/','dyalog.',('.'~⍨{⍵/⍨2>+\⍵='.'}2⊃aplVersion),'U',(¯2↑1⊃aplVersion),'.files/SessionExtensions/CiderTatin/Cider'
          selectFlag←1
      :EndIf
  :Case 'Mac'
-     :If ~⎕NEXISTS installFolder←if1←'/Users/',⎕AN,'/dyalog.files/SessionExtensions/CiderTatin/Cider'
-     :AndIf ~⎕NEXISTS installFolder←if2←'/Users/',⎕AN,'/','dyalog.',('.'~⍨{⍵/⍨2>+\⍵='.'}2⊃aplVersion),'U',(¯2↑1⊃aplVersion),'.files/SessionExtensions/CiderTatin/Cider'
+     :If ~⎕NEXISTS installFolder←if1←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/dyalog.files/SessionExtensions/CiderTatin/Cider'
+     :AndIf ~⎕NEXISTS installFolder←if2←(2 ⎕NQ'.' 'GetEnvironment' 'HOME'),'/','dyalog.',('.'~⍨{⍵/⍨2>+\⍵='.'}2⊃aplVersion),'U',(¯2↑1⊃aplVersion),'.files/SessionExtensions/CiderTatin/Cider'
          selectFlag←1
      :EndIf
  :Else

diff --git a/APLSource/Cider/GetUserHomPath.aplf b/APLSource/Cider/GetUserHomPath.aplf
@@ -1,13 +1,12 @@
  r←GetUserHomPath;os
-⍝ Returns the user's HOME path on the current operating system, like
-⍝ /home/<⎕an>  on Linux
+⍝ Returns the user's HOME path on the current operating system
  :Select os←APLTreeUtils2.GetOperatingSystem ⍬
  :Case 'Win'
      r←¯1↓⊃1 ⎕NPARTS ¯1↓⊃1 ⎕NPARTS 2⊃4070⌶0
  :Case 'Lin'
-     r←'/home/',⎕AN
+     r←2 ⎕NQ'.' 'GetEnvironment' 'HOME'
  :Case 'Mac'
-     r←'/Users/',⎕AN
+     r←2 ⎕NQ'.' 'GetEnvironment' 'HOME'
  :Else
      ('<',os,'> is not a supported operating system')⎕SIGNAL 11
  :EndSelect
diff --git a/APLSource/Cider/History.apla b/APLSource/Cider/History.apla
@@ -1,4 +1,8 @@
 (
+ '* 0.41.1 ⋄ 2024-06-27'
+ '  * On Linux and Mac-OS, the folder /home/<⎕AN> is no longer hard coded but established with '
+ '    2 ⎕NQ ''.'' ''GetEnvironment'' ''HOME'''
+ '  * NuGet-related test cases optimized '
  '* 0.41.0 ⋄ 2024-06-21'
  '  * API functions `CreateProject` and `CreateCreateProjectParms` added '
  '  * Cider now adds its own version number to a project config file whenever it is written to disk'

diff --git a/APLSource/Cider/Version.aplf b/APLSource/Cider/Version.aplf
@@ -1,3 +1,3 @@
  r←Version
 ⍝ See also `History`
- r←'0.41.0+671'
+ r←'0.41.1+671'
diff --git a/APLSource/TestCases/Initial_NuGet.aplf b/APLSource/TestCases/Initial_NuGet.aplf
@@ -21,10 +21,13 @@
              info←'Could not load the .NET bridge interface.'
          :EndIf
      :EndIf
+ :Else
+     info←'.NET is not available, therefore the NuGet tests cannot be executed.'
  :EndIf
  :If 0=netcore
  :AndIf ~ps.batchFlag
  :AndIf 0<≢info
      CommTools.Pause info,(⎕UCS 13),'Therefore the NuGet tests cannot be executed.'
+     r←0
  :EndIf
 ⍝Done
diff --git a/APLSource/TestCases/IsDotNetAvailable.aplf b/APLSource/TestCases/IsDotNetAvailable.aplf
@@ -1,9 +1,14 @@
- r←IsDotNetAvailable
+ r←IsDotNetAvailable;res;parms;I
 ⍝ Checks whether .NET (rather than .NET framework) is available at all.
- :Trap 11   ⍝ On Linux and Mac-OS, a DOMAIN ERROR will occur if .NET is not installed
-     :If 0=r←∨/'.NETCore'⍷∊⎕CMD'dotnet --list-runtimes'
-         r←∨/'\dotnet\'⍷∊⎕CMD'dotnet --list-sdks'
+⍝ We cannot do this in the current APL session on Windows because that might use .NET Framework but
+⍝ .NET might still be available, so we start a process which will exit with 125 for "yes", 126 for "no"
+⍝ and "123" for "error".
+ :If 'Win'≡APLTreeUtils2.GetOperatingSystem ⍬
+     :If 0=r←1 1≡2↑2250⌶0  ⍝ The current APL ight already be configured for .NET
+         parms←∆NuGetTestProcessParms ⍬ ⍬
+         I←⎕NEW APLProcess(,⊂parms)
+         r←125=I.ExitCode
      :EndIf
  :Else
-     r←0
- :Endtrap
+     r←1 1≡2↑2250⌶0
+ :EndIf
diff --git a/APLSource/TestCases/Test_UC_045.aplf b/APLSource/TestCases/Test_UC_045.aplf
@@ -4,10 +4,16 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
+ :If ~IsDotNetAvailable
+     R←T._NotApplicable ⋄ →0
+ :EndIf
+
  tempFolder←∆GetFolderInTempDir⊃⎕SI
  parms←∆NuGetTestProcessParms(⊃⎕SI)tempFolder
  I←⎕NEW APLProcess(,⊂parms)
- R←I.ExitCode
+ :If 0=I.ExitCode
+     R←T._OK
+ :EndIf
 
 ∆TidyUp:
  (rc msg)←FilesAndDirs.RmDirByForce tempFolder

diff --git a/APLSource/TestCases/Test_UC_046.aplf b/APLSource/TestCases/Test_UC_046.aplf
@@ -3,6 +3,10 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
+ :If ~IsDotNetAvailable
+     R←T._NotApplicable ⋄ →0
+ :EndIf
+
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
  folder←∆GetTestPath⊃⎕SI
  tempDir←∆GetFolderInTempDir⊃⎕SI

diff --git a/APLSource/TestCases/Test_UC_047.aplf b/APLSource/TestCases/Test_UC_047.aplf
@@ -3,6 +3,10 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
+:If ~IsDotNetAvailable
+     R←T._NotApplicable ⋄ →0
+ :EndIf
+
  #.⎕SHADOW'TEMP' ⋄ 'TEMP'#.⎕NS''
  folder←∆GetTestPath⊃⎕SI
  tempDir←∆GetFolderInTempDir⊃⎕SI

diff --git a/APLSource/TestCases/Test_UC_050.aplf b/APLSource/TestCases/Test_UC_050.aplf
@@ -4,6 +4,10 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
+:If ~IsDotNetAvailable
+     R←T._NotApplicable ⋄ →0
+ :EndIf
+
  tempFolder←∆GetFolderInTempDir⊃⎕SI
  parms←∆NuGetTestProcessParms(⊃⎕SI)tempFolder
  I←⎕NEW APLProcess(,⊂parms)

diff --git a/APLSource/TestCases/Test_UC_051.aplf b/APLSource/TestCases/Test_UC_051.aplf
@@ -4,6 +4,10 @@
  ⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
+ :If ~IsDotNetAvailable
+     R←T._NotApplicable ⋄ →0
+ :EndIf
+
  tempFolder←∆GetFolderInTempDir⊃⎕SI
  parms←∆NuGetTestProcessParms(⊃⎕SI)tempFolder
  I←⎕NEW APLProcess(,⊂parms)

diff --git a/APLSource/TestCases/∆NuGetTestProcessParms.aplf b/APLSource/TestCases/∆NuGetTestProcessParms.aplf
@@ -1,9 +1,15 @@
  parms←∆NuGetTestProcessParms(name folder)
  parms←APLProcess.CreateParms
  parms.Exe←1⊃2 ⎕NQ #'GetCommandLineArgs' 'DYALOG'
- parms.OutputFilename←(739⌶0),'/',name,'.txt'
- parms.CommandLineArgs,←'path=''',folder,''''
- parms.CommandLineArgs,←' fns=∆',name
+ :If 0<≢name
+     parms.OutputFilename←(739⌶0),'/',name,'.txt'
+ :EndIf
+ :If 0<≢folder
+     parms.CommandLineArgs,←'path=''',folder,''''
+ :EndIf
+ :If 0<≢name
+     parms.CommandLineArgs,←' fns=∆',name
+ :EndIf
  :If 0<T.⎕NC'codeCoverage'
      parms.CommandLineArgs,←' codeCoverageFile=''',(T.codeCoverage.filename~''''),''''
  :EndIf

diff --git a/Tests/ExecTestCase.dws b/Tests/ExecTestCase.dws
diff --git a/apl-package.json b/apl-package.json
@@ -21,5 +21,5 @@
   tags: "project-management",
   tatin_version: "0.103.0",
   userCommandScript: "APLSource/Cider_UC.dyalog",
-  version: "0.41.0+747",
+  version: "0.41.1+749",
 }