From ef7e8e051faef819a02dfd6dea6a7169205069de Mon Sep 17 00:00:00 2001 From: 4gl <@> Date: Tue, 12 May 2026 13:25:36 +0100 Subject: [PATCH] chore: updating tests around mv_createfolder --- .github/workflows/main.yml | 1 + sasjs/sasjsconfig.json | 5 +--- tests/testinit.sas | 2 +- tests/viyaonly/mv_createfolder.test.sas | 33 ++++++++++++++++++++++--- viya/mv_createfolder.sas | 1 - 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7994cc3..1ed815c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,6 +82,7 @@ jobs: rm -rf *.svg rm -rf search cp -R ../sasjsbuild/docs/* . + ls git config user.name sasjs echo 'core.sasjs.io' > CNAME git add . diff --git a/sasjs/sasjsconfig.json b/sasjs/sasjsconfig.json index 15116d0..d15fa3c 100644 --- a/sasjs/sasjsconfig.json +++ b/sasjs/sasjsconfig.json @@ -25,10 +25,7 @@ }, "testConfig": { "initProgram": "tests/testinit.sas", - "termProgram": "tests/testterm.sas", - "macroVars": { - "mcTestAppLoc": "/Public/temp/macrocore" - } + "termProgram": "tests/testterm.sas" }, "defaultTarget": "server", "targets": [ diff --git a/tests/testinit.sas b/tests/testinit.sas index 854b048..80a81e4 100644 --- a/tests/testinit.sas +++ b/tests/testinit.sas @@ -10,7 +10,7 @@ **/ /* location in metadata or SAS Drive for temporary files */ -%let mcTestAppLoc=/Public/testresults/sasjs_core/%mf_uid(); +%let mcTestAppLoc=/Users/&sysuserid/testresults/sasjs_core/%mf_uid(); /* set defaults */ %mp_init() diff --git a/tests/viyaonly/mv_createfolder.test.sas b/tests/viyaonly/mv_createfolder.test.sas index 605d818..fd49440 100644 --- a/tests/viyaonly/mv_createfolder.test.sas +++ b/tests/viyaonly/mv_createfolder.test.sas @@ -5,6 +5,7 @@

SAS Macros

@li mf_uid.sas @li mp_assert.sas + @li mp_assertscope.sas @li mv_createfolder.sas @li mv_deleteviyafolder.sas @li mv_getfoldermembers.sas @@ -15,7 +16,11 @@ %let folder=%mf_uid(); /* create a folder */ +%mp_assertscope(SNAPSHOT) %mv_createfolder(path=&mcTestAppLoc/temp/&folder/&folder) +%mp_assertscope(COMPARE, ignorelist=MC0_JADP1LEN MC0_JADP2LEN MC0_JADPNUM + MC0_JADVLEN MC2_JADP1LEN MC2_JADP2LEN MC2_JADPNUM MC2_JADVLEN +) %mv_getfoldermembers(root=&mcTestAppLoc/temp/&folder, outds=work.folders) @@ -32,17 +37,39 @@ run; ) /* create a folder without output dataset as part of the original macro */ -%mv_createfolder(path=&mcTestAppLoc/temp/&folder/folder2,outds=folders2) +%mv_createfolder(path=&mcTestAppLoc/temp/&folder/f2 + ,outds=folders2,mdebug=&sasjs_mdebug +) %let test=0; data _null_; set work.folders2; putlog (_all_)(=); - if not missing(self_uri) and not missing(parent_uri) - then call symputx('test2',1); + if not missing(self_uri) then call symputx('test2',1); run; %mp_assert( iftrue=(&test2=1), desc=Check if outds param works +) + +/* create a folder with full stops */ +%let newfolder=%mf_uid().2.1; +%mv_createfolder(path=&mcTestAppLoc/temp/&newfolder + ,outds=work.folders3 + ,mdebug=&sasjs_mdebug +) + +%mv_getfoldermembers(root=&mcTestAppLoc/temp, outds=work.folders3) + +%let test3=0; +data _null_; + set work.folders3; + putlog (_all_)(=); + if name="&newfolder" then call symputx('test3',1); +run; + +%mp_assert( + iftrue=(&test3=1), + desc=Check if folder with full stops can be successfully created ) \ No newline at end of file diff --git a/viya/mv_createfolder.sas b/viya/mv_createfolder.sas index 0937e95..fdfa2cd 100644 --- a/viya/mv_createfolder.sas +++ b/viya/mv_createfolder.sas @@ -145,7 +145,6 @@ options noquotelenmax; run; %end; %if &SYS_PROCHTTP_STATUS_CODE=200 %then %do; - %*put &sysmacroname &newpath exists so grab the follow on link ; data _null_; set &libref1..links; if rel='createChild' then