diff options
| author | rautenberg <rautenberg@in-silico.ch> | 2013-07-29 17:26:06 +0200 |
|---|---|---|
| committer | rautenberg <rautenberg@in-silico.ch> | 2013-07-29 17:26:06 +0200 |
| commit | 3e4e28d58a5e93920702df87603b1fb4895479a8 (patch) | |
| tree | 6df0f048c67952effd7b2bd319234d2623529e29 | |
| parent | 09e3d3df14555d8ddb9787fbfc50df191e8f123b (diff) | |
adapt tb xls and curl test
| -rw-r--r-- | test/toxbank-investigation-curl.rb | 4 | ||||
| -rw-r--r-- | test/toxbank-investigation-xls.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/toxbank-investigation-curl.rb b/test/toxbank-investigation-curl.rb index a63af98..5c14a4c 100644 --- a/test/toxbank-investigation-curl.rb +++ b/test/toxbank-investigation-curl.rb @@ -31,6 +31,7 @@ class UploadTest < MiniTest::Test def test_03_valid_zip_upload # upload + OpenTox::Authorization.subjectid = $pi[:subjectid] ["BII-I-1-tb2.zip","E-MTAB-798_philippe-tb2.zip"].each do |f| file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", f response = `curl -Lk -X POST -i -F file="@#{file};type=application/zip" -H "subjectid:#{$pi[:subjectid]}" #{$investigation[:uri]}`.chomp @@ -66,11 +67,12 @@ class UploadTest < MiniTest::Test end end def test_04_invalid_zip_upload + OpenTox::Authorization.subjectid = $pi[:subjectid] file = File.join File.dirname(__FILE__), "data/toxbank-investigation/invalid/isa_TB_ACCUTOX.zip" response = `curl -Lk -X POST -i -F file="@#{file};type=application/zip" -H "subjectid:#{$pi[:subjectid]}" #{$investigation[:uri]}`.chomp assert_match /202/, response uri = response.split("\n")[-1] - t = OpenTox::Task.new(uri,$pi[:subjectid]) + t = OpenTox::Task.new(uri) t.wait assert_match t.hasStatus, "Error" # TODO: test errorReport, rdf output of tasks has to be fixed for that purpose diff --git a/test/toxbank-investigation-xls.rb b/test/toxbank-investigation-xls.rb index dc9fd85..17a9321 100644 --- a/test/toxbank-investigation-xls.rb +++ b/test/toxbank-investigation-xls.rb @@ -10,6 +10,7 @@ class ExcelUploadTest < MiniTest::Test def test_01_invalid_xls_upload # upload + OpenTox::Authorization.subjectid = $pi[:subjectid] file = File.join File.dirname(__FILE__), "data/toxbank-investigation/invalid/isa_TB_ACCUTOX.xls" response = `curl -Lk -X POST -i -F file="@#{file};type=application/vnd.ms-excel" -H "subjectid:#{$pi[:subjectid]}" #{$investigation[:uri]}`.chomp assert_match /202/, response @@ -25,6 +26,7 @@ class ExcelUploadTest < MiniTest::Test response = `curl -Lk -X POST -i -F file="@#{file};type=application/vnd.ms-excel" -H "subjectid:#{$pi[:subjectid]}" #{$investigation[:uri]}`.chomp assert_match /202/, response uri = response.split("\n")[-1] + OpenTox::Authorization.subjectid = $pi[:subjectid] t = OpenTox::Task.new(uri) t.wait puts t.uri |