Tests amended and some minor bugs fixed along the line

Author: aplteam

APLSource/Cider/AddAlias.aplf

@@ -17,7 +17,7 @@
          :If 0=+/(alias,'=')∘{⍺≡(≢⍺)↑⍵}¨data
              ind←({⍵↓⍨⍵⍳'='}¨data)⍳⊂folder
              :If ind≤≢data
-                 DropAliasRemoveTargetDefinition ind⊃data
+                 DropAlias RemoveTargetDefinition ind⊃data
                  data←⊃F.NGET ciderAliasFilename 1
              :EndIf
              (⊂data,⊂(⎕C alias),'=',folder)F.NPUT ciderAliasFilename 1

APLSource/Cider/Version.aplf

@@ -1,3 +1,3 @@
  r←Version
 ⍝ See als History
- r←'0.37.0+611'
+ r←'0.37.0+618'

APLSource/Cider_uc.dyalog

@@ -249,7 +249,7 @@
       r←newList[;1]~oldList[;1]
     ∇
 
-    ∇ r←AddTatinDependencies Args;path;packages;projectFolder;cfg;development;ref;flag;q;list;sourceFolder;targetNS;targetNamespace
+    ∇ r←AddTatinDependencies Args;path;packages;projectFolder;cfg;development;ref;flag;q;list;sourceFolder;targetNS;targetNamespace;ref2;targetNS2;list2;sourceFolder2;noOf
       r←''
       packages←Args._1
       projectFolder←Args._2
@@ -293,7 +293,7 @@
           :EndIf
       :Until flag
       list←P.AddTatinDependencies packages projectFolder development
-      r←⍪(⊂(⍕≢list),' Tatin dependenc',((1+1<≢list)⊃'y' 'ies'),' added:'),' ',¨list
+      r←⍪(⊂(⍕≢list),' Tatin ',(development/'development-'),'dependenc',((1+1<≢list)⊃'y' 'ies'),' added:'),' ',¨list
       :If 0<≢list
       :AndIf 1 P.##.C.YesOrNo'LoadTatinDependenciesAfterAdding@Would you like to (re-)load all Tatin dependencies?'
           targetNS←(⊃{⍺,'.',⍵}/cfg.CIDER.(parent projectSpace)){0=≢⍵:⍺ ⋄ ⍺,'.',⍵}{⍵↓⍨⍵⍳'='}ref.tatin
@@ -302,9 +302,23 @@
           :Else
               targetNS ⎕NS''
           :EndIf
-          sourceFolder←projectFolder,'/',{⍵↑⍨¯1+⍵⍳'='}ref.tatin
+          sourceFolder←projectFolder,'/',P.##.RemoveTargetDefinition ref.tatin
           list←⎕SE.Tatin.LoadDependencies sourceFolder targetNS
-          r←r⍪⊂'Dependenc',((1+1<≢list)⊃'y was' 'ies were'),' loaded'
+          ⍝ If ref points to def then ref2 doesn't and vice versa
+          ref2←(1+~development)⊃cfg.CIDER.(dependencies dependencies_dev)
+          targetNS2←(⊃{⍺,'.',⍵}/cfg.CIDER.(parent projectSpace)){0=≢⍵:⍺ ⋄ ⍺,'.',⍵}{⍵↓⍨⍵⍳'='}ref2.tatin
+          :If targetNS≡targetNS2    ⍝  Only when "normal" dependencies and development dependencies go into the same namespace...
+              sourceFolder2←projectFolder,'/',P.##.RemoveTargetDefinition ref2.tatin
+              :If 0<≢P.##.F.ListDirs sourceFolder2
+                  list2←⎕SE.Tatin.LoadDependencies sourceFolder2 targetNS2          ⍝... do we need to (re-)load both
+                  noOf←+/≢¨list list2
+              :Else
+                  noOf←≢list
+              :EndIf
+          :Else
+              noOf←≢list
+          :EndIf
+          r←r⍪⊂(⍕noOf),' dependenc',((1+1<noOf)⊃'y was' 'ies were'),' loaded'
       :EndIf
     ∇
 
@@ -322,7 +336,7 @@
           :If 1 P.##.C.YesOrNo q
               tempFolder←P.##.F.GetTempSubDir'Cider'
               res←⎕SE.Tatin.InstallPackages('[tatin]aplteam-Cider')tempFolder
-              targetFolder←(1 P.GetProgramFilesFolder''),'/CiderTatin/Cider'
+              targetFolder←1 P.GetProgramFilesFolder'/CiderTatin/Cider'
               {}P.##.F.RmDirByForce targetFolder
               3 ⎕MKDIR targetFolder
               targetFolder ⎕NMOVE⍠1⊣tempFolder,'/*'
