dd184bbf868ed714e3d536d5eacbd19645bb1f63 hiram Wed Mar 27 09:39:33 2019 -0700 output the track name and sqlTable name if different refs #18869 diff --git src/hg/hubApi/tests/makefile src/hg/hubApi/tests/makefile index df6e5ce..234fa85 100644 --- src/hg/hubApi/tests/makefile +++ src/hg/hubApi/tests/makefile @@ -1,27 +1,28 @@ test:: test0 test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 \ - test11 test12 test13 test14 test15 test16 test17 test18 test19 test20 + test11 test12 test13 test14 test15 test16 test17 test18 test19 test20 \ + test21 setOutput: if [ ! -d testOutput ]; then mkdir testOutput; fi clean:: rm -f testOutput/*.gz rmdir testOutput -excludeLines = downloadTime|downloadTimeStamp +excludeLines = downloadTime|dataTime # test:: # @./jsonConsumer.pl 2> /dev/null | gzip -c > testOutput.json.gz # @zdiff testOutput.json.gz expected.json.gz # testing /list/noSubCommand, /list/publicHubs and /list/ucscGenomes test0: setOutput @./jsonConsumer.pl 2> /dev/null | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # testing /list/hubGenomes test1: setOutput @./jsonConsumer.pl -hubUrl=http://genome-test.gi.ucsc.edu/~hiram/hubs/Plants/hub.txt -endpoint="/list/hubGenomes" | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz @@ -114,16 +115,22 @@ @./jsonConsumer.pl -endpoint="/getData/track" -db="galGal6" -track="gc5BaseBw" -chrom="chr1" -start=1 -end=1024 | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # bigBed data from a database # /getData/track? db=galGal6 &track=gc5BaseBw&chrom=chr1&start=1&end=1024 test19: setOutput @./jsonConsumer.pl -endpoint="/getData/track" -db="galGal6" -track="ncbiRefSeqOther" -chrom="chr1" -start=750000 -end=55700000 | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz # generate an error: ask for non-existent chrom in a track hub # /getData/track? hubUrl Plants &track=assembly_&chrom=chrI&start=1&end=14309681 test20: setOutput @./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 | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz @zdiff expected/$@.gz testOutput/$@.gz +# wiggle data from a database where the SQL table name is different than the +# track name +# /getData/track? db=hg19 &track=wgEncodeRegMarkH3k4me1H1hesc&chrom=chr1&start=62300000&end=62301000 +test21: setOutput + @./jsonConsumer.pl -endpoint="/getData/track" -db="hg19" -track="wgEncodeRegMarkH3k4me1H1hesc" -chrom="chr1" -start=62300000 -end=62301000 | egrep -v "${excludeLines}" | gzip -c > testOutput/$@.gz + @zdiff expected/$@.gz testOutput/$@.gz