better test procedure

1 files changed, 18 insertions, 48 deletions

diff --git a/test/toxbank-investigation-biosearch.rb b/test/toxbank-investigation-biosearch.rb
index b1c7795..30b1024 100644
--- a/test/toxbank-investigation-biosearch.rb
+++ b/test/toxbank-investigation-biosearch.rb
@@ -25,7 +25,7 @@ class TBInvestigationUploadBio < MiniTest::Test
   # Summary is not searchable, but published. { access=ToxBank group }
   def test_01_post_investigation
     $uri1 = ""
-    file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "BII-I-1-tb2.zip"
+    file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "BII-I-1-tb2_ftp.zip"
     response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file)}, { :subjectid => $owner }
     task_uri = response.chomp
     task = OpenTox::Task.new task_uri
@@ -34,7 +34,7 @@ class TBInvestigationUploadBio < MiniTest::Test
     assert_equal "Completed", task.hasStatus, "Task should be completed but is: #{task.hasStatus}. Task URI is #{task_uri} ."
     $uri1 = URI(uri)
     # update
-    res = OpenTox::RestClientWrapper.put $uri1.to_s, { :published => "true", :owningPro => "#{$user_service[:uri]}/project/G2"}, { :subjectid => $pi[:subjectid] }
+    res = OpenTox::RestClientWrapper.put $uri1.to_s, { :published => "true", :allowReadByGroup => "#{$user_service[:uri]}/project/G2"}, { :subjectid => $pi[:subjectid] }
     task_uri = res.chomp
     task = OpenTox::Task.new task_uri
     task.wait
@@ -44,7 +44,7 @@ class TBInvestigationUploadBio < MiniTest::Test
   # Summary is not searchable, but published. { access=ToxBank group }
   def test_02_post_investigation
     $uri2 = ""
-    file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "BII-I-1-tb2.zip"
+    file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "BII-I-1-tb2_ftp.zip"
     response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file)}, { :subjectid => $owner }
     task_uri = response.chomp
     task = OpenTox::Task.new task_uri
@@ -53,37 +53,13 @@ class TBInvestigationUploadBio < MiniTest::Test
     assert_equal "Completed", task.hasStatus, "Task should be completed but is: #{task.hasStatus}. Task URI is #{task_uri} ."
     $uri2 = URI(uri)
     # update
-    res = OpenTox::RestClientWrapper.put $uri2.to_s, { :published => "true", :owningPro => "#{$user_service[:uri]}/project/G2"}, { :subjectid => $pi[:subjectid] }
+    res = OpenTox::RestClientWrapper.put $uri2.to_s, { :published => "true"}, { :subjectid => $pi[:subjectid] }
     task_uri = res.chomp
     task = OpenTox::Task.new task_uri
     task.wait
   end
 
-  # create a new investigation by uploading a zip file,
-  # Summary is not searchable, but published. { access=ToxBank group }
-  def test_03_post_investigation
-    $uri3 = ""
-    file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "BII-I-1-tb2.zip"
-    response = OpenTox::RestClientWrapper.post $investigation[:uri], {:file => File.open(file)}, { :subjectid => $owner }
-    task_uri = response.chomp
-    task = OpenTox::Task.new task_uri
-    task.wait
-    uri = task.resultURI
-    assert_equal "Completed", task.hasStatus, "Task should be completed but is: #{task.hasStatus}. Task URI is #{task_uri} ."
-    $uri3 = URI(uri)
-    # update
-    res = OpenTox::RestClientWrapper.put $uri3.to_s, { :published => "true", :owningPro => "#{$user_service[:uri]}/project/G2"}, { :subjectid => $pi[:subjectid] }
-    task_uri = res.chomp
-    task = OpenTox::Task.new task_uri
-    task.wait
-  end
-
-end
-
-class TBInvestigationBioSearch < MiniTest::Test
-  i_suck_and_my_tests_are_order_dependent!
-
-  def test_01_biosearch_owner
+  def test_04_biosearch_owner
     response = OpenTox::RestClientWrapper.get "#{$investigation[:uri]}/sparql/investigation_and_characteristics", {}, {:accept => "application/json", :subjectid => $pi[:subjectid]}
     assert_equal 200, response.code
     result = JSON.parse(response)