@@ -335,6 +349,13 @@
               :AndIf 1 P.##.C.YesOrNo q
                   {}P.##.F.RmDirByForce folder
               :EndIf
+              folder←1 P.GetProgramFilesFolder'/StartupSession/CiderTatin/Cider'
+              :If P.##.F.IsDir folder
+                  q←'RemoveCiderFromStartupSession@There is a folder Cider/ in ',('expand'P.##.F.NormalizePath folder,'\..'),'/',⎕UCS 13
+                  q,←'Shall this folder be removed?'
+              :AndIf 1 P.##.C.YesOrNo q
+                  {}P.##.F.RmDirByForce folder
+              :EndIf
           :Else
               r←'Cancelled by user'
           :EndIf
@@ -623,11 +644,11 @@
               r,←⊂'In case the project''s config file does not carry a definition for a Tatin dependency folder'
               r,←⊂'the user is given the oportunity to edit the config file.'
               r,←⊂''
-              r,←⊂'-development   By default the packages are added as project dependencies. The -development'
-              r,←⊂'               flag can be used to make it a development dependency instead.'
-              r,←⊂'-target=  Use this to specify a target namespace. This is added to the "dependencies" or the'
-              r,←⊂'          "dependencies_dev" parameter with a "=". If there is already such a target namespace'
-              r,←⊂'          an error is thrown; you need to edit the project''s config file in such a case.'
+              r,←⊂'-development  By default the packages are added as project dependencies. The -development'
+              r,←⊂'              flag can be used to make them development dependencies instead.'
+              r,←⊂'-target=      Use this to specify a target namespace. This is added to the "dependencies" or the'
+              r,←⊂'              "dependencies_dev" parameter with a "=". If there is already such a target namespace'
+              r,←⊂'              an error is thrown; you need to edit the project''s config file in such a case.'
           :Case ⎕C'ListNuGetDependencies'
               r,←⊂'Lists all NuGet dependencies in the Nuget dependency folder.'
               r,←⊂''
@@ -870,7 +891,7 @@
               :If 0=(⍎config.CIDER.parent).⎕NC config.CIDER.projectSpace
                   config.CIDER.projectSpace(⍎config.CIDER.parent).⎕NS''
               :Else
-                  :If 0<≢((⍎config.CIDER.parent)⍎config.CIDER.projectSpace).⎕NL⍳16
+                  :If 0<≢((⍎config.CIDER.parent)⍎config.CIDER.projectSpace).⎕NL 9~⍨⍳16
                       :If 1<≢list←⊃P.##.F.Dir projectFolder
                       :OrIf 'cider.config'≢{1≠≢⍵:0 ⋄ ⊃,/1↓⎕NPARTS⊃⍵}list
                           :If batch
@@ -939,24 +960,6 @@
       config P.##.Put_JSON5 filename
     ∇
 
-    ∇ r←GetUserConfigFileTemplate;folder;filename
-    ⍝ Checks whether the user has already a personal config file template.
-    ⍝ If not the generic Cider config file template is copied into the user's Cider home folder,
-    ⍝ Eventually the template is returned.
-    ⎕trap←0'S'
-    ∘∘∘  ⍝TODO⍝  ⍝TODO⍝ 
-      folder←P.GetCiderGlobalConfigHomeFolder
-      filename←folder',/cider.config.template'
-      :If ~P.##.F.Exists filename
-          :If 0<##.⎕NC'TatinVars'
-              filename ⎕NCOPY ##.TatinVars.HOME,'/cider.config.template'
-          :Else
-              filename ⎕NCOPY CiderConfig.HOME,'/cider.config.template'
-          :EndIf
-      :EndIf
-      r←⎕JSON⍠('Dialect' 'JSON5')⊣⊃⎕NGET filename
-    ∇
-
     ∇ (opCode path)←OpenFileDialogBox caption;ref;res;filename
     ⍝ opCodes:
     ⍝ ¯1 = Cancelled by user

APLSource/TestCases/CheckTempDirForLeftOvers.aplf

@@ -0,0 +1,8 @@
+ CheckTempDirForLeftOvers(testFnName ps);F;⎕TRAP;list
+ F←#.Cider.Cider.FilesAndDirs
+ :If 0<≢list←F.ListDirs F.GetTempPath,'Cider-Tests*'
+ :AndIf ~∨/'_Alias_'⍷testFnName   ⍝ The group "Alias" cleans up in the Cleanup_Alias function
+     ⎕TRAP←0 'S'
+     ∘∘∘
+ :EndIf
+⍝Done

APLSource/TestCases/Cleanup_Alias.aplf

@@ -1,4 +1,5 @@
  Cleanup_Alias
+ FilesAndDirs.RmDir ∆ALIAS_TEMP_FOLDER,'/..'
 ⍝ Just in case...
  ##.Cider.DropAlias'test-project-1'
  ##.Cider.DropAlias'test-project-2'

APLSource/TestCases/Initial.aplf

@@ -15,7 +15,8 @@
          :EndIf
      :EndIf
  :EndIf
- :If 0=⎕SE.Cider.DEVELOPMENT
+ :If 0<⎕SE.Cider.⎕NC'DEVELOPMENT'
+ :AndIf 0=⎕SE.Cider.DEVELOPMENT
      'Cider''s version number in # and ⎕SE diverge'Assert ⎕SE.Cider.Version≡##.Cider.Version
  :EndIf
  FilesAndDirs.RmDir FilesAndDirs.ListDirs FilesAndDirs.GetTempPath,'Cider-Tests*'  ⍝ Last test run might have left something behind because of the .NET-DLLs-don't-unload problem

APLSource/TestCases/Prepare.aplf

@@ -27,5 +27,5 @@
      3 ⎕MKDIR testPath  ⍝
      T.codeCoverage←⎕NEW CodeCoverage(,⊂'#.',{⍵,'.',⍵}2↓⍕⎕THIS.##)
      T.codeCoverage.filename←testFilename
-     T.codeCoverage.ignore←'#.Cider.Cider.Cider.RunTests,#.Cider.Cider.Cider.RunMake'
  :EndIf
+ T.exec_after_each_test←(⍕⎕THIS),'.CheckTempDirForLeftOvers'

APLSource/TestCases/Test_AddTatinDep_001.aplf

@@ -13,6 +13,7 @@
  config.CIDER.dependencies.tatin←'tatin-packages'
  config ##.Cider.Put_JSON5 configfile
 
+ ##.Cider.C.YesOrNo_Answers←1 2⍴'ChangeCurrentDir@' 'n'
  parms←##.Cider.CreateOpenParms''
  parms.folder←tempDir
  parms.batch←1
@@ -22,7 +23,7 @@
  →T.GoToTidyUp~success
  →T.GoToTidyUp∨/'ERROR'⍷log
 
- list←##.Cider.AddTatinDependencies'[tatin]APLTreeUtils2,[tatin]FilesAndDirs' tempDir 0
+ list←##.Cider.AddTatinDependencies'[tatin]APLTreeUtils2,[tatin]FilesAndDirs'tempDir 0
  →T.GoToTidyUp 2≠≢list
 
  res←##.Cider.CloseProject tempDir
@@ -42,6 +43,7 @@
  R←T._OK
 
 ∆TidyUp:
+ ##.Cider.C.Cleanup
  {}∆LINK'Break' '#.TEMP'
- FilesAndDirs.RmDir tempDir
+ FilesAndDirs.RmDir tempDir,'/..'
 ⍝Done

APLSource/TestCases/Test_Alias_001.aplf

@@ -12,6 +12,7 @@
  parms.watch←'ns'
  parms.ignoreUserExec←1
  parms.batch←1
+ ##.Cider.C.YesOrNo_Answers←1 2⍴'ChangeCurrentDir@' 'n'
  (success log)←##.Cider.OpenProject parms
  →T.PassesIf success
  →T.GoToTidyUp∨/'ERROR'⍷log
@@ -40,6 +41,7 @@
 
 ∆TidyUp:
  ⍝ The aliase are removed by later test cases
+ ##.Cider.C.Cleanup
  res←∆LINK'Break' '#.TEMP'
  Assert res ∆StartsWith'Unlinked:'
  res←∆LINK'Break' '#.TEMP2'

APLSource/TestCases/Test_Alias_006.aplf

@@ -13,6 +13,7 @@
  parms.watch←'ns'
  parms.ignoreUserExec←1
  parms.batch←1
+ ⎕SE.Cider.##.C.YesOrNo_Answers←1 2⍴'ChangeCurrentDir@' 'n'
  (success log)←⎕SE.Cider.OpenProject parms
  Assert success
  →T.GoToTidyUp∨/'ERROR'⍷log
@@ -34,5 +35,7 @@
  R←T._OK
 
 ∆TidyUp:
+ ⎕SE.Cider.##.C.Cleanup
+ {}⎕SE.Link.Break'#.TEMP'
  Assert ⎕SE.Cider.DropAlias'firlefanz2'
 ⍝Done