39aeb562a83a5d024984c793a7338e33083b498f hiram Fri Apr 7 12:56:37 2023 -0700 adding tests for /list/files with maxItemsOutput and format=text options refs #23589 diff --git src/hg/hubApi/tests/makefile src/hg/hubApi/tests/makefile index a3bc3f2..252ee35 100644 --- src/hg/hubApi/tests/makefile +++ src/hg/hubApi/tests/makefile @@ -21,31 +21,31 @@ hgwdev:: SERVERNAME="https://api-test.gi.ucsc.edu" make test alpha:: SERVERNAME="https://genome-test.gi.ucsc.edu" make test beta:: SERVERNAME="https://apibeta.soe.ucsc.edu" make test all:: test0 listFunctions getFunctions listSchema getSequence wigData \ search supportedTypes errorTests notSupported bugReports listFunctions: list01 list02 list03 list04 list05 list06 list07 list08 list09 \ list10 list11 list12 list13 list14 list15 list16 list17 list18 list19 \ - list20 list21 list22 list23 + list20 list21 list22 list23 list24 list25 getFunctions: test8 test9 test10 test11 test12 test13 test14 \ test15 test16 test19 test21 test26 test27 test28 \ test29 test39 test40 test41 test42 test43 test44 test45 test46 test47 \ test48 test49 test50 test51 test52 test53 test54 test55 test56 test57 \ multiTrack01 multiTrack02 multiTrack03 listSchema: schema01 schema02 schema03 schema04 schema05 schema06 schema07 \ schema08 schema09 schema10 schema11 schema12 getSequence: getSeq01 getSeq02 getSeq03 getSeq04 getSeq05 wigData: wig01 wig02 wig03 wig04 wig05 wig06 wig07 wig08 wig09 wig10 \ wig11 wig12 wig13 wig14 wig15 wig16 wig17 wig18 wig19 wig20 \ wig21 wig22 wig23 wig24 @@ -226,30 +226,42 @@ @./jsonConsumer.pl -serverName="${SERVERNAME}" -endpoint="/list/chromosomes" -genome="hs1" 2>&1 | egrep -v "${excludeLines}" | sed -e 's#https://.*/list#/list#; s#/hubs/.*/hub#/hubs/hub#;' | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # testing /list/files?genome=ce2 list22: setOutput @printf "### $@ '${SERVERNAME}/list/files?genome=ce2'\n" @./jsonConsumer.pl -serverName="${SERVERNAME}" -endpoint="/list/files" -genome="ce2" 2>&1 | egrep -v "${excludeLines}" | sed -e 's#https://.*/list#/list#; s#/hubs/.*/hub#/hubs/hub#;' | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # testing /list/files?genome=GCA_021951015.1 list23: setOutput @printf "### $@ '${SERVERNAME}/list/files?genome=GCA_021951015.1'\n" @./jsonConsumer.pl -serverName="${SERVERNAME}" -endpoint="/list/files" -genome="GCA_021951015.1" 2>&1 | egrep -v "${excludeLines}" | sed -e 's#https://.*/list#/list#; s#/hubs/.*/hub#/hubs/hub#;' | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz +# testing /list/files?genome=ce2;maxItemsOutput=5 +list24: setOutput + @printf "### $@ '${SERVERNAME}/list/files?genome=ce2;maxItemsOutput=5'\n" + @./jsonConsumer.pl -maxItemsOutput=5 -serverName="${SERVERNAME}" -endpoint="/list/files" -genome="ce2" 2>&1 | egrep -v "${excludeLines}" | sed -e 's#https://.*/list#/list#; s#/hubs/.*/hub#/hubs/hub#;' | gzip -c > testOutput/$@.gz + @zdiff expected/$@.gz testOutput/$@.gz + +# testing /list/files?genome=ce2;maxItemsOutput=5;format=text +list25: setOutput + @printf "### $@ '${SERVERNAME}/list/files?genome=ce2;maxItemsOutput=5;format=text'\n" + @ curl -L "${SERVERNAME}/list/files?genome=ce2;maxItemsOutput=5;format=text" 2> /dev/null | egrep -v "${excludeLines}" | sed -e 's#https://.*/list#/list#; s#/hubs/.*/hub#/hubs/hub#;' | gzip -c > testOutput/$@.gz + @zdiff expected/$@.gz testOutput/$@.gz + ########################## getData functions ############################# # testing /getData/track?genome=ce11&track=gold test8: setOutput @./jsonConsumer.pl -serverName="${SERVERNAME}" -maxItemsOutput=123 -endpoint="/getData/track" -genome="ce11" -track="gold" | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # testing /getData/track?genome=ce11&track=gold&chrom=chrM test9: setOutput @./jsonConsumer.pl -serverName="${SERVERNAME}" -endpoint="/getData/track" -genome="ce11" -track="gold" -chrom="chrM" | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # testing /getData/track?genome=ce11&track=gold&chrom=chrI&start=1&end=1024 test10: setOutput @./jsonConsumer.pl -serverName="${SERVERNAME}" -endpoint="/getData/track" -genome="ce11" -track="gold" -chrom="chrI" -start=1 -end=1024 | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz @@ -1009,31 +1021,31 @@ @zdiff expected/$@.gz testOutput/$@.gz # wiggle data from a track hub bigWig file, with chrom, start, end wig24: setOutput @printf "### $@ '${SERVERNAME}/cgi-bin/hubApi/getData/track?track=gc5Base;chrom=chrCp;genome=araTha1;hubUrl=http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt;end=5647;start=1234;jsonOutputArrays=1;maxItemsOutput=5'\n" @./jsonConsumer.pl -serverName="${SERVERNAME}" -endpoint="/getData/track" -hubUrl="http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt" -genome="araTha1" -track="gc5Base" -chrom="chrCp" -start=1234 -end=5647 -jsonOutputArrays -maxItemsOutput=5 2>&1 | egrep -v "${excludeLines}" | sed -e 's#https://.*/getData#/getData#;' | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz ############################################################################## ### search - test search function ############################################################################## # basic search just to see if it works: search01: setOutput @ printf "### $@ '${SERVERNAME}/search?search=brca;genome=hg38'\n" - @ curl -L "${SERVERNAME}/search?search=brca;genome=hg38" 2> /dev/null | python -mjson.tool | egrep -c -n "\[|\]" | awk -v t="$@" '{if (($$1 < 30) || ($$1 > 40)) {printf "test %s failed, count %d not in range 30-40\n", t, $$1; exit 255;}}' + @ curl -L "${SERVERNAME}/search?search=brca;genome=hg38" 2> /dev/null | python -mjson.tool | egrep -c -n "\[|\]" | awk -v t="$@" '{if (($$1 < 30) || ($$1 > 50)) {printf "test %s failed, count %d not in range 30-40\n", t, $$1; exit 255;}}' ############################################################################## ### chrAlias - test chrom alias ############################################################################## # testing /getData/track?genome=ce11&track=gold&chrom=MT chrAlias01: setOutput @ printf "### $@ '${SERVERNAME}/getData/track?genome=ce11;track=gold;chrom=MT'\n" @./jsonConsumer.pl -serverName="${SERVERNAME}" -endpoint="/getData/track" -genome="ce11" -track="gold" -chrom="MT" 2>&1 | egrep -v "${excludeLines}" | sed -e 's#https://.*/getData#/getData#;' | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # testing /getData/track?genome=ce11&track=gold&chrom=NC_001328.1 chrAlias02: setOutput @ printf "### $@ '${SERVERNAME}/getData/track?genome=ce11;track=gold;chrom=NC_001328.1'\n" @./jsonConsumer.pl -serverName="${SERVERNAME}" -endpoint="/getData/track" -genome="ce11" -track="gold" -chrom="NC_001328.1" 2>&1 | egrep -v "${excludeLines}" | sed -e 's#https://.*/getData#/getData#;' | gzip -c > testOutput/$@.gz