1 files changed, 26 insertions, 26 deletions

diff --git a/dataset.rb b/dataset.rb
index 812a060..d15baf7 100644
--- a/dataset.rb
+++ b/dataset.rb
@@ -29,7 +29,7 @@ class DatasetTest < Test::Unit::TestCase
 =begin
   def test_save_external
 
-    @dataset = OpenTox::Dataset.find "http://apps.ideaconsult.net:8080/ambit2/dataset/2698"
+    @dataset = OpenTox::Dataset.find "http://apps.ideaconsult.net:8080/ambit2/dataset/2698", @@subjectid
     #File.open("test.rdf","w+"){|f| f.puts @dataset.to_rdfxml}
     @dataset.uri = "http://apps.ideaconsult.net:8080/ambit2/dataset" 
     uri = @dataset.save(@@subjectid)
@@ -47,7 +47,7 @@ class DatasetTest < Test::Unit::TestCase
   end
 
   def test_all
-    datasets = OpenTox::Dataset.all
+    datasets = OpenTox::Dataset.all(CONFIG[:services]["opentox-dataset"], @@subjectid)
     assert_kind_of Array, datasets
   end
 
@@ -59,36 +59,36 @@ class DatasetTest < Test::Unit::TestCase
   end
 
   def test_from_yaml
-    @dataset = OpenTox::Dataset.new
+    @dataset = OpenTox::Dataset.new nil, @@subjectid
     @dataset.load_yaml(File.open("data/hamster_carcinogenicity.yaml").read)
     hamster_carc?
   end
 
   def test_rest_csv
     uri = OpenTox::RestClientWrapper.post(CONFIG[:services]["opentox-dataset"],{:accept => "text/uri-list"}, {:file => File.new("data/hamster_carcinogenicity.csv"), :subjectid => @@subjectid}).to_s.chomp
-    @dataset = OpenTox::Dataset.new uri
-    @dataset.load_all
+    @dataset = OpenTox::Dataset.new uri, @@subjectid
+    @dataset.load_all(@@subjectid)
     hamster_carc?
   end
 
   def test_multicolumn_csv
     uri = OpenTox::RestClientWrapper.post(CONFIG[:services]["opentox-dataset"],{:accept => "text/uri-list"}, {:file => File.new("data/multicolumn.csv"), :subjectid => @@subjectid}).to_s.chomp
-    @dataset = OpenTox::Dataset.new uri
-    @dataset.load_all
+    @dataset = OpenTox::Dataset.new uri, @@subjectid
+    @dataset.load_all(@@subjectid)
     assert_equal 5, @dataset.features.size
     assert_equal 4, @dataset.compounds.size
     
   end
 
   def test_from_csv
-    @dataset = OpenTox::Dataset.new
+    @dataset = OpenTox::Dataset.new(nil, @@subjectid)
     @dataset.load_csv(File.open("data/hamster_carcinogenicity.csv").read, @@subjectid)
     hamster_carc?
     @dataset.delete(@@subjectid)
   end
 
   def test_from_excel
-    @dataset = OpenTox::Dataset.new
+    @dataset = OpenTox::Dataset.new(nil, @@subjectid)
     @dataset.load_spreadsheet(Excel.new("data/hamster_carcinogenicity.xls"), @@subjectid)
     hamster_carc?
     @dataset.delete(@@subjectid)
@@ -96,39 +96,39 @@ class DatasetTest < Test::Unit::TestCase
 
   def test_load_metadata
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.find(uri)
+      @dataset = OpenTox::Dataset.find(uri, @@subjectid)
       assert @dataset.metadata.size != 0
     end
   end
 
   def test_load_compounds
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.new(uri)
-      @dataset.load_compounds
+      @dataset = OpenTox::Dataset.new(uri, @@subjectid)
+      @dataset.load_compounds(@@subjectid)
       assert_equal @dataset.compounds.size,data[:nr_compounds]
     end
   end
 
   def test_load_features
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.new(uri)
-      @dataset.load_features
+      @dataset = OpenTox::Dataset.new(uri, @@subjectid)
+      @dataset.load_features(@@subjectid)
       assert_equal @dataset.features.keys.size,data[:nr_dataset_features]
     end
   end
 
   def test_load_all
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.new(uri)
-      @dataset.load_all
+      @dataset = OpenTox::Dataset.new(uri, @@subjectid)
+      @dataset.load_all(@@subjectid)
       validate data
     end
   end
 
   def test_yaml
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.new(uri)
-      @dataset.load_all
+      @dataset = OpenTox::Dataset.new(uri, @@subjectid)
+      @dataset.load_all(@@subjectid)
       #@dataset = YAML.load @dataset.to_yaml
       validate data
     end
@@ -136,8 +136,8 @@ class DatasetTest < Test::Unit::TestCase
 
   def test_csv
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.new(uri)
-      @dataset.load_all
+      @dataset = OpenTox::Dataset.new(uri, @@subjectid)
+      @dataset.load_all(@@subjectid)
       csv = @dataset.to_csv.split("\n")
       assert_equal csv.size, data[:nr_compounds]+1
       assert_equal csv.first.split(", ").size, data[:nr_dataset_features]+1
@@ -146,8 +146,8 @@ class DatasetTest < Test::Unit::TestCase
 
   def test_excel
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.new(uri)
-      @dataset.load_all
+      @dataset = OpenTox::Dataset.new(uri, @@subjectid)
+      @dataset.load_all(@@subjectid)
       book =  @dataset.to_spreadsheet
       assert_kind_of Spreadsheet::Workbook, book
       #File.open("#{@dataset.id}.xls","w+"){|f| book.write f.path}
@@ -156,16 +156,16 @@ class DatasetTest < Test::Unit::TestCase
 
   def test_ntriples
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.new(uri)
-      @dataset.load_all
+      @dataset = OpenTox::Dataset.new(uri, @@subjectid)
+      @dataset.load_all(@@subjectid)
       assert_kind_of String, @dataset.to_ntriples
     end
   end
 
   def test_owl
     @datasets.each do |uri,data|
-      @dataset = OpenTox::Dataset.new(uri)
-      @dataset.load_all
+      @dataset = OpenTox::Dataset.new(uri, @@subjectid)
+      @dataset.load_all(@@subjectid)
       assert_kind_of String, @dataset.to_rdfxml
     end
   end