From cb106c76cb72d27736b73d78517c66714d110265 Mon Sep 17 00:00:00 2001 From: allan Date: Thu, 6 Apr 2023 11:31:37 +0100 Subject: [PATCH 1/3] chore: adding services in seperate (deployable) files as alternative to manually running the code from the README in sasjs-test --- sasjs-tests/.gitignore | 3 + sasjs-tests/.sasjslint | 19 ++++ sasjs-tests/package.json | 2 +- sasjs-tests/sasjs/common/invalidJSON.sas | 13 +++ sasjs-tests/sasjs/common/makeErr.sas | 11 +++ sasjs-tests/sasjs/common/sendArr.sas | 21 ++++ sasjs-tests/sasjs/common/sendMacVars.sas | 13 +++ sasjs-tests/sasjs/common/sendObj.sas | 21 ++++ sasjs-tests/sasjs/doxy/Doxyfile | 40 ++++++++ sasjs-tests/sasjs/doxy/DoxygenLayout.xml | 112 ++++++++++++++++++++++ sasjs-tests/sasjs/doxy/doxygen.svg | 26 +++++ sasjs-tests/sasjs/doxy/favicon.ico | Bin 0 -> 2238 bytes sasjs-tests/sasjs/doxy/logo.png | Bin 0 -> 6620 bytes sasjs-tests/sasjs/doxy/new_footer.html | 33 +++++++ sasjs-tests/sasjs/doxy/new_header.html | 57 +++++++++++ sasjs-tests/sasjs/doxy/new_stylesheet.css | 4 + sasjs-tests/sasjs/sasjsconfig.json | 17 ++++ 17 files changed, 391 insertions(+), 1 deletion(-) create mode 100644 sasjs-tests/.sasjslint create mode 100644 sasjs-tests/sasjs/common/invalidJSON.sas create mode 100644 sasjs-tests/sasjs/common/makeErr.sas create mode 100644 sasjs-tests/sasjs/common/sendArr.sas create mode 100644 sasjs-tests/sasjs/common/sendMacVars.sas create mode 100644 sasjs-tests/sasjs/common/sendObj.sas create mode 100644 sasjs-tests/sasjs/doxy/Doxyfile create mode 100644 sasjs-tests/sasjs/doxy/DoxygenLayout.xml create mode 100644 sasjs-tests/sasjs/doxy/doxygen.svg create mode 100644 sasjs-tests/sasjs/doxy/favicon.ico create mode 100644 sasjs-tests/sasjs/doxy/logo.png create mode 100644 sasjs-tests/sasjs/doxy/new_footer.html create mode 100644 sasjs-tests/sasjs/doxy/new_header.html create mode 100644 sasjs-tests/sasjs/doxy/new_stylesheet.css create mode 100644 sasjs-tests/sasjs/sasjsconfig.json diff --git a/sasjs-tests/.gitignore b/sasjs-tests/.gitignore index 4d29575..14ed0b3 100644 --- a/sasjs-tests/.gitignore +++ b/sasjs-tests/.gitignore @@ -21,3 +21,6 @@ npm-debug.log* yarn-debug.log* yarn-error.log* + +sasjsbuild +sasjsresults \ No newline at end of file diff --git a/sasjs-tests/.sasjslint b/sasjs-tests/.sasjslint new file mode 100644 index 0000000..a299472 --- /dev/null +++ b/sasjs-tests/.sasjslint @@ -0,0 +1,19 @@ +{ + "lineEndings": "off", + "noTrailingSpaces": true, + "noEncodedPasswords": true, + "hasDoxygenHeader": true, + "noSpacesInFileNames": true, + "lowerCaseFileNames": true, + "maxLineLength": 80, + "maxHeaderLineLength": 80, + "maxDataLineLength": 80, + "noTabIndentation": true, + "indentationMultiple": 2, + "hasMacroNameInMend": true, + "noNestedMacros": true, + "hasMacroParentheses": true, + "strictMacroDefinition": true, + "noGremlins": true, + "defaultHeader": "/**{lineEnding} @file{lineEnding} @brief {lineEnding}

SAS Macros

{lineEnding}**/" +} \ No newline at end of file diff --git a/sasjs-tests/package.json b/sasjs-tests/package.json index 5d2cafe..81e7803 100644 --- a/sasjs-tests/package.json +++ b/sasjs-tests/package.json @@ -45,4 +45,4 @@ "devDependencies": { "node-sass": "7.0.3" } -} +} \ No newline at end of file diff --git a/sasjs-tests/sasjs/common/invalidJSON.sas b/sasjs-tests/sasjs/common/invalidJSON.sas new file mode 100644 index 0000000..5c9021e --- /dev/null +++ b/sasjs-tests/sasjs/common/invalidJSON.sas @@ -0,0 +1,13 @@ +/** + @file + @brief Makes an error + +

SAS Macros

+**/ + +%webout(OPEN) +data _null_; + file _webout; + put ' the discovery channel '; +run; +%webout(CLOSE) \ No newline at end of file diff --git a/sasjs-tests/sasjs/common/makeErr.sas b/sasjs-tests/sasjs/common/makeErr.sas new file mode 100644 index 0000000..3a9954e --- /dev/null +++ b/sasjs-tests/sasjs/common/makeErr.sas @@ -0,0 +1,11 @@ +/** + @file + @brief Makes an error + +

SAS Macros

+**/ + +If you can keep your head when all about you + Are losing theirs and blaming it on you, +If you can trust yourself when all men doubt you, + But make allowance for their doubting too; \ No newline at end of file diff --git a/sasjs-tests/sasjs/common/sendArr.sas b/sasjs-tests/sasjs/common/sendArr.sas new file mode 100644 index 0000000..edcf382 --- /dev/null +++ b/sasjs-tests/sasjs/common/sendArr.sas @@ -0,0 +1,21 @@ +/** + @file + @brief Returns JSON in Array format + +

SAS Macros

+**/ + +%webout(FETCH) +%webout(OPEN) +%macro x(); + %if %symexist(sasjs_tables) %then + %do i=1 %to %sysfunc(countw(&sasjs_tables)); + %let table=%scan(&sasjs_tables,&i); + %webout(ARR,&table,missing=STRING,showmeta=YES) + %end; + %else %do i=1 %to &_webin_file_count; + %webout(ARR,&&_webin_name&i,missing=STRING,showmeta=YES) + %end; +%mend x; +%x() +%webout(CLOSE) \ No newline at end of file diff --git a/sasjs-tests/sasjs/common/sendMacVars.sas b/sasjs-tests/sasjs/common/sendMacVars.sas new file mode 100644 index 0000000..e8386e4 --- /dev/null +++ b/sasjs-tests/sasjs/common/sendMacVars.sas @@ -0,0 +1,13 @@ +/** + @file + @brief Returns Macro Variables + +

SAS Macros

+**/ + +data work.macvars; + set sashelp.vmacro; +run; +%webout(OPEN) +%webout(OBJ,macvars) +%webout(CLOSE) \ No newline at end of file diff --git a/sasjs-tests/sasjs/common/sendObj.sas b/sasjs-tests/sasjs/common/sendObj.sas new file mode 100644 index 0000000..e1554fe --- /dev/null +++ b/sasjs-tests/sasjs/common/sendObj.sas @@ -0,0 +1,21 @@ +/** + @file + @brief Returns JSON in Object format + +

SAS Macros

+**/ + +%webout(FETCH) +%webout(OPEN) +%macro x(); + %if %symexist(sasjs_tables) %then + %do i=1 %to %sysfunc(countw(&sasjs_tables)); + %let table=%scan(&sasjs_tables,&i); + %webout(OBJ,&table,missing=STRING,showmeta=YES) + %end; + %else %do i=1 %to &_webin_file_count; + %webout(OBJ,&&_webin_name&i,missing=STRING,showmeta=YES) + %end; +%mend x; +%x() +%webout(CLOSE) \ No newline at end of file diff --git a/sasjs-tests/sasjs/doxy/Doxyfile b/sasjs-tests/sasjs/doxy/Doxyfile new file mode 100644 index 0000000..45ad8a4 --- /dev/null +++ b/sasjs-tests/sasjs/doxy/Doxyfile @@ -0,0 +1,40 @@ +ALPHABETICAL_INDEX = NO + +ENABLE_PREPROCESSING = NO +EXTENSION_MAPPING = sas=Java ddl=Java +EXTRACT_LOCAL_CLASSES = NO +FILE_PATTERNS = *.sas \ + *.ddl \ + *.dox +GENERATE_LATEX = NO +GENERATE_TREEVIEW = YES +HIDE_FRIEND_COMPOUNDS = YES +HIDE_IN_BODY_DOCS = YES +HIDE_SCOPE_NAMES = YES +HIDE_UNDOC_CLASSES = YES +HIDE_UNDOC_MEMBERS = YES +HTML_OUTPUT = $(DOXY_HTML_OUTPUT) +HTML_HEADER = $(HTML_HEADER) +HTML_EXTRA_FILES = $(HTML_EXTRA_FILES) +HTML_FOOTER = $(HTML_FOOTER) +HTML_EXTRA_STYLESHEET = $(HTML_EXTRA_STYLESHEET) +INHERIT_DOCS = NO +INLINE_INFO = NO +INPUT = $(DOXY_INPUT) +LAYOUT_FILE = $(LAYOUT_FILE) +USE_MDFILE_AS_MAINPAGE = README.md +MAX_INITIALIZER_LINES = 0 +PROJECT_NAME = $(PROJECT_NAME) +PROJECT_LOGO = $(PROJECT_LOGO) +PROJECT_BRIEF = $(PROJECT_BRIEF) +RECURSIVE = YES +REPEAT_BRIEF = NO +SHOW_NAMESPACES = NO +SHOW_USED_FILES = NO +SOURCE_BROWSER = YES +SOURCE_TOOLTIPS = NO +STRICT_PROTO_MATCHING = YES +STRIP_CODE_COMMENTS = NO +SUBGROUPING = NO +TAB_SIZE = 2 +VERBATIM_HEADERS = NO \ No newline at end of file diff --git a/sasjs-tests/sasjs/doxy/DoxygenLayout.xml b/sasjs-tests/sasjs/doxy/DoxygenLayout.xml new file mode 100644 index 0000000..ac13efb --- /dev/null +++ b/sasjs-tests/sasjs/doxy/DoxygenLayout.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sasjs-tests/sasjs/doxy/doxygen.svg b/sasjs-tests/sasjs/doxy/doxygen.svg new file mode 100644 index 0000000..46f4a19 --- /dev/null +++ b/sasjs-tests/sasjs/doxy/doxygen.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sasjs-tests/sasjs/doxy/favicon.ico b/sasjs-tests/sasjs/doxy/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..d8c7dcbd834428e6136e9f61e0151f2c98466fea GIT binary patch literal 2238 zcmeHHJ5Izf5Pgo5IKPb-3OdA=NJtz235k+|ej8dU+O4*vqobvw-G-Wmnt}r$aR9^x zH~=%YgCpltpp_6(CbFH(n;E}MUJMAj77NgvVUq!S01j!83uiRgZ!ETpnFY->^3@vk z;}epTQ|!EdVE+0BQEOyZ*NFBHpq7^?@9t6D+(JLUpnBLKJ->iFI>zqjSF7N3J9S{{ zz<=w&d~2q1T_nTRAhp&q8wi-igtC=UPlOT-(J{wMuEL0v-7zO-W|K4sAXLKo5^!t> zk3I3a4;QVBU*iyl*kC@f-+JnLnpoea$k>bk7tPP~ z!J7JR^*B4|TlM3m1qN{y)uZ{Y>R|pD?!~3L{8>Ad6<1Pl7Xtn%YgB@yVr3R;Sr#TM p2E8H4)Jw|MA&sJ9h)j4UKf4&e-6Sk+V(c%Hr-CVL%l`Vj`UbwiOVt1X literal 0 HcmV?d00001 diff --git a/sasjs-tests/sasjs/doxy/logo.png b/sasjs-tests/sasjs/doxy/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..e44a476ae0f67e9ef306779b371887fa7222d324 GIT binary patch literal 6620 zcmd6M^`GKvG&l80n5dK|mZD$pMD$ z9-3$TJpaV^hg;`$_T6XibI-nOtphdG*CZohB*DSKA=7%HW`u)-3&7r&5fNa|m7(BS z>;?CYk){gn%m5%9`#}8q1?UY94n6h11J^l!3~R#hK}${9Bp_!mHzt^-e=6qS{*9_j zqa!HQ5v}sr|69Pt!J&MJz{ANTAR@(i#mEl8dGGoj zj)PN*`+u?#tb7~va-vC7{OrJWI!%9O^i=OHx}RS7Ik5ZKp?GfdPPPBzwKmr^ z55k|)oI~?Ndr8H%8b3zv8iXyHMzlIw)r{3liaF4YoRoBM`S>z9@$|`*MB(kRKW6K! z4V;`VhWRdoN{=nq-IY*DMGBR<6OARqAHQ3Y5s?D(CQov+Vz*ybXGfnk89THv7;6|a zv7EoyMGseWVa`mYz8(JlRk)YwIe-Jk9pVzKDs=bCx^~x%TC-KjePL18t!%p=Yr8Wb zBXxTbS})2acJ<~N*S}$iB4(TVv=W&#(pzj2EvUrn^KP`Gus)vac#Y?b$Urr=Ci+nZV)1?k>!Ao$n!hH7g3 z#EVhkuMK!$N?s@~$-|dFd(+}q#qU%xl%Cj=AFsl7aIj&qQh|?3FA81BePxHVBhgJT zq_3gRhx0-KWUrXlHi`yJ+4&y+e(i_{KsWlwRNw9MOaDuHDh4es!r84+kS8qs4nRW@ z1cQF7^B{Wh?ZLl9RY1-zJl4E-fppHkR;TJQYx#UN)oBprW~)rkbOHn(tgIa#aM=$g zNolMVby))4d4jgn;^IU)Eo&+K9m4?&igY?`UcaD~hnxs@ZG3Dt(X@0T_x@FWM!f_t z9buO3&fS>!{GDEoQjIFtp<%mMs|F2rlH@2wRI9jS5HWJ z{w3rtXXA@buzk6)|IepU)q88bj~7>4Tzfg6@Nk=ShS!)rXu~U^wvr3A@+)FmDq)IZs zhd&3VtboX?^A0}Fl^w^%QOLa8p#-`yBsE#c4=am^3_&ZG9JJU1N?lGj7y;}6+MIoE zx70lKJvsj(;e{Zh>HUtc)-lx+@^unFc_vP7q9iuDd{aihm+l3#AMQFKp0*u38EQ}? zg_~VxoB#8bUQ=qTT9=&doZmVbsb_32?{bBHVl095-_b!#leQ&1CmKVYExsQc$cC;1 z6ap?j+H?k~vnhoYBlDGlFI3nRL%v9PFOC%TCvT0d3D$?9oft3BlyS!|x;O9QMVPQml=mtcdd(+i|cfWN89X_7_)qkDjD1nx$4D(KGoFO4M!+{C@m zBj*As+@QP4ZeB^49o+%1n2aq1b7|;6D?-o=f5#jJ`4H>kAtC8UCqJ~bl}@VHV(Nhn zc8kTC?;mu7$$JU^mitrMe@Ue-azPh%J4Z^!=W9N42lMbs72^|9xbjvU3n|^pmPmQK zUP$X0%MF$T>^r{c`D^xG7fUfe+efP2OCrB{{AOZsTr6x!O!D*}eWGMb{@0!zppy#A zQ=j&ppU^W~?7OzgZ4Gh02oxFsmhg9FvOtSXFY>_#c^x1#q;$&%k9520j`r@Jq7&=g3A+@~}{th_fEJzpE5pKUw9Y4Dr|&3qLOWwEi481g9j;nq><&}U>Sc()^R zRe)kw?fc^m2z0eDWfBj_TvlT1prkUxBo&BM;qOdDIiC56gSh~CGaiezdM^OXMH3zU zn2I{`#VW5HSi$dBwYfy5rbjcY`%yzmP~q3@=eBtabRvSD&wP|wl$jzwe=-o}}VG_;*HV6&i&Xl)F=&O_C>X-Fg zic7)bx}F*ad5S`BhLhQpMw4>e`0E@kdslKBy@p=0$Vn}R)J(Ha9_FV{VFzQ?py|o% z<3kDKF|?!(bpEdvvpnn`R{3jBUm5p|?P+GkwCFzgb^o+!5(%`CnC1!7UELUCCDG2; z_wW@o2SDer3T}7?W>NG_I1LTx+8kLf8syl7tUm7TR|s8a27`Rsf-!k(k|_10^-N`8 zhzZu)TXukZH<-ljn-0b%YrfJyt@rRqRD#QHQv;_zS=MjgD*)B-LjWP$ss0>@?W@CH zyEVTNgBy)8*0E^xx<5Fc$ZyN$oh~I9j3Aoy&rpj|`2ow-Zx(_C+ssW+I*zkW1E0kS* z$&(Ho93k@+f+iZAyVrGuFexpY_x69G)rnxQYHogEA=*(ai!8EgGBP;4{F!Qdz?^If zE2$-{REI$T+C@s<|7KLkvQztvV~sH9q>*XCTqsl0-oLwcrO#XXTkU0MK=Nl<+!gE5stTn0fINiOXG?j%)GjKG#+Vamdf+XzzO~c_&bMMV?Jt1!uSUf~ zqfCn$|H>%MtYy6bs`^qx9Ek%A)+Z~cRVW0?$k%z&M?=Ze*uok0ZM*1nNOyjX+QTv( zg>out;LRTN8=>Y4lo^2c0@TtZV9Cnx@71rE_lGnh*IX}5f~KfCc(M2IxrrlRNu~^6#NH|Ctdd~KFuK% zew;k1Vn3)5tiLJ5Iqi@DZ+XO)@#y49R5aWw6+x{ff)55gQiS~GcffOPCu|Js<#n6> zURm&2wK8IS{&kXnN*|OMnfFb$O>N8R{3_~1MGaV6ZmTAF&H;$;$^L~7yG!p3Ia0!# zp97L;Cg*<1>$r}dV4Xfpv5&e6Kbi7WZ>9@GvCuTRFM!6@uA6s=JII7g3O%UeZvx}-ADiWfhLU_G&mgTBpy@kDx&u!17`_xO{+rH?87VsbY|?TXwv@H|8U{P>j|0UGwIy zK7H=oTH#5XwIBFh6(W%0Ciup=MNX$PsVlE5qsC{fmme9fB#kb$OOKHUB3ABv^97Q2 z@}C9vpCEx3?t#qC^7r?vIY8oIqM?<;-^-Wr^tFGknvTHe+_v)vw}8b_`~Ik_{wOhR z5&LXOcaBrDqrEv!w<^`x$QP&nPl=-85x5Xqg4eL&h2Zmn)(Tzp%~6+LE>&6`6gt4K z0%ExM_Nw2v+`c)yL}&Wi%~&2i+Ik=#`Sgk-2L2l#VoIVf(i=FV6b`fH4PuI+5Z6ME zy?tY|n#0{B*5WLQpSS#|y*!{VCO-Cs03*quXMtbnx zgnGWw**q#DqD|%YKe;fwlIbP+bI$C8`FcfLBCs;>4hL+COV7FnEYZtu5}-P$O|)-5 z(|fC7&Ap(a{u{t!-RsjWv0-c_jrvJ^sE9g#Etk|e4=t*BryYjO7Ecbp zwJJlx|zvAg)e=aP>|8KbpQ?G=D!^Mj+kDvtL5CoW<2XhCX}dBN3P{ff;*kG zstQn#(K7g)<`Fv}aVh3qnzI%UBT3J9n|;~0_^tE@A97`L1^x0J!_4aR^@b=d=)$f} zKW8~M!tUnPAd}*z`^rt)jRZJgR}#V){cJ^@0M)SF=0SAf#L}rGr=7!5{h$3!%$YhD zYP!l=OSZG29?E*gr;}Yq-33zjjtraR1@@#}8tE|~g9yG0YxpEIpokq|q&HoG-!Ss_d+Ly@lZS)T9_BQ-bK<+T6a;tpnPDn1r&;j}3T zARp6B|ND2Nsx%M}k*b&S2mu7PBY)_W_Ne}d5V$SziZq#Q2GG$tlhAhXmUR;UG+X`5 zU+P@{X!Fg=EA0ltj<>KJIPA}%P}N4pypi{zT9j!SIfMsWeFe*HxUSv|%L)JhGbZc1 zUxMaikeB5p9)b6Fk*QQFn?e68GYM|v&cBH_-(bOlHPF-Y7jdQgwM%}#Us(S37q?0L zuFl?NswvzLgGfr)Kjfzm`ps`Lxbb=;)ix;2eq(;$s=dcN`0T2o*6(r4;%*D+>1m?h z(9n>%(ecH#3=8eo2cH&A}_h?mrXXQniVZ2OqYtp zFk&t0=R#6uJ|VzpAz<#DC9CY|y1lI1-f?=RN?qF>e)t%I zzg5b{=DO`t*eI;Sv{V9;o<;;7uyX}JqZhF@3mvg(4`Dbg^)Y>2VA{|a7I{z{WTPf1 z&a@C07x%S%iF$en7wb}p8%4dXr>o0ty;vp;s4NR3CVA$149_p$N>cUn_!#%z;?f@n!Pg?4SUGhu8J4X!1 zzJbdJI*_X#{OmCrtZN?%=U{V5$TD&F|_ zYdWKpHxSFFwXZhGJ3PK6PAPq~IcET#J`vu4fhS`GWURa)3ku;Cq=Fq2d1 z9OQ-B2W@wT2GtpKE6@WVkRJ1uv@)z?gf)hNh!lL(+xQL@wj6W6aE%eSUuX7hrZ%Y= z1`~@pBaO*L;~RzYX3}Tpl-tB?q(w|SorxAv8X1#x!4mqX zq_f#0(<1zmwb1i#>@(%dM}Y&^$7_NGiqJgvU!VeEz>Ei35LZ^WK|K59>n9$NpJE@M zp?NQO=)W-`!8r`cQu9O} z|1rNG7S7Q~BJ8Bada;DUF^6lCP6)(n()@u!KmN~r601V>&}d=B=51&=4_n6zbi0My z^jxd1HBc(~hXB7-!riqoZRJK~Sq-?EI%zaiLJrIWh$fZ3Iog>0!pgla7A599OuOi8 z!3%7Ow(S3ddU$q%4ua4N+fZ*aIh!Q3&?lJ%|e9DeCh z4YhF}w|fSDW)+h5aCCO5NcLspi!3FXXd7EoTLKl}EHw;qJhs=ic)HZ1%D`qi(`-jJ zz3-kj`@2Rlkx|U%f)zl{r6`qG5_Yj9M-$b=A|3G8Ien9?E1qI+2^#KeWVYjl+B}_e{qN2pTZbWd?-yqvyB7Vu(--)rC zMJYI+sq5imSF5h4b&hiaHDdN5y3Z+;dRP8an$VYsFx<-&G{_(D;a@}JZ|%e|`LHfW z?JMShh=Rd^-{n?Z*Q)~k?hxuc2I)$P8H(-lb4~Z}Q$ZXfalaDBMIi?RDaVuU3{B$y z*sGY=_t58xQ^u2T17O^~4$8MahkjhKm zB)Ij-(cz45TF;&!W@-pe3?E$HO&tesNo%s!e^+=cXkJ6?N4G|*D83t~V-$5=(0_Y- z;N5N*&hnkOqJSQ&uWnxNkNRPX=RJ0|0-I`oCnS*EuqE%a6s6aF5XDHQ(a zaTsWURcRs2@?6VOZiAxVpWDIEmy1|9UZHN(k~Q3?t}if{k-?3m4s3Keb#^gj2T<0& z=E>eQlWbi|(fW3KM)`CZu*jWB)p9tEy&Ud@~9kWC{-*!pdcd6B={2t@2T?(&VKSl7!;7a zb0bXe7!|PXB!~ybH9qo8B-+lguGJM+F~bPro1pFaeqI@kLuz5y z(-^rUpzs$Ztg`%Q(oK!enS@loxg4ls!dyS-e9y^Uxb{I2`##^-JnLKNTcr8fr9ZQ$ z<-VE#n)07C8^!fkMqgVfBDeQ(fXqxaE#k2X3s%!*wBhx4buKcV6HJC}gjV>dQkK4= z!={k#_1<$j<1NRPD^%{pf3ER*4MM9Kko@t(uyzK{;V}XmGUD_0_6XUPb&rui(9O literal 0 HcmV?d00001 diff --git a/sasjs-tests/sasjs/doxy/new_footer.html b/sasjs-tests/sasjs/doxy/new_footer.html new file mode 100644 index 0000000..81e1b47 --- /dev/null +++ b/sasjs-tests/sasjs/doxy/new_footer.html @@ -0,0 +1,33 @@ + + + + + + +
+
+ + $generatedby   + doxygen + + $doxygenversion + +
+ + diff --git a/sasjs-tests/sasjs/doxy/new_header.html b/sasjs-tests/sasjs/doxy/new_header.html new file mode 100644 index 0000000..6f7dab9 --- /dev/null +++ b/sasjs-tests/sasjs/doxy/new_header.html @@ -0,0 +1,57 @@ + + + + + + + + + + $projectname: $title + + + + $title + + + + + $treeview $search $mathjax + + + $extrastylesheet + + +
+ + + +
+ + + + + + + + + + + + + + +
+
$projectname
+
$projectbrief
+ 		$searchbox
+
+ + +
+ + diff --git a/sasjs-tests/sasjs/doxy/new_stylesheet.css b/sasjs-tests/sasjs/doxy/new_stylesheet.css new file mode 100644 index 0000000..b7ec9a3 --- /dev/null +++ b/sasjs-tests/sasjs/doxy/new_stylesheet.css @@ -0,0 +1,4 @@ +#projectlogo img { + border: 0px none; + max-height: 70px; +} diff --git a/sasjs-tests/sasjs/sasjsconfig.json b/sasjs-tests/sasjs/sasjsconfig.json new file mode 100644 index 0000000..8d8aebd --- /dev/null +++ b/sasjs-tests/sasjs/sasjsconfig.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://cli.sasjs.io/sasjsconfig-schema.json", + "serviceConfig": { + "serviceFolders": [ + "sasjs/common" + ] + }, + "defaultTarget": "4gl", + "targets": [ + { + "name": "4gl", + "serverType": "SASJS", + "serverUrl": "https://sas9.4gl.io", + "appLoc": "/Public/app/common" + } + ] +} \ No newline at end of file From d1139857a452eae846c64542dd2d6b0703250f84 Mon Sep 17 00:00:00 2001 From: Allan Bowe <4420615+allanbowe@users.noreply.github.com> Date: Thu, 6 Apr 2023 11:33:31 +0100 Subject: [PATCH 2/3] Update invalidJSON.sas --- sasjs-tests/sasjs/common/invalidJSON.sas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sasjs-tests/sasjs/common/invalidJSON.sas b/sasjs-tests/sasjs/common/invalidJSON.sas index 5c9021e..49dea67 100644 --- a/sasjs-tests/sasjs/common/invalidJSON.sas +++ b/sasjs-tests/sasjs/common/invalidJSON.sas @@ -1,6 +1,6 @@ /** @file - @brief Makes an error + @brief Makes an invalid JSON file

SAS Macros

**/ @@ -10,4 +10,4 @@ data _null_; file _webout; put ' the discovery channel '; run; -%webout(CLOSE) \ No newline at end of file +%webout(CLOSE) From 3daa85a74af6fef31d09503a27919286ed36550d Mon Sep 17 00:00:00 2001 From: allan Date: Thu, 6 Apr 2023 11:41:54 +0100 Subject: [PATCH 3/3] chore: updating appLoc to /Public/app/adapter-tests in sasjs-tests --- sasjs-tests/README.md | 11 ++++++----- sasjs-tests/public/config.json | 6 +++--- sasjs-tests/sasjs/sasjsconfig.json | 2 +- sasjs-tests/src/testSuites/Compute.ts | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sasjs-tests/README.md b/sasjs-tests/README.md index 075e220..cebec2c 100644 --- a/sasjs-tests/README.md +++ b/sasjs-tests/README.md @@ -65,6 +65,7 @@ The code below will work on ALL SAS platforms (Viya, SAS 9 EBI, SASjs Server). ```sas filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas"; %inc mc; +%let apploc=/Public/app/adapter-tests; filename ft15f001 temp lrecl=1000; parmcards4; %webout(FETCH) @@ -80,7 +81,7 @@ parmcards4; %mend; %x() %webout(CLOSE) ;;;; -%mx_createwebservice(path=/Public/app/common,name=sendObj) +%mx_createwebservice(path=&apploc/services/common,name=sendObj) parmcards4; %webout(FETCH) %webout(OPEN) @@ -95,7 +96,7 @@ parmcards4; %mend; %x() %webout(CLOSE) ;;;; -%mx_createwebservice(path=/Public/app/common,name=sendArr) +%mx_createwebservice(path=&apploc/services/common,name=sendArr) parmcards4; data work.macvars; set sashelp.vmacro; @@ -104,14 +105,14 @@ parmcards4; %webout(OBJ,macvars) %webout(CLOSE) ;;;; -%mx_createwebservice(path=/Public/app/common,name=sendMacVars) +%mx_createwebservice(path=&apploc/services/common,name=sendMacVars) parmcards4; If you can keep your head when all about you Are losing theirs and blaming it on you, If you can trust yourself when all men doubt you, But make allowance for their doubting too; ;;;; -%mx_createwebservice(path=/Public/app/common,name=makeErr) +%mx_createwebservice(path=&apploc/services/common,name=makeErr) parmcards4; %webout(OPEN) data _null_; @@ -120,7 +121,7 @@ data _null_; run; %webout(CLOSE) ;;;; -%mx_createwebservice(path=/Public/app/common,name=invalidJSON) +%mx_createwebservice(path=&apploc/services/common,name=invalidJSON) ``` You should now be able to access the tests in your browser at the deployed path on your server. diff --git a/sasjs-tests/public/config.json b/sasjs-tests/public/config.json index 334150a..0521d21 100644 --- a/sasjs-tests/public/config.json +++ b/sasjs-tests/public/config.json @@ -3,10 +3,10 @@ "password": "", "sasJsConfig": { "serverUrl": "", - "appLoc": "/Public/app", - "serverType": "SASVIYA", + "appLoc": "/Public/app/adapter-tests", + "serverType": "SASJS", "debug": false, "contextName": "sasjs adapter compute context", "useComputeApi": true } -} +} \ No newline at end of file diff --git a/sasjs-tests/sasjs/sasjsconfig.json b/sasjs-tests/sasjs/sasjsconfig.json index 8d8aebd..331a467 100644 --- a/sasjs-tests/sasjs/sasjsconfig.json +++ b/sasjs-tests/sasjs/sasjsconfig.json @@ -11,7 +11,7 @@ "name": "4gl", "serverType": "SASJS", "serverUrl": "https://sas9.4gl.io", - "appLoc": "/Public/app/common" + "appLoc": "/Public/app/adapter-tests" } ] } \ No newline at end of file diff --git a/sasjs-tests/src/testSuites/Compute.ts b/sasjs-tests/src/testSuites/Compute.ts index 2f4f75f..8c0e962 100644 --- a/sasjs-tests/src/testSuites/Compute.ts +++ b/sasjs-tests/src/testSuites/Compute.ts @@ -48,7 +48,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({ test: () => { const data: any = { table1: [{ col1: 'first col value' }] } return adapter.startComputeJob( - '/Public/app/common/sendArr', + '/Public/app/adapter-tests/services/common/sendArr', data, {}, undefined,