d1e16597846fc15d4388fc0625ce265aec2cd490 hiram Tue Jul 2 16:02:00 2019 -0700 adding new list function to show schema for a table with row count refs #23739 diff --git src/hg/hubApi/tests/makefile src/hg/hubApi/tests/makefile index cd85e5d..343b8cd 100644 --- src/hg/hubApi/tests/makefile +++ src/hg/hubApi/tests/makefile @@ -1,29 +1,31 @@ -test:: test0 listFunctions getFunctions getSequence wigData errorTests \ - notSupported bugReports +test:: test0 listFunctions getFunctions listSchema getSequence wigData \ + errorTests notSupported bugReports all:: listFunctions getFunctions getSequence wigData errorTests \ notSupported listFunctions: list01 list02 list03 list04 list05 list06 list07 list08 list09 \ list10 list11 list12 list13 list14 list15 getFunctions: test6 test7 test8 test9 test10 test11 test12 test13 test14 \ test15 test16 test19 test21 test26 test27 test28 \ test29 test39 test40 +listSchema: schema01 schema02 schema03 schema04 + getSequence: getSeq01 getSeq02 getSeq03 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 errorTests: err01 err02 err03 err04 err05 err06 err07 err08 err09 err10 \ err11 err12 err13 err14 err15 err16 err17 err18 err19 err20 \ err21 err22 err23 err24 err25 err26 err27 err28 err29 err30 \ err31 err32 err33 err34 err35 err36 err37 err38 err39 notSupported: notSup01 notSup02 notSup03 notSup04 notSup05 notSup06 \ notSup07 notSup08 bugReports: redmine23733 @@ -252,30 +254,55 @@ @zdiff expected/$@.gz testOutput/$@.gz # testing /getData/sequence? hubUrl Bejerano genome=hg19&chrom=chrM&start=4321&end=5647 getSeq02: setOutput @printf "### $@ " @./jsonConsumer.pl -endpoint="/getData/sequence" -hubUrl="http://genome-test.gi.ucsc.edu/~hiram/hubs/GillBejerano/hub.txt" -genome="hg19" -chrom="chrM" -start=4321 -end=5678 | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # testing /getData/sequence? genome=monDom5&chrom=chr1&start=4321&end=5647 getSeq03: setOutput @printf "### $@ " @./jsonConsumer.pl -endpoint="/getData/sequence" -genome="monDom5" -chrom="chr1" -start=748055061 -end=748055161 | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz ############################################################################### +# /list/schema testing +############################################################################### +# testing /list/schema? genome=monDom5&track=gold +schema01: setOutput + @printf "### $@ 'https://hgwdev-hiram.gi.ucsc.edu/list/schema?track=gold;genome=monDom5'\n" + @./jsonConsumer.pl -endpoint="/list/schema" -genome="monDom5" -track=gold | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz + @zdiff expected/$@.gz testOutput/$@.gz + +# testing /list/schema? genome=hg19&track=ctgPos +schema02: setOutput + @printf "### $@ 'https://hgwdev-hiram.gi.ucsc.edu/list/schema?track=ctgPos;genome=hg19'\n" + @./jsonConsumer.pl -endpoint="/list/schema" -genome="hg19" -track=ctgPos | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz + @zdiff expected/$@.gz testOutput/$@.gz + +schema03: setOutput + @printf "### $@ 'https://hgwdev-hiram.gi.ucsc.edu/list/schema?track=gold;genome=ce2'\n" + @./jsonConsumer.pl -endpoint="/list/schema" -genome="ce2" -track=gold | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz + @zdiff expected/$@.gz testOutput/$@.gz + +schema04: setOutput + @printf "### $@ 'https://hgwdev-hiram.gi.ucsc.edu/list/schema?track=assembly;genome=araTha1;hubUrl=http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt'\n" + @./jsonConsumer.pl -endpoint="/list/schema" -hubUrl="http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt" -genome="araTha1" -track=assembly | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz + @zdiff expected/$@.gz testOutput/$@.gz + +############################################################################### # ERROR testing ############################################################################### # generate an error: ask for non-existent chrom in a track hub # /getData/track? hubUrl Plants &track=assembly&chrom=chrI&start=1&end=14309681 err01: setOutput @printf "### $@ https://hgwdev-api.gi.ucsc.edu/getData/track?track=assembly;chrom=chrI;genome=araTha1;hubUrl=http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt;end=14309681;start=1\n" @./jsonConsumer.pl -endpoint="/getData/track" -hubUrl="http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt" -genome="araTha1" -track="assembly" -chrom="chrI" -start=1 -end=14309681 2>&1 | sed -e 's#https://.*/getData#/getData#;' | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # error test, can not open bigWig file err02: setOutput @printf "### $@ https://hgwdev-api.gi.ucsc.edu/getData/track?track=gc5Base;chrom=chrA9;genome=braRap1;hubUrl=http://genome-test.gi.ucsc.edu/~hiram/hubs/bPlants/hub.txt\n" @./jsonConsumer.pl -endpoint="/getData/track" -hubUrl="http://genome-test.gi.ucsc.edu/~hiram/hubs/bPlants/hub.txt" -genome="braRap1" -track="gc5Base" -chrom=chrA9 2>&1 | egrep -v "${excludeLines}" | sed -e 's#https://.*/getData#/getData#;' | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz