From a1770e6e22b5012cb4420c4a72a831f609d6defd Mon Sep 17 00:00:00 2001 From: gebele Date: Fri, 16 May 2014 17:01:21 +0200 Subject: org and pro changed --- test/toxbank-investigation-types.rb | 101 +++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/test/toxbank-investigation-types.rb b/test/toxbank-investigation-types.rb index 8d4ab66..09897af 100644 --- a/test/toxbank-investigation-types.rb +++ b/test/toxbank-investigation-types.rb @@ -30,7 +30,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_attached_file_missing_type puts "\nattached file but missing type" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81, #{$user_service[:uri]}/project/G79", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -43,7 +43,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test # @note expect OpenTox::BadRequestError def test_noData puts "\ntype noData but ftp file in params" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727", :ftpFile => "JIC37_Ethanol_0.07_Internal_1_3.txt"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727", :ftpFile => "JIC37_Ethanol_0.07_Internal_1_3.txt"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -57,7 +57,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_wrong_type_noData puts "\nattached file but type is noData" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -71,7 +71,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_wrong_type_ftpData puts "\nattached file but type is ftpData" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "ftpData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "ftpData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -84,7 +84,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test # @note expect OpenTox::BadRequestError def test_unknown_inv_type puts "\nunknown inv type" - response = OpenTox::RestClientWrapper.post $investigation[:uri], { :type => "Data", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], { :type => "Data", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :owningPro => "#{$user_service}/project/G81", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -98,7 +98,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_file_unknown_inv_type puts "\nattached file unknown inv type" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], { :file => File.open(file), :type => "Data", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], { :file => File.open(file), :type => "Data", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -112,7 +112,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_attached_file_missing_title puts "\nattached file missing title" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unFormatedData", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -126,7 +126,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_attached_file_missing_abstract puts "\nattached file missing abstract" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unFormatedData", :title => "New Title", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :title => "New Title", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -140,7 +140,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_attached_file_missing_owningOrg puts "\nattached file missing owningOrg" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unFormatedData", :title => "New Title", :abstract => "This is a short description", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :title => "New Title", :abstract => "This is a short description", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -149,12 +149,26 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test assert_equal "Parameter 'owningOrg' is required.", task.error_report[RDF::OT.message], "wrong error: #{task.error_report[RDF::OT.message]}." end + # missing owningPro + # @note expect OpenTox::BadRequestError + def test_attached_file_missing_owningPro + puts "\nattached file missing owningPro" + file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } + task_uri = response.chomp + task = OpenTox::Task.new task_uri + task.wait + #puts task_uri + assert_equal "Error", task.hasStatus, "Task should be not completed but is: #{task.hasStatus}. Task URI is #{task_uri} ." + assert_equal "Parameter 'owningPro' is required.", task.error_report[RDF::OT.message], "wrong error: #{task.error_report[RDF::OT.message]}." + end + # missing authors # @note expect OpenTox::BadRequestError def test_attached_file_missing_authors puts "\nattached file missing authors" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unFormatedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727" }, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -168,7 +182,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_attached_file_missing_keywords puts "\nattached file missing keywords" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unFormatedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479" }, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479" }, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -184,7 +198,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_wrong_mime puts "\nattached file wrong mime" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/invalid", "empty.zup" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -200,7 +214,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_file_larger_10mb puts "\nunformated data larger 10MB" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/invalid", "unformated10mb.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unFormatedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -214,7 +228,7 @@ class TBInvestigationNoISADataInvalidPOST < MiniTest::Test def test_invalid_param_uri puts "\ninvalid param URI" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unFormatedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/oxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service[:uri]}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/oxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -229,7 +243,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test def test_01_post_type_nodata puts "\nvalid noData" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service[:uri]}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -253,16 +267,17 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test expected_keywords = ["http://www.owl-ontologies.com/toxbank.owl/K124", "http://www.owl-ontologies.com/toxbank.owl/K727"] keywords = @g.query(:predicate => RDF::TB.hasKeyword).collect{|r| r[2].to_s} assert_equal keywords, expected_keywords - orgs = ["#{$user_service[:uri]}/organisation/G32", "#{$user_service[:uri]}/organisation/G16"] + orgs = ["#{$user_service[:uri]}/organisation/G16"] expected_orgs = @g.query(:predicate => RDF::TB.hasOrganisation).collect{|r| r[2].to_s} assert_equal orgs, expected_orgs + @g.query(:predicate => RDF::TB.hasProject){|r| assert_match "#{$user_service[:uri]}/project/G81", r[2].to_s} @g.query(:predicate => RDF::DC.title){|r| assert_match /New Title/, r[2].to_s} @g.query(:predicate => RDF::DC.abstract){|r| assert_match /This is a short description/, r[2].to_s} @g.query(:predicate => RDF::TB.isSummarySearchable){|r| assert_match /false/, r[2].to_s} @g.query(:predicate => RDF::TB.isPublished){|r| assert_match /false/, r[2].to_s} # PUT - response = OpenTox::RestClientWrapper.put uri, {:type => "noData", :title => "Second Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.put uri, {:type => "noData", :title => "Second Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service[:uri]}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -287,7 +302,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test expected_keywords = ["http://www.owl-ontologies.com/toxbank.owl/K124", "http://www.owl-ontologies.com/toxbank.owl/K727"] keywords = @g.query(:predicate => RDF::TB.hasKeyword).collect{|r| r[2].to_s} assert_equal keywords, expected_keywords - orgs = ["#{$user_service[:uri]}/organisation/G32", "#{$user_service[:uri]}/organisation/G16"] + orgs = ["#{$user_service[:uri]}/organisation/G16"] expected_orgs = @g.query(:predicate => RDF::TB.hasOrganisation).collect{|r| r[2].to_s} assert_equal orgs, expected_orgs @g.query(:predicate => RDF::DC.title){|r| assert_match /Second Title/, r[2].to_s} @@ -302,7 +317,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test def test_02_post_type_ftpdata puts "\nvalid ftpData" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "ftpData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727", :ftpFile => "JIC37_Ethanol_0.07_Internal_1_3.txt"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "ftpData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service[:uri]}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727", :ftpFile => "JIC37_Ethanol_0.07_Internal_1_3.txt"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -327,7 +342,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test expected_keywords = ["http://www.owl-ontologies.com/toxbank.owl/K124", "http://www.owl-ontologies.com/toxbank.owl/K727"] keywords = @g.query(:predicate => RDF::TB.hasKeyword).collect{|r| r[2].to_s} assert_equal keywords, expected_keywords - orgs = ["#{$user_service[:uri]}/organisation/G32", "#{$user_service[:uri]}/organisation/G16"] + orgs = ["#{$user_service[:uri]}/organisation/G16"] expected_orgs = @g.query(:predicate => RDF::TB.hasOrganisation).collect{|r| r[2].to_s} assert_equal orgs, expected_orgs @g.query(:predicate => RDF::DC.title){|r| assert_match /New Title/, r[2].to_s} @@ -345,7 +360,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test assert_match /isttest/, response.to_s # PUT - response = OpenTox::RestClientWrapper.put uri, {:type => "ftpData", :title => "Second Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727", :ftpFile => "JIC37_Ethanol_0.07_Internal_1_3.txt"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.put uri, {:type => "ftpData", :title => "Second Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :owningPro => "#{$user_service[:uri]}/project/G81", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727", :ftpFile => "JIC37_Ethanol_0.07_Internal_1_3.txt"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -370,7 +385,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test expected_keywords = ["http://www.owl-ontologies.com/toxbank.owl/K124", "http://www.owl-ontologies.com/toxbank.owl/K727"] keywords = @g.query(:predicate => RDF::TB.hasKeyword).collect{|r| r[2].to_s} assert_equal keywords, expected_keywords - orgs = ["#{$user_service[:uri]}/organisation/G32", "#{$user_service[:uri]}/organisation/G16"] + orgs = ["#{$user_service[:uri]}/organisation/G16"] expected_orgs = @g.query(:predicate => RDF::TB.hasOrganisation).collect{|r| r[2].to_s} assert_equal orgs, expected_orgs @g.query(:predicate => RDF::DC.title){|r| assert_match /Second Title/, r[2].to_s} @@ -379,14 +394,14 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test @g.query(:predicate => RDF::TB.isPublished){|r| assert_match /false/, r[2].to_s} # DELETE - #response = OpenTox::RestClientWrapper.delete uri.to_s, {}, { :subjectid => $pi[:subjectid] } - #assert_equal "200", response.code.to_s + response = OpenTox::RestClientWrapper.delete uri.to_s, {}, { :subjectid => $pi[:subjectid] } + assert_equal "200", response.code.to_s end - def test_03_post_type_unformateddata - puts "\nvalid unFormatedData" + def test_03_post_type_unformattedData + puts "\nvalid unformattedData" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unFormatedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file), :type => "unformattedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service[:uri]}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -400,7 +415,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test @g = RDF::Graph.new RDF::Reader.for(:rdfxml).new(response.to_s){|r| r.each{|s| @g << s}} #@g.each{|g| puts g.object} - @g.query(:predicate => RDF::TB.hasInvType){|r| assert_match /unFormatedData/, r[2].to_s} + @g.query(:predicate => RDF::TB.hasInvType){|r| assert_match /unformattedData/, r[2].to_s} @g.query(:predicate => RDF::DC.modified){|r| assert_equal uri.to_s, r[0].to_s} expected_owner = ["#{$user_service[:uri]}/user/U271"] owner = @g.query(:predicate => RDF::TB.hasOwner).collect{|r| r[2].to_s} @@ -411,7 +426,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test expected_keywords = ["http://www.owl-ontologies.com/toxbank.owl/K124", "http://www.owl-ontologies.com/toxbank.owl/K727"] keywords = @g.query(:predicate => RDF::TB.hasKeyword).collect{|r| r[2].to_s} assert_equal keywords, expected_keywords - orgs = ["#{$user_service[:uri]}/organisation/G32", "#{$user_service[:uri]}/organisation/G16"] + orgs = ["#{$user_service[:uri]}/organisation/G16"] expected_orgs = @g.query(:predicate => RDF::TB.hasOrganisation).collect{|r| r[2].to_s} assert_equal orgs, expected_orgs @g.query(:predicate => RDF::DC.title){|r| assert_match /New Title/, r[2].to_s} @@ -424,7 +439,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test assert_match /files\/unformated\.zip/, response.to_s # PUT - response = OpenTox::RestClientWrapper.put uri, {:file => File.open(file), :type => "unFormatedData", :title => "Second Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.put uri, {:file => File.open(file), :type => "unformattedData", :title => "Second Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service[:uri]}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -438,7 +453,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test @g = RDF::Graph.new RDF::Reader.for(:rdfxml).new(response.to_s){|r| r.each{|s| @g << s}} #@g.each{|g| puts g.object} - @g.query(:predicate => RDF::TB.hasInvType){|r| assert_match /unFormatedData/, r[2].to_s} + @g.query(:predicate => RDF::TB.hasInvType){|r| assert_match /unformattedData/, r[2].to_s} @g.query(:predicate => RDF::DC.modified){|r| assert_equal uri.to_s, r[0].to_s} expected_owner = ["#{$user_service[:uri]}/user/U271"] owner = @g.query(:predicate => RDF::TB.hasOwner).collect{|r| r[2].to_s} @@ -449,7 +464,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test expected_keywords = ["http://www.owl-ontologies.com/toxbank.owl/K124", "http://www.owl-ontologies.com/toxbank.owl/K727"] keywords = @g.query(:predicate => RDF::TB.hasKeyword).collect{|r| r[2].to_s} assert_equal keywords, expected_keywords - orgs = ["#{$user_service[:uri]}/organisation/G32", "#{$user_service[:uri]}/organisation/G16"] + orgs = ["#{$user_service[:uri]}/organisation/G16"] expected_orgs = @g.query(:predicate => RDF::TB.hasOrganisation).collect{|r| r[2].to_s} assert_equal orgs, expected_orgs @g.query(:predicate => RDF::DC.title){|r| assert_match /Second Title/, r[2].to_s} @@ -458,13 +473,13 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test @g.query(:predicate => RDF::TB.isPublished){|r| assert_match /false/, r[2].to_s} # DELETE - response = OpenTox::RestClientWrapper.delete uri.to_s, {}, { :subjectid => $pi[:subjectid] } - assert_equal "200", response.code.to_s + #response = OpenTox::RestClientWrapper.delete uri.to_s, {}, { :subjectid => $pi[:subjectid] } + #assert_equal "200", response.code.to_s end def test_post_type_nodata_put_error puts "\nvalid noData" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service[:uri]}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -475,7 +490,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test # PUT missing type puts "\nPUT missing type expect error" - response = OpenTox::RestClientWrapper.put @uri.to_s, { :title => "Second Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.put @uri.to_s, { :title => "Second Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :owningPro => "#{$user_service[:uri]}/project/G81", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -483,7 +498,7 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test assert_equal "Error", task.hasStatus, "Task should be not completed but is: #{task.hasStatus}. Task URI is #{task_uri} ." assert_match "No file uploaded or any valid parameter given.", task.error_report[RDF::OT.message], "wrong error: #{task.error_report[RDF::OT.message]}." # PUT missing title - response = OpenTox::RestClientWrapper.put @uri.to_s, { :type => "noData", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.put @uri.to_s, { :type => "noData", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :owningPro => "#{$user_service[:uri]}/project/G81", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -493,8 +508,8 @@ class TBInvestigationNoISADataValidPOST < MiniTest::Test # DELETE - response = OpenTox::RestClientWrapper.delete uri.to_s, {}, { :subjectid => $pi[:subjectid] } - assert_equal "200", response.code.to_s + #response = OpenTox::RestClientWrapper.delete uri.to_s, {}, { :subjectid => $pi[:subjectid] } + #assert_equal "200", response.code.to_s end end @@ -504,7 +519,7 @@ class TBInvestigationNoISADataValidPOSTchangeType < MiniTest::Test def test_change_type puts "\ntype noData" file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "unformated.zip" - response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.post $investigation[:uri], {:type => "noData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :owningPro => "#{$user_service[:uri]}/project/G81", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -516,7 +531,7 @@ class TBInvestigationNoISADataValidPOSTchangeType < MiniTest::Test assert_equal uri+"/files/"+uri.split("/").last+".nt", response, "uri-list should be equal to #{uri.split("/").last} but is #{response}" puts "\ntype ftpData" - response = OpenTox::RestClientWrapper.put uri, {:type => "ftpData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727", :ftpFile => "JIC37_Ethanol_0.07_Internal_1_3.txt, JIC37_Ethanol_0.07_Internal_1_4.txt"}, { :subjectid => $pi[:subjectid] } + response = OpenTox::RestClientWrapper.put uri, {:type => "ftpData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :owningPro => "#{$user_service[:uri]}/project/G81", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727", :ftpFile => "JIC37_Ethanol_0.07_Internal_1_3.txt, JIC37_Ethanol_0.07_Internal_1_4.txt"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait @@ -530,8 +545,8 @@ class TBInvestigationNoISADataValidPOSTchangeType < MiniTest::Test assert_match uri+"/files/"+"JIC37_Ethanol_0.07_Internal_1_3.txt", response, "uri-list should match #{uri+"/files/"+"JIC37_Ethanol_0.07_Internal_1_3.txt"} but is #{response}" assert_match uri+"/files/"+"JIC37_Ethanol_0.07_Internal_1_4.txt", response, "uri-list should match #{uri+"/files/"+"JIC37_Ethanol_0.07_Internal_1_4.txt"} but is #{response}" - puts "\ntype unFormatedData" - response = OpenTox::RestClientWrapper.put uri, {:file => File.open(file), :type => "unFormatedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16, #{$user_service[:uri]}/organisation/G32", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } + puts "\ntype unformattedData" + response = OpenTox::RestClientWrapper.put uri, {:file => File.open(file), :type => "unformattedData", :title => "New Title", :abstract => "This is a short description", :owningOrg => "#{$user_service[:uri]}/organisation/G16", :authors => "#{$user_service[:uri]}/user/U271, #{$user_service[:uri]}/user/U479", :owningPro => "#{$user_service[:uri]}/project/G81", :keywords => "http://www.owl-ontologies.com/toxbank.owl/K124, http://www.owl-ontologies.com/toxbank.owl/K727"}, { :subjectid => $pi[:subjectid] } task_uri = response.chomp task = OpenTox::Task.new task_uri task.wait -- cgit v1.2.3