fix merge test with a&a enabled

1 files changed, 7 insertions, 7 deletions

diff --git a/dataset.rb b/dataset.rb
index 96e8313..5483ee4 100644
--- a/dataset.rb
+++ b/dataset.rb
@@ -224,12 +224,12 @@ class DatasetTest < Test::Unit::TestCase
   
   def test_merge()
     #upload
-    dataset1 = OpenTox::Dataset.create_from_csv_file(File.new("data/hamster_carcinogenicity.csv").path, @subjectid)
-    dataset2 = OpenTox::Dataset.create_from_csv_file(File.new("data/multi_cell_call.csv").path, @subjectid)
+    dataset1 = OpenTox::Dataset.create_from_csv_file(File.new("data/hamster_carcinogenicity.csv").path, @@subjectid)
+    dataset2 = OpenTox::Dataset.create_from_csv_file(File.new("data/multi_cell_call.csv").path, @@subjectid)
     #merge1
     title = "test merge"
-    dataset_merge1 = OpenTox::Dataset.merge(dataset1, dataset2, { DC.title => title,DC.creator => "testsuite"}, @subjectid )
-    dataset_reloaded1 = OpenTox::Dataset.find(dataset_merge1.uri, @subjectid)
+    dataset_merge1 = OpenTox::Dataset.merge(dataset1, dataset2, { DC.title => title,DC.creator => "testsuite"}, @@subjectid )
+    dataset_reloaded1 = OpenTox::Dataset.find(dataset_merge1.uri, @@subjectid)
     #test1
     [dataset_merge1, dataset_reloaded1].each do |d|
       assert_equal d.metadata[DC.title],title
@@ -249,8 +249,8 @@ class DatasetTest < Test::Unit::TestCase
     #merge2
     compounds1 = dataset1.compounds[0..dataset1.compounds.size/2]
     features1 = []
-    dataset_merge2 = OpenTox::Dataset.merge(dataset1, dataset2, {}, @subjectid, features1, nil, compounds1 )
-    dataset_reloaded2 = OpenTox::Dataset.find(dataset_merge2.uri, @subjectid)
+    dataset_merge2 = OpenTox::Dataset.merge(dataset1, dataset2, {}, @@subjectid, features1, nil, compounds1 )
+    dataset_reloaded2 = OpenTox::Dataset.find(dataset_merge2.uri, @@subjectid)
     #test2
     [dataset_merge2, dataset_reloaded2].each do |d|
       assert_equal d.features.size,dataset2.features.size
@@ -258,7 +258,7 @@ class DatasetTest < Test::Unit::TestCase
     end
     #cleanup
     [dataset_merge1, dataset_merge2, dataset1, dataset2].each do |d|
-      OpenTox::RestClientWrapper.delete(d.uri,{:subjectid => @subjectid})
+      OpenTox::RestClientWrapper.delete(d.uri,{:subjectid => @@subjectid})
     end
   end