Skip to content

Commit

Permalink
Alexander`s NuGet PR pulled & tests amended
Browse files Browse the repository at this point in the history
  • Loading branch information
aplteam committed May 3, 2024
2 parents 326ecc6 + 2203505 commit b721378
Show file tree
Hide file tree
Showing 37 changed files with 64 additions and 60 deletions.
4 changes: 4 additions & 0 deletions APLSource/Cider/LoadNugetDependencies.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
_dotnetReflection.⎕USING'System.Reflection,System.Runtime.dll'
Determine path to dlls of principal dependencies
dlls{¯1','()}¨ns._dotnet.⎕USING
If any of these dlls doesn't exists, they all should be recreated
:If ~/⎕NEXISTS ¨dlls
NuGet.Publish nuGetFolder
:EndIf
assemblies_dotnetReflection.Assembly.LoadFile¨dlls
Add references to namespaces directly exposed by the principal
dependencies to the _dotnet namespace
Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_AddTatinDep_001.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
list##.Cider.AddTatinDependencies'[tatin]APLTreeUtils2,[tatin]FilesAndDirs'tempDir 0
T.GoToTidyUp 2list

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

#.TEMP.(⎕EX ⎕NL-9)
Expand All @@ -37,7 +37,7 @@
{}#.TEMP.APLTreeUtils2.GetOperatingSystem
{}#.TEMP.FilesAndDirs.PWD

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

RT._OK
Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_Alias_006.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
Assert success
T.GoToTidyUp/'ERROR'log

Assert ⎕SE.Cider.CloseProject'[Firlefanz1]'
Assert (~parms.batch)⎕SE.Cider.CloseProject'[Firlefanz1]'
#.⎕EX'TEMP' #.⎕SHADOW'TEMP' 'TEMP'#.⎕NS''

parms.alias'Firlefanz2'
parms.folder'[Firlefanz1]'
(success log)⎕SE.Cider.OpenProject parms
Assert success
T.GoToTidyUp/'ERROR'log
Assert ⎕SE.Cider.CloseProject'[Firlefanz2]'
Assert (~parms.batch)⎕SE.Cider.CloseProject'[Firlefanz2]'

aliase⎕SE.Cider.GetCiderAliasFileContent
T.GoToTidyUp('firlefanz1')aliase[;1]
Expand Down
6 changes: 3 additions & 3 deletions APLSource/TestCases/Test_Alias_007.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
(rc msg res)∆UCMD'OpenProject ',folder,' -parent=#.TEMP -alias=Firlefanz1 -watch=ns -batch -ignoreUserExec'
msg Assert 0=rc

(rc msg res)∆UCMD'CloseProject [firlefanz1]'
(rc msg res)∆UCMD'CloseProject [firlefanz1] -fast'
msg Assert 0=rc
T.GoToTidyUp'Number of projects closed: 1'res
#.⎕EX'TEMP' #.⎕SHADOW'TEMP' 'TEMP'#.⎕NS''
Expand All @@ -21,7 +21,7 @@

aliase⎕SE.Cider.GetCiderAliasFileContent

(rc msg res)∆UCMD'CloseProject [firlefanz2]'
(rc msg res)∆UCMD'CloseProject [firlefanz2] -fast'
msg Assert 0=rc
T.GoToTidyUp'Number of projects closed: 1'res

Expand All @@ -32,7 +32,7 @@

∆TidyUp:
ref.Cleanup
{}∆UCMD'CloseProject [firlefanz2]'
{}∆UCMD'CloseProject [firlefanz2] -fast'
⎕SE.Cider.DropAlias'firlefanz1' Just in case
Assert ⎕SE.Cider.DropAlias'firlefanz2'
Done
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_Alias_008.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
(rc msg res)∆UCMD'OpenProject ',folder,' -parent=#.TEMP -alias=Firlefanz1 -watch=ns -batch -ignoreUserExec'
msg Assert 0=rc

(rc msg res)∆UCMD'CloseProject [firlefanz1]'
(rc msg res)∆UCMD'CloseProject [firlefanz1] -fast'
msg Assert 0=rc
#.⎕EX'TEMP' #.⎕SHADOW'TEMP' 'TEMP'#.⎕NS''

(rc msg res)∆UCMD'OpenProject [firlefanz1] -parent=#.TEMP -alias=Firlefanz1 -watch=ns -batch -ignoreUserExec'
msg Assert 0=rc

(rc msg res)∆UCMD'CloseProject [firlefanz1]'
(rc msg res)∆UCMD'CloseProject [firlefanz1] -fast'
msg Assert 0=rc

aliase⎕SE.Cider.GetCiderAliasFileContent
Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_Misc_016.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
Assert 42ref.Project.Hello
Assert 1ref.Tests.RunTest
T.GoToTidyUp 9ref.⎕NC'TatinVars'
Assert 1=##.Cider.CloseProjectref
Assert 1=(~parms.batch)##.Cider.CloseProjectref
#.⎕EX name
cfg.CIDER.tatinVars'Project'
cfg #.Cider.Cider.Put_JSON5 folder,'/cider.config'
Expand All @@ -48,7 +48,7 @@
rT._OK

∆TidyUp:
{}##.Cider.CloseProjectref
{}(~parms.batch)##.Cider.CloseProjectref
#.⎕EX name
⎕EX'#.Test_Misc_016'
:If 0<⎕SE.Cider.⎕NC'DEVELOPMENT'
Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_NuGet_001.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
{}0 1 ##.Cider.LoadNuGetDependencies tempDir #.TEMP
T.GoToTidyUp~('UtcNow')#.TEMP.Clock.⎕NL-2

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

#.TEMP.(⎕EX ⎕NL-9)
(success log)##.Cider.OpenProject parms
T.GoToTidyUp~success
T.GoToTidyUp/'ERROR'log
T.GoToTidyUp~('UtcNow')#.TEMP.Clock.⎕NL-2
res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

RT._OK
Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_NuGet_002.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
T.GoToTidyUp 2res
T.GoToTidyUp~'Clock' 'NodaTime'∆LazyMatch res[;1]

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

#.TEMP.(⎕EX ⎕NL-9)
Expand All @@ -46,7 +46,7 @@
T.GoToTidyUp~('UtcNow')#.TEMP.Clock.⎕NL-2
T.GoToTidyUp~/'Julian' 'Gregorian'¨#.TEMP.NodaTime.CalendarSystem.⎕NL-2

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

RT._OK
Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_NuGet_003.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{}0 1 ##.Cider.LoadNuGetDependencies tempDir #.TEMP
T.GoToTidyUp~('UtcNow')#.TEMP.Clock.⎕NL-2

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

#.TEMP.(⎕EX ⎕NL-9)
Expand All @@ -43,7 +43,7 @@
res##.Cider.ListNuGetDependencies tempDir
T.GoToTidyUp 1res

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

RT._OK
Expand Down
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_NuGet_004.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
T.GoToTidyUp 2res
T.GoToTidyUp~'Clock' 'NodaTime'∆LazyMatch res[;1]

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

#.TEMP.(⎕EX ⎕NL-9)
Expand Down
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_NuGet_010.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
T.GoToTidyUp~('UtcNow')#.TEMP.Clock.⎕NL-2
T.GoToTidyUp~/'Julian' 'Gregorian'¨#.TEMP.NodaTime.CalendarSystem.⎕NL-2

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

RT._OK
Expand Down
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_NuGet_020.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
T.GoToTidyUp expectedqdmx.EM
:EndTrap

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

RT._OK
Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_NuGet_030.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
T.GoToTidyUp 2res
T.GoToTidyUp~('Parquet.Net')∆LazyMatch res[;1]

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

#.TEMP.(⎕EX ⎕NL-9)
Expand All @@ -46,7 +46,7 @@
T.GoToTidyUp~9.6⎕NC '#.TEMP.Utils.Parquet.ParquetException'
T.GoToTidyUp~9.6⎕NC '#.TEMP.Utils.Parquet.ParquetActor'

res##.Cider.CloseProject tempDir
res(~parms.batch)##.Cider.CloseProject tempDir
T.GoToTidyUp res1

RT._OK
Expand Down
6 changes: 3 additions & 3 deletions APLSource/TestCases/Test_OpenAndClose_001.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
aliase##.Cider.GetCiderAliasFileContent
T.GoToTidyUp~/(⎕C'test-case-alias-Foo' 'test-case-alias-Goo')aliase[;1]

T.GoToTidyUp 1##.Cider.CloseProject'#.Foo'
T.GoToTidyUp 1##.Cider.CloseProject'[test-case-alias-Goo]'
T.GoToTidyUp 0##.Cider.CloseProject'[Does not exist]'
T.GoToTidyUp 10 ##.Cider.CloseProject'#.Foo'
T.GoToTidyUp 10 ##.Cider.CloseProject'[test-case-alias-Goo]'
T.GoToTidyUp 00 ##.Cider.CloseProject'[Does not exist]'

RT._OK

Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_OpenAndClose_003.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
res∆UCMD'CreateProject "',tempDir,'" -noEdit -acceptConfig -batch -ignoreUserExec'

list##.Cider.ListOpenProjects 0
T.GoToTidyUp 0##.Cider.CloseProject'DoesNotExist'
T.GoToTidyUp 00 ##.Cider.CloseProject'DoesNotExist'
T.GoToTidyUp list##.Cider.ListOpenProjects 0
T.GoToTidyUp 1##.Cider.CloseProject'#.Foo'
T.GoToTidyUp 10 ##.Cider.CloseProject'#.Foo'
T.GoToTidyUp(list)1+##.Cider.ListOpenProjects 0

RT._OK
Expand Down
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_OpenAndClose_004.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
T.GoToTidyUp 1list
T.GoToTidyUp'cider.config',/1⎕NPARTS 1list

T.GoToTidyUp 3##.Cider.CloseProject'#.Foo' '[test-case-alias-Goo]' '[Does not exist]'projectFolder3
T.GoToTidyUp 30 ##.Cider.CloseProject'#.Foo' '[test-case-alias-Goo]' '[Does not exist]'projectFolder3

RT._OK

Expand Down
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_009.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@

∆TidyUp:
##.Cider.C.Cleanup
{}##.Cider.CloseProject(⎕THIS),'.TEMP'
{}(~parms.batch)##.Cider.CloseProject(⎕THIS),'.TEMP'
⎕EX'TEMP'
Done
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_040.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
∆TidyUp:
##.Cider.C.Cleanup
(⎕PW ⎕PP ⎕FR)PW PP FR
{}⎕SE.Cider.CloseProject'#.TEMP.Foo'
{}(~parms.batch)⎕SE.Cider.CloseProject'#.TEMP.Foo'
#.⎕EX'TEMP'
#.⎕EX parms.folder
Done
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_050.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

∆TidyUp:
##.Cider.C.Cleanup
{}⎕SE.Cider.CloseProject'#.TEMP.Foo'
{}(~parms.batch)⎕SE.Cider.CloseProject'#.TEMP.Foo'
⎕NDELETE filename
#.⎕EX'TEMP'
Done
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_051.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

∆TidyUp:
##.Cider.C.Cleanup
{}⎕SE.Cider.CloseProject'#.TEMP.Foo'
{}0 ⎕SE.Cider.CloseProject'#.TEMP.Foo'
('r←Hello' 'r←''World''')⎕NPUT filename 1
#.⎕EX'TEMP'
Done
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_052.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

∆TidyUp:
##.Cider.C.Cleanup
{}⎕SE.Cider.CloseProject'#.TEMP.Foo'
{}(~parms.batch)⎕SE.Cider.CloseProject'#.TEMP.Foo'
('r←Hello' 'r←''World''')⎕NPUT filename 1
#.⎕EX'TEMP'
Done
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_055.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@

∆TidyUp:
##.Cider.C.Cleanup
{}⎕SE.Cider.CloseProject'#.TEMP.Foo'
{}0 ⎕SE.Cider.CloseProject'#.TEMP.Foo'
#.⎕EX'TEMP'
Done
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_060.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

∆TidyUp:
##.Cider.C.Cleanup
{}⎕SE.Cider.CloseProject'#.TEMP.Foo'
{}(~parms.batch)⎕SE.Cider.CloseProject'#.TEMP.Foo'
#.⎕EX'TEMP'
defs(defs[;1]¨⎕C⎕SI)defs
(¨{,'=',}/¨defs)⎕NPUT ##.Cider.GetCiderAliasFilename 1
Expand Down
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_061.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

∆TidyUp:
##.Cider.C.Cleanup
{}⎕SE.Cider.CloseProject'#.TEMP.Foo'
{}(~parms.batch)⎕SE.Cider.CloseProject'#.TEMP.Foo'
#.⎕EX'TEMP'
defs(defs[;1]¨'foo')defs
(¨{,'=',}/¨defs)⎕NPUT ##.Cider.GetCiderAliasFilename 1
Expand Down
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_070.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

∆TidyUp:
##.Cider.C.Cleanup
Assert ⎕SE.Cider.CloseProject'[foo]'
Assert (~parms.batch)⎕SE.Cider.CloseProject'[foo]'
#.⎕EX'TEMP'
defs(defs[;1]¨'foo')defs
(¨{,'=',}/¨defs)⎕NPUT ##.Cider.GetCiderAliasFilename 1
Expand Down
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_071.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@

∆TidyUp:
##.Cider.C.Cleanup
{}⎕SE.Cider.CloseProject'#.TEMP.booproj'
{}(~parms.batch)⎕SE.Cider.CloseProject'#.TEMP.booproj'
#.⎕EX'TEMP'
Done
2 changes: 1 addition & 1 deletion APLSource/TestCases/Test_Open_072.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@

∆TidyUp:
##.Cider.C.Cleanup
Assert ⎕SE.Cider.CloseProject'#.TEMP.fooproj'
Assert (~parms.batch)⎕SE.Cider.CloseProject'#.TEMP.fooproj'
#.⎕EX'TEMP'
Done
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_UC_001.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ref.YesOrNo_Answers1 2'ChangeCurrentDir@' 'n'
(rc msg res)∆UCMD'CreateProject "',tempDir,'" -noEdit -acceptConfig -batch -ignoreUserExec'
Assert rc=0
(rc msg res)∆UCMD'CloseProject #.Foo'
(rc msg res)∆UCMD'CloseProject #.Foo -fast'
Assert rc=0

parms##.Cider.CreateOpenParms
Expand All @@ -27,7 +27,7 @@

T.GoToTidyUp 0=list##.Cider.ListOpenProjects 0

(rc msg result)∆UCMD'CloseProject #.Goo.Foo'
(rc msg result)∆UCMD'CloseProject #.Goo.Foo -fast'
msg Assert rc=0
T.GoToTidyUp'Number of projects closed: 1'result

Expand Down
4 changes: 2 additions & 2 deletions APLSource/TestCases/Test_UC_002.aplf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
ref.YesOrNo_Answers1 2'ChangeCurrentDir@' 'n'
(rc msg res)∆UCMD'CreateProject "',tempDir,'" -noEdit -acceptConfig -batch -ignoreUserExec'
Assert rc=0
(rc msg res)∆UCMD'CloseProject #.Foo'
(rc msg res)∆UCMD'CloseProject #.Foo -fast'
Assert rc=0

parms##.Cider.CreateOpenParms
Expand All @@ -25,7 +25,7 @@

T.GoToTidyUp 0=list##.Cider.ListOpenProjects 0

(rc msg result)∆UCMD'CloseProject #.Goo.Foo'
(rc msg result)∆UCMD'CloseProject #.Goo.Foo -fast'
msg Assert rc=0
T.GoToTidyUp'Number of projects closed: 1'result

Expand Down
Loading

0 comments on commit b721378

Please sign in to comment.