Merge branch 'master' of github.com:opentox/opentox-test

2 files changed, 14 insertions, 14 deletions

diff --git a/test/dataset.rb b/test/dataset.rb
index 44451a2..8730154 100644
--- a/test/dataset.rb
+++ b/test/dataset.rb
@@ -8,35 +8,35 @@ DATA_DIR = File.join(File.dirname(__FILE__),"data")
 class DatasetTest < Test::Unit::TestCase
 
   def test_all
-    datasets = OpenTox::Dataset.all DATASET
+    datasets = OpenTox::Dataset.all DATASET, @@subjectid
     assert_equal OpenTox::Dataset, datasets.first.class
   end
 
   def test_create_empty
-    d = OpenTox::Dataset.create DATASET
+    d = OpenTox::Dataset.create DATASET, @@subjectid
     assert_equal OpenTox::Dataset, d.class
     assert_match /#{DATASET}/, d.uri.to_s
-    d.delete
+    d.delete :subjectid => @@subjectid
   end
 
   def test_create_from_file
-    d = OpenTox::Dataset.from_file DATASET, File.join(DATA_DIR,"EPAFHM.mini.csv")
+    d = OpenTox::Dataset.from_file DATASET, File.join(DATA_DIR,"EPAFHM.mini.csv"), @@subjectid
     assert_equal OpenTox::Dataset, d.class
     assert_equal d.uri, d[RDF::XSD.anyURI]
     assert_equal "EPAFHM.mini",  d.metadata[RDF::URI("http://purl.org/dc/elements/1.1/title")].first.to_s # DC.title is http://purl.org/dc/terms/title
     assert_equal "EPAFHM.mini",  d[RDF::URI("http://purl.org/dc/elements/1.1/title")]
-    d.delete
+    d.delete :subjectid => @@subjectid
     assert_raise OpenTox::NotFoundError do
       d.get
     end
   end
 
   def test_from_yaml
-    @dataset = OpenTox::Dataset.from_file DATASET, File.join(DATA_DIR,"hamster_carcinogenicity.yaml")
+    @dataset = OpenTox::Dataset.from_file DATASET, File.join(DATA_DIR,"hamster_carcinogenicity.yaml"), @@subjectid
     assert_equal OpenTox::Dataset, @dataset.class
     assert_equal "hamster_carcinogenicity", @dataset[RDF::URI("http://purl.org/dc/elements/1.1/title")]
     hamster_carc?
-    @dataset.delete
+    @dataset.delete :subjectid => @@subjectid
   end
 
 =begin
@@ -51,17 +51,17 @@ class DatasetTest < Test::Unit::TestCase
 =end
 
   def test_multicolumn_csv
-    @dataset = OpenTox::Dataset.from_file DATASET, "#{DATA_DIR}/multicolumn.csv"
+    @dataset = OpenTox::Dataset.from_file DATASET, "#{DATA_DIR}/multicolumn.csv", @@subjectid
     assert_equal 5, @dataset.features.size
     assert_equal 4, @dataset.compounds.size
-    @dataset.delete
+    @dataset.delete :subjectid => @@subjectid
   end
 
   def test_from_csv
-    @dataset = OpenTox::Dataset.from_file DATASET, "#{DATA_DIR}/hamster_carcinogenicity.csv"
+    @dataset = OpenTox::Dataset.from_file DATASET, "#{DATA_DIR}/hamster_carcinogenicity.csv", @@subjectid
     assert_equal OpenTox::Dataset, @dataset.class
     hamster_carc?
-    @dataset.delete
+    @dataset.delete :subjectid => @@subjectid
   end
 
 =begin
diff --git a/test/upload.rb b/test/upload.rb
index ff8153f..9ab5b03 100644
--- a/test/upload.rb
+++ b/test/upload.rb
@@ -11,7 +11,7 @@ class UploadTest < Test::Unit::TestCase
   end
 
   def test_01_get_all
-    response = `curl -k -i #{$toxbank_investigation[:uri]}`
+    response = `curl -k -H "subjectid:#{@@subjectid}" -i #{$toxbank_investigation[:uri]}`
     assert_match /200/, response
   end
 
@@ -63,11 +63,11 @@ class UploadTest < Test::Unit::TestCase
       files = `unzip -l #{File.join File.dirname(__FILE__),"data/toxbank-investigation/valid",f}|grep txt|cut -c 31- | sed 's#^.*/##'`.split("\n")
       files.each{|f| assert_equal true, File.exists?(File.join(File.expand_path(@tmpdir),f)) }
       # get isatab files
-      urilist = `curl -k -H accept:text/uri-list #{$toxbank_investigation[:uri]}`.split("\n")
+      urilist = `curl -k -H "subjectid:#{@@subjectid}" -H "Accept:text/uri-list" #{$toxbank_investigation[:uri]}`.split("\n")
       urilist.each do |uri|    
         unless uri.match(/[n3|zip]$/)
           #response = `curl -k -i -H Accept:text/tab-separated-values -H "subjectid:#{@@subjectid}" #{uri.gsub("http", "https")}`
-          response = `curl -k -i -H Accept:text/tab-separated-values -H "subjectid:#{@@subjectid}" #{uri}`
+          response = `curl -k -i -H "Accept:text/tab-separated-values" -H "subjectid:#{@@subjectid}" #{uri}`
           assert_match /HTTP\/1.1 200 OK/, response.to_s.encode!('UTF-8', 'UTF-8', :invalid => :replace) 
         end
       end