@@ -92,39 +68,33 @@ class TBInvestigationBioSearch < MiniTest::Test
     assert inv_chars.include?("#{$uri1}:::organism:::#{$uri1}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
     assert inv_chars.include?("#{$uri2}:::Label:::#{$uri2}/CV2:::http://purl.obolibrary.org/chebi/15956")
     assert inv_chars.include?("#{$uri2}:::organism:::#{$uri2}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
-    assert inv_chars.include?("#{$uri3}:::Label:::#{$uri3}/CV2:::http://purl.obolibrary.org/chebi/15956")
-    assert inv_chars.include?("#{$uri3}:::organism:::#{$uri3}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
   end
 
-  def test_02_biosearch_user1
+  def test_05_biosearch_user1
     response = OpenTox::RestClientWrapper.get "#{$investigation[:uri]}/sparql/investigation_and_characteristics", {}, {:accept => "application/json", :subjectid => $secondpi[:subjectid]}
     assert_equal 200, response.code
     result = JSON.parse(response)
     inv_chars = result["results"]["bindings"].map{|n| "#{n["investigation"]["value"]}:::#{n["propname"]["value"]}:::#{n["propValue"]["value"]}:::#{n["ontouri"]["value"]}"}
     assert inv_chars.include?("#{$uri1}:::Label:::#{$uri1}/CV2:::http://purl.obolibrary.org/chebi/15956")
     assert inv_chars.include?("#{$uri1}:::organism:::#{$uri1}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
-    assert inv_chars.include?("#{$uri2}:::Label:::#{$uri2}/CV2:::http://purl.obolibrary.org/chebi/15956")
-    assert inv_chars.include?("#{$uri2}:::organism:::#{$uri2}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
-    assert inv_chars.include?("#{$uri3}:::Label:::#{$uri3}/CV2:::http://purl.obolibrary.org/chebi/15956")
-    assert inv_chars.include?("#{$uri3}:::organism:::#{$uri3}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
+    refute inv_chars.include?("#{$uri2}:::Label:::#{$uri2}/CV2:::http://purl.obolibrary.org/chebi/15956")
+    refute inv_chars.include?("#{$uri2}:::organism:::#{$uri2}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
   end
   
-  def test_03_biosearch_user2
-    assert_raises OpenTox::BadRequestError do
-      response = OpenTox::RestClientWrapper.get "#{$investigation[:uri]}/sparql/investigation_and_characteristics", {}, {:accept => "application/json", :subjectid => $guestid}
-    end
+  def test_06_biosearch_user2
+    response = OpenTox::RestClientWrapper.get "#{$investigation[:uri]}/sparql/investigation_and_characteristics", {}, {:accept => "application/json", :subjectid => $guestid}
+    result = JSON.parse(response)
+    inv_chars = result["results"]["bindings"].map{|n| "#{n["investigation"]["value"]}:::#{n["propname"]["value"]}:::#{n["propValue"]["value"]}:::#{n["ontouri"]["value"]}"}
+    refute inv_chars.include?("#{$uri1}:::Label:::#{$uri1}/CV2:::http://purl.obolibrary.org/chebi/15956")
+    refute inv_chars.include?("#{$uri1}:::organism:::#{$uri1}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
+    refute inv_chars.include?("#{$uri2}:::Label:::#{$uri2}/CV2:::http://purl.obolibrary.org/chebi/15956")
+    refute inv_chars.include?("#{$uri2}:::organism:::#{$uri2}/CV4:::http://purl.obolibrary.org/obo/NEWT_4932")
   end
 
-end
-
-class TBInvestigationDelete < MiniTest::Test
-
-  def test_00_delete
-    [$uri1, $uri2, $uri3].each do |uri|
+  def test_99_delete
+    [$uri1, $uri2].each do |uri|
       response = OpenTox::RestClientWrapper.delete uri.to_s, {}, { :subjectid => $owner }
       assert_equal 200, response.code
     end
   end
-
 end
-