c3b225bab71e80a8426d79f777f7596cf197ef15 hiram Wed Apr 24 14:41:59 2019 -0700 passing any or no parameters for list chromosome functions refs #18869 diff --git src/hg/hubApi/tests/jsonConsumer.pl src/hg/hubApi/tests/jsonConsumer.pl index 7c98d01..f8138fe 100755 --- src/hg/hubApi/tests/jsonConsumer.pl +++ src/hg/hubApi/tests/jsonConsumer.pl @@ -228,70 +228,75 @@ } # sub verifyCommandProcessing() ############################################################################# sub processEndPoint() { my $errReturn = 0; if (length($endpoint)) { my $json = JSON->new; my $jsonReturn = {}; if ($endpoint eq "/list/hubGenomes") { my %parameters; # allow no hubUrl argument to test error reports if (length($hubUrl)) { $parameters{"hubUrl"} = "$hubUrl"; } + if (length($genome)) { + $parameters{"genome"} = "$genome"; + } + if (length($db)) { + $parameters{"db"} = "$db"; + } $jsonReturn = performJsonAction($endpoint, \%parameters); $errReturn = 1 if (defined ($jsonReturn->{'error'})); printf "%s", $json->pretty->encode( $jsonReturn ); } elsif ($endpoint eq "/list/tracks") { # no need to verify arguments here, pass them along, or not, # so that error returns can be verified my %parameters; if ($trackLeavesOnly) { $parameters{"trackLeavesOnly"} = "1"; } if (length($db)) { $parameters{"db"} = "$db"; } # allow no hubUrl argument to test error reports if (length($hubUrl)) { $parameters{"hubUrl"} = "$hubUrl"; } # allow call to go through without a genome specified to test error if (length($genome)) { $parameters{"genome"} = "$genome"; } $jsonReturn = performJsonAction($endpoint, \%parameters); $errReturn = 1 if (defined ($jsonReturn->{'error'})); printf "%s", $json->pretty->encode( $jsonReturn ); } elsif ($endpoint eq "/list/chromosomes") { my %parameters; if (length($db)) { $parameters{"db"} = "$db"; - } else { + } if (length($hubUrl)) { $parameters{"hubUrl"} = "$hubUrl"; + } # allow call to go through without a genome specified to test error if (length($genome)) { $parameters{"genome"} = "$genome"; } if (length($track)) { $parameters{"track"} = "$track"; } - } - } $jsonReturn = performJsonAction($endpoint, \%parameters); $errReturn = 1 if (defined ($jsonReturn->{'error'})); printf "%s", $json->pretty->encode( $jsonReturn ); } elsif ($endpoint eq "/getData/sequence") { my %parameters; if (length($db)) { $parameters{"db"} = "$db"; } if (length($hubUrl)) { $parameters{"hubUrl"} = "$hubUrl"; } # allow call to go through without a genome specified to test error if (length($genome)) { $parameters{"genome"} = "$genome"; }