From d06fc474275306e23d96360bc183b8c484e3e42a Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sun, 25 Sep 2016 10:42:39 +0000 Subject: Test: input parameters for mapping --- .../input/mapping/1435395_s_at_HC_M2_0606_P.json | 140 +++++++++++++++++++++ test/lib/mapping.rb | 3 +- 2 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json (limited to 'test') diff --git a/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json b/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json new file mode 100644 index 00000000..2c4446ec --- /dev/null +++ b/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json @@ -0,0 +1,140 @@ +{ "maf" : "0.01", + "control_marker" : "mCV24506226", + "dataset" : "HC_M2_0606_P", + "do_control" : "false", + "maf" : "0.01", + "manhattan_plot" : "False", + "mapmethod_rqtl_geno" : "em", + "mapmodel_rqtl_geno" : "normal", + "method" : "rqtl_geno", + "num_bootstrap" : "2000", + "num_perm" : "", + "pair_scan" : "false", + "suggestive" : "[object Object]", + "trait_id" : "1433387_at", + "value:129S1/SvImJ" : "6.920", + "value:A/J" : "7.437", + "value:AKR/J" : "7.550", + "value:B6D2F1" : "7.742", + "value:BALB/cByJ" : "6.613", + "value:BALB/cJ" : "6.664", + "value:BXD1" : "6.749", + "value:BXD100" : "x", + "value:BXD101" : "x", + "value:BXD102" : "x", + "value:BXD103" : "x", + "value:BXD11" : "7.398", + "value:BXD12" : "7.073", + "value:BXD13" : "8.191", + "value:BXD14" : "x", + "value:BXD15" : "7.406", + "value:BXD16" : "6.890", + "value:BXD18" : "x", + "value:BXD19" : "6.980", + "value:BXD2" : "7.248", + "value:BXD20" : "7.554", + "value:BXD21" : "7.316", + "value:BXD22" : "7.327", + "value:BXD23" : "7.605", + "value:BXD24" : "7.306", + "value:BXD24a" : "x", + "value:BXD25" : "x", + "value:BXD27" : "7.800", + "value:BXD28" : "7.023", + "value:BXD29" : "7.518", + "value:BXD30" : "x", + "value:BXD31" : "7.301", + "value:BXD32" : "7.161", + "value:BXD33" : "7.140", + "value:BXD34" : "8.180", + "value:BXD35" : "x", + "value:BXD36" : "x", + "value:BXD37" : "x", + "value:BXD38" : "7.350", + "value:BXD39" : "6.976", + "value:BXD40" : "7.411", + "value:BXD41" : "x", + "value:BXD42" : "7.050", + "value:BXD43" : "6.866", + "value:BXD44" : "7.246", + "value:BXD45" : "7.576", + "value:BXD48" : "7.108", + "value:BXD48a" : "7.192", + "value:BXD49" : "x", + "value:BXD5" : "6.771", + "value:BXD50" : "7.528", + "value:BXD51" : "7.408", + "value:BXD52" : "x", + "value:BXD53" : "x", + "value:BXD54" : "x", + "value:BXD55" : "6.720", + "value:BXD56" : "x", + "value:BXD59" : "x", + "value:BXD6" : "7.372", + "value:BXD60" : "7.178", + "value:BXD61" : "7.198", + "value:BXD62" : "7.618", + "value:BXD63" : "7.076", + "value:BXD64" : "6.576", + "value:BXD65" : "7.046", + "value:BXD65a" : "7.046", + "value:BXD65b" : "7.385", + "value:BXD66" : "7.108", + "value:BXD67" : "7.342", + "value:BXD68" : "7.668", + "value:BXD69" : "7.310", + "value:BXD70" : "7.278", + "value:BXD71" : "x", + "value:BXD72" : "x", + "value:BXD73" : "7.342", + "value:BXD73a" : "7.841", + "value:BXD74" : "7.298", + "value:BXD75" : "7.133", + "value:BXD76" : "7.448", + "value:BXD77" : "7.014", + "value:BXD78" : "x", + "value:BXD79" : "7.916", + "value:BXD8" : "7.148", + "value:BXD81" : "x", + "value:BXD83" : "7.322", + "value:BXD84" : "7.298", + "value:BXD85" : "7.243", + "value:BXD86" : "7.719", + "value:BXD87" : "7.145", + "value:BXD88" : "x", + "value:BXD89" : "7.162", + "value:BXD9" : "6.708", + "value:BXD90" : "7.497", + "value:BXD91" : "x", + "value:BXD93" : "7.558", + "value:BXD94" : "6.817", + "value:BXD95" : "x", + "value:BXD98" : "7.753", + "value:BXD99" : "8.076", + "value:C3H/HeJ" : "7.536", + "value:C57BL/6ByJ" : "6.940", + "value:C57BL/6J" : "7.309", + "value:CAST/EiJ" : "8.796", + "value:CXB1" : "6.430", + "value:CXB10" : "6.958", + "value:CXB11" : "6.182", + "value:CXB12" : "6.432", + "value:CXB13" : "6.388", + "value:CXB2" : "7.687", + "value:CXB3" : "6.312", + "value:CXB4" : "6.453", + "value:CXB5" : "6.959", + "value:CXB6" : "7.022", + "value:CXB7" : "6.334", + "value:CXB8" : "6.790", + "value:CXB9" : "6.545", + "value:D2B6F1" : "7.615", + "value:DBA/2J" : "7.816", + "value:KK/HlJ" : "8.035", + "value:LG/J" : "7.594", + "value:NOD/ShiLtJ" : "8.220", + "value:NZO/HlLtJ" : "7.629", + "value:PWD/PhJ" : "6.320", + "value:PWK/PhJ" : "7.235", + "value:WSB/EiJ" : "7.650" +} diff --git a/test/lib/mapping.rb b/test/lib/mapping.rb index 08b6b5da..bd88b88e 100644 --- a/test/lib/mapping.rb +++ b/test/lib/mapping.rb @@ -1,6 +1,5 @@ # In these tests we navigate from the main page to a specific trait then hit the different mapping tool buttons (In this case pylMM and r/qtl) followed by computing the results (marker regressions). - class MappingTest end @@ -14,6 +13,8 @@ describe MappingTest do it "pyLMM mapping tool selection" do url = $host+'/show_trait?trait_id=1435395_s_at&dataset=HC_M2_0606_P' page = @agent.get(url) + json = JSON::load(File.read('test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json')) + p json # get the form # form = @agent.page.form_with(:name => "my-form") # get the button you want from the form -- cgit v1.2.3 From 71890299c9f8aecb269d8dd2647b85f0a82e91ff Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sun, 25 Sep 2016 10:51:43 +0000 Subject: Test: should be a Post with parameters filled in --- test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json | 2 +- test/lib/mapping.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json b/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json index 2c4446ec..027e4d82 100644 --- a/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json +++ b/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json @@ -1,6 +1,6 @@ { "maf" : "0.01", "control_marker" : "mCV24506226", - "dataset" : "HC_M2_0606_P", + "dataset" : "HC_M2_0606_P", "do_control" : "false", "maf" : "0.01", "manhattan_plot" : "False", diff --git a/test/lib/mapping.rb b/test/lib/mapping.rb index bd88b88e..da580185 100644 --- a/test/lib/mapping.rb +++ b/test/lib/mapping.rb @@ -11,10 +11,11 @@ describe MappingTest do describe MappingTest do it "pyLMM mapping tool selection" do - url = $host+'/show_trait?trait_id=1435395_s_at&dataset=HC_M2_0606_P' - page = @agent.get(url) + url = $host+'/marker_regression?trait_id=1435395_s_at&dataset=HC_M2_0606_P' + page = @agent.post(url) json = JSON::load(File.read('test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json')) p json + p page # get the form # form = @agent.page.form_with(:name => "my-form") # get the button you want from the form -- cgit v1.2.3 From ade0969bdc784d71d67d8422c6fd1238ed3ca391 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Mon, 26 Sep 2016 08:14:42 +0000 Subject: Test: mechanical Rob executes scanone test --- test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json | 8 +++++--- test/lib/mapping.rb | 14 +++++++++----- wqflask/wqflask/views.py | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json b/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json index 027e4d82..9744e7b2 100644 --- a/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json +++ b/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json @@ -1,6 +1,8 @@ -{ "maf" : "0.01", - "control_marker" : "mCV24506226", - "dataset" : "HC_M2_0606_P", +{ + "temp_uuid" : "unknown", +"maf" : "0.01", +"control_marker" : "mCV24506226", +"dataset" : "HC_M2_0606_P", "do_control" : "false", "maf" : "0.01", "manhattan_plot" : "False", diff --git a/test/lib/mapping.rb b/test/lib/mapping.rb index da580185..2678b127 100644 --- a/test/lib/mapping.rb +++ b/test/lib/mapping.rb @@ -5,16 +5,20 @@ end describe MappingTest do before do - @agent = Mechanize.new - @agent.agent.http.ca_file = '/etc/ssl/certs/ca-certificates.crt' end describe MappingTest do it "pyLMM mapping tool selection" do - url = $host+'/marker_regression?trait_id=1435395_s_at&dataset=HC_M2_0606_P' - page = @agent.post(url) + url = $host+'/marker_regression' # ?trait_id=1435395_s_at&dataset=HC_M2_0606_P' + @agent = Mechanize.new + @agent.agent.http.ca_file = '/etc/ssl/certs/ca-certificates.crt' + # @agent.idle_timeout = 0.01 + json = JSON::load(File.read('test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json')) - p json + # p json + page = @agent.post(URI.encode(url), + json, + ({'Content-Type' => 'application/x-www-form-urlencoded'})) p page # get the form # form = @agent.page.form_with(:name => "my-form") diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index b747654a..7061e0f1 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -395,6 +395,7 @@ def mapping_results_container_page(): @app.route("/marker_regression", methods=('POST',)) def marker_regression_page(): initial_start_vars = request.form + logger.debug("Marker regression called with initial_start_vars:", initial_start_vars.items()) temp_uuid = initial_start_vars['temp_uuid'] wanted = ( 'trait_id', @@ -432,7 +433,6 @@ def marker_regression_page(): 'mapmethod_rqtl_geno', 'mapmodel_rqtl_geno' ) - logger.debug("Marker regression called with initial_start_vars:", initial_start_vars) start_vars = {} for key, value in initial_start_vars.iteritems(): if key in wanted or key.startswith(('value:')): -- cgit v1.2.3 From 50a571110b6557e2b7dbc536893d3928f0a93bd2 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Mon, 26 Sep 2016 08:30:07 +0000 Subject: Mechanical Rob: make it possible to run single tests --- bin/test-website | 6 +++++- test/lib/gntest.rb | 5 +++++ test/lib/mapping.rb | 40 +++++----------------------------------- 3 files changed, 15 insertions(+), 36 deletions(-) create mode 100644 test/lib/gntest.rb (limited to 'test') diff --git a/bin/test-website b/bin/test-website index 18994cc5..1d6481f4 100755 --- a/bin/test-website +++ b/bin/test-website @@ -4,7 +4,7 @@ USAGE = < 'application/x-www-form-urlencoded'})) p page - # get the form - # form = @agent.page.form_with(:name => "my-form") - # get the button you want from the form - # page.forms.each do |form| - # p form - # end - # button = page.button_with(:value => "pylmm_compute") - # submit the form using that button - # agent.submit(form, button) - # link = page.link_with(text: 'pyLMM') - # page = link.click - # puts page.uri - # link = page.link_with(text: 'Compute') - # page = link.click - # puts page.uri - # probe_link.uri.to_s.must_equal "/marker_regression" end end end - -describe MappingTest do - it "R/qtl mapping tool selection" do - break if $options[:skip_broken] - page = @agent.get($host+'/show_trait?trait_id=1435395_s_at&dataset=HC_M2_0606_P') - link = page.link_with(text: 'R/qtl') - page = link.click - puts page.uri - form.field_with(:name => 'Methods').options[2].select - link = page.link_with(text: 'Compute') - page = link.click - puts page.uri - probe_link.uri.to_s.must_equal "/marker_regression" - end -end -- cgit v1.2.3 From 2d04ad9552f5b3f0551c31797f8fa714e3af4c7a Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Mon, 26 Sep 2016 14:26:47 +0000 Subject: Test: added pylmm test --- test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json | 2 +- test/lib/mapping.rb | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json b/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json index 9744e7b2..15428553 100644 --- a/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json +++ b/test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json @@ -12,7 +12,7 @@ "num_bootstrap" : "2000", "num_perm" : "", "pair_scan" : "false", - "suggestive" : "[object Object]", + "suggestive" : "0", "trait_id" : "1433387_at", "value:129S1/SvImJ" : "6.920", "value:A/J" : "7.437", diff --git a/test/lib/mapping.rb b/test/lib/mapping.rb index 47c4875b..1b52d797 100644 --- a/test/lib/mapping.rb +++ b/test/lib/mapping.rb @@ -11,6 +11,21 @@ describe MappingTest do @agent.agent.http.ca_file = '/etc/ssl/certs/ca-certificates.crt' end + describe MappingTest do + it "pylmm mapping tool selection" do + url = $host+'/marker_regression' + + json = JSON::load(File.read('test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json')) + json["method"] = "pylmm" + # p json + page = @agent.post(URI.encode(url), json) + # Unpacking the page is slow - but the run is enough as a test + # form = page.forms[1] + # form = page.forms_with("marker_regression")[0] + # form.fields.select { |fld| fld.name == 'corr_dataset' }.first.value.must_equal 'HC_M2_0606_P' + end + end + describe MappingTest do it "R/qtl mapping tool selection" do url = $host+'/marker_regression' # ?trait_id=1435395_s_at&dataset=HC_M2_0606_P' -- cgit v1.2.3 From 3fa5e9c2effdab27ba9492203a875d01ddae766c Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Mon, 26 Sep 2016 14:38:27 +0000 Subject: Test: added mechanize test for CIM (reaper) --- test/lib/mapping.rb | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/lib/mapping.rb b/test/lib/mapping.rb index 1b52d797..4c8ff632 100644 --- a/test/lib/mapping.rb +++ b/test/lib/mapping.rb @@ -20,9 +20,9 @@ describe MappingTest do # p json page = @agent.post(URI.encode(url), json) # Unpacking the page is slow - but the run is enough as a test - # form = page.forms[1] # form = page.forms_with("marker_regression")[0] - # form.fields.select { |fld| fld.name == 'corr_dataset' }.first.value.must_equal 'HC_M2_0606_P' + # form.fields.select { |fld| fld.name == 'dataset' }.first.value.must_equal 'HC_M2_0606_P' + # form.fields.select { |fld| fld.name == 'value:BXD1' }.first.value.must_equal '6.749' end end @@ -35,7 +35,22 @@ describe MappingTest do page = @agent.post(URI.encode(url), json, ({'Content-Type' => 'application/x-www-form-urlencoded'})) - p page + form = page.forms_with("marker_regression")[0] + form.fields.select { |fld| fld.name == 'dataset' }.first.value.must_equal 'HC_M2_0606_P' + form.fields.select { |fld| fld.name == 'value:BXD1' }.first.value.must_equal '6.749' + end + end + + describe MappingTest do + it "CIM mapping tool selection (using reaper)" do + url = $host+'/marker_regression' + + json = JSON::load(File.read('test/data/input/mapping/1435395_s_at_HC_M2_0606_P.json')) + json["method"] = "reaper" + page = @agent.post(URI.encode(url), json) + form = page.forms_with("marker_regression")[0] + form.fields.select { |fld| fld.name == 'dataset' }.first.value.must_equal 'HC_M2_0606_P' + form.fields.select { |fld| fld.name == 'value:BXD1' }.first.value.must_equal '6.749' end end -- cgit v1.2.3