subjectid handled by RestClientWrapper

14 files changed, 39 insertions, 50 deletions

diff --git a/all.rb b/all.rb
index 06df8c6..369e5f0 100644
--- a/all.rb
+++ b/all.rb
@@ -1,2 +1,2 @@
 require 'test/unit'
-(Dir["test/*.rb"] - Dir["test/setup.rb"]).each { |f| require File.join(File.dirname(__FILE__),f) }
+(Dir["test/*.rb"] - Dir["test/*setup.rb"]).each { |f| require File.join(File.dirname(__FILE__),f) }
diff --git a/opentox-client-all.rb b/opentox-client-all.rb
index 7de0bc4..5343820 100644
--- a/opentox-client-all.rb
+++ b/opentox-client-all.rb
@@ -2,7 +2,7 @@ require 'minitest/autorun'
 require 'openbabel'
 all = Dir["test/*.rb"]
 exclude = [
-  "test/setup.rb",
+  "test/*setup.rb",
   "test/lazarweb.rb",
 ] + Dir["test/toxbank*.rb"]
 (all - exclude).each {|f| require_relative f }
diff --git a/opentox-client-short.rb b/opentox-client-short.rb
index 99b2608..e89ce5c 100644
--- a/opentox-client-short.rb
+++ b/opentox-client-short.rb
@@ -2,7 +2,7 @@ require 'minitest/autorun'
 require 'openbabel'
 all = Dir["test/*.rb"]
 exclude = [
-  "test/setup.rb",
+  "test/*setup.rb",
   "test/lazarweb.rb",
 ] + Dir["test/toxbank*.rb"] + Dir["test/*long.rb"]
 (all - exclude).each {|f| require_relative f }
diff --git a/test/authorization.rb b/test/authorization.rb
index fdce6b8..5ce8dd9 100644
--- a/test/authorization.rb
+++ b/test/authorization.rb
@@ -15,7 +15,7 @@ class TestOpenToxAuthorizationBasic < MiniTest::Test
   end
  
   def test_02_get_token
-    refute_nil OpenTox::SUBJECTID
+    refute_nil OpenTox::RestClientWrapper.subjectid
   end
   
   def test_03_is_valid_token
@@ -32,7 +32,7 @@ class TestOpenToxAuthorizationBasic < MiniTest::Test
   end
   
   def test_05_list_policies
-    assert_kind_of Array, OpenTox::Authorization.list_policies(OpenTox::SUBJECTID)
+    assert_kind_of Array, OpenTox::Authorization.list_policies(OpenTox::RestClientWrapper.subjectid)
   end
 
   def test_06_bad_login
@@ -42,7 +42,7 @@ class TestOpenToxAuthorizationBasic < MiniTest::Test
   end
 
   def test_07_unauthorized
-    assert_equal false, OpenTox::Authorization.authorize("http://somthingnotexitstin/bla/8675940", "PUT", OpenTox::SUBJECTID)
+    assert_equal false, OpenTox::Authorization.authorize("http://somthingnotexitstin/bla/8675940", "PUT", OpenTox::RestClientWrapper.subjectid)
   end
 
 end
@@ -50,11 +50,11 @@ end
 class TestOpenToxAuthorizationLDAP < MiniTest::Test
 
   def test_01_list_user_groups
-    assert_kind_of Array, OpenTox::Authorization.list_user_groups($aa[:user], OpenTox::SUBJECTID)
+    assert_kind_of Array, OpenTox::Authorization.list_user_groups($aa[:user], OpenTox::RestClientWrapper.subjectid)
   end
   
   def test_02_get_user
-    assert_equal $aa[:user], OpenTox::Authorization.get_user(OpenTox::SUBJECTID)
+    assert_equal $aa[:user], OpenTox::Authorization.get_user(OpenTox::RestClientWrapper.subjectid)
   end
 
 end
@@ -66,47 +66,47 @@ class TestOpenToxAuthorizationLDAP < MiniTest::Test
   end
 
   def test_01_create_check_delete_default_policies
-    res = OpenTox::Authorization.send_policy(TEST_URI, OpenTox::SUBJECTID)
+    res = OpenTox::Authorization.send_policy(TEST_URI, OpenTox::RestClientWrapper.subjectid)
     assert res
-    assert OpenTox::Authorization.uri_has_policy(TEST_URI, OpenTox::SUBJECTID)
-    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, OpenTox::SUBJECTID)
+    assert OpenTox::Authorization.uri_has_policy(TEST_URI, OpenTox::RestClientWrapper.subjectid)
+    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, OpenTox::RestClientWrapper.subjectid)
     assert_kind_of Array, policies
     policies.each do |policy|
-      assert OpenTox::Authorization.delete_policy(policy, OpenTox::SUBJECTID)
+      assert OpenTox::Authorization.delete_policy(policy, OpenTox::RestClientWrapper.subjectid)
     end
-    assert_equal false, OpenTox::Authorization.uri_has_policy(TEST_URI, OpenTox::SUBJECTID)
+    assert_equal false, OpenTox::Authorization.uri_has_policy(TEST_URI, OpenTox::RestClientWrapper.subjectid)
   end
 
   def test_02_check_policy_rules
     tok_anonymous = OpenTox::Authorization.authenticate("anonymous","anonymous")
     refute_nil tok_anonymous
-    res = OpenTox::Authorization.send_policy(TEST_URI, OpenTox::SUBJECTID)
+    res = OpenTox::Authorization.send_policy(TEST_URI, OpenTox::RestClientWrapper.subjectid)
     assert res
-    assert OpenTox::Authorization.uri_has_policy(TEST_URI, OpenTox::SUBJECTID)
+    assert OpenTox::Authorization.uri_has_policy(TEST_URI, OpenTox::RestClientWrapper.subjectid)
     owner_rights = {"GET" => true, "POST" => true, "PUT" => true, "DELETE" => true}
     groupmember_rights = {"GET" => true, "POST" => false, "PUT" => false, "DELETE" => false}
     owner_rights.each do |request, right|
-      assert_equal right, OpenTox::Authorization.authorize(TEST_URI, request, OpenTox::SUBJECTID), "#{$aa[:user]} requests #{request} to #{TEST_URI}"
+      assert_equal right, OpenTox::Authorization.authorize(TEST_URI, request, OpenTox::RestClientWrapper.subjectid), "#{$aa[:user]} requests #{request} to #{TEST_URI}"
     end
     groupmember_rights.each do |request, r|
       assert_equal r, OpenTox::Authorization.authorize(TEST_URI, request, tok_anonymous), "anonymous requests #{request} to #{TEST_URI}"
     end
     
-    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, OpenTox::SUBJECTID)
+    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, OpenTox::RestClientWrapper.subjectid)
     assert_kind_of Array, policies
     policies.each do |policy|
-      assert OpenTox::Authorization.delete_policy(policy, OpenTox::SUBJECTID)
+      assert OpenTox::Authorization.delete_policy(policy, OpenTox::RestClientWrapper.subjectid)
     end
     logout(tok_anonymous)
   end
 
   def test_03_check_different_uris
-    res = OpenTox::Authorization.send_policy(TEST_URI, OpenTox::SUBJECTID)
-    assert OpenTox::Authorization.uri_has_policy(TEST_URI, OpenTox::SUBJECTID)
-    assert OpenTox::Authorization.authorize(TEST_URI, "GET", OpenTox::SUBJECTID), "GET request"
-    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, OpenTox::SUBJECTID)
+    res = OpenTox::Authorization.send_policy(TEST_URI, OpenTox::RestClientWrapper.subjectid)
+    assert OpenTox::Authorization.uri_has_policy(TEST_URI, OpenTox::RestClientWrapper.subjectid)
+    assert OpenTox::Authorization.authorize(TEST_URI, "GET", OpenTox::RestClientWrapper.subjectid), "GET request"
+    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, OpenTox::RestClientWrapper.subjectid)
     policies.each do |policy|
-      assert OpenTox::Authorization.delete_policy(policy, OpenTox::SUBJECTID)
+      assert OpenTox::Authorization.delete_policy(policy, OpenTox::RestClientWrapper.subjectid)
     end
  
   end  
diff --git a/test/dataset.rb b/test/dataset.rb
index ddbedce..cf51155 100644
--- a/test/dataset.rb
+++ b/test/dataset.rb
@@ -47,7 +47,7 @@ class DatasetTest < MiniTest::Test
     d = OpenTox::Dataset.new nil
     d.title = "head test"
     d.put
-    response = `curl -Lki -H subjectid:#{OpenTox::SUBJECTID} #{d.uri}`
+    response = `curl -Lki -H subjectid:#{OpenTox::RestClientWrapper.subjectid} #{d.uri}`
     assert_match /200/, response
     d.delete
   end
diff --git a/test/feature.rb b/test/feature.rb
index 73fba80..13e4951 100644
--- a/test/feature.rb
+++ b/test/feature.rb
@@ -35,12 +35,12 @@ class FeatureRestTest < MiniTest::Test
     @formats.each do |f|
       @uris << subject.to_s
       OpenTox::RestClientWrapper.put(subject.to_s, serialize(@rdf, f[0]), {:content_type => f[1]}).chomp
-      assert_equal true, URI.accessible?(@uris.last), "URI is not accessible uri: #{@uris.last}"
+      assert_equal true, URI.accessible?(@uris.last), "#{@uris.last} is not accessible."
     end
     r = OpenTox::RestClientWrapper.get($feature[:uri], {}, :accept => "text/uri-list").split("\n")
 
     @uris.each do |uri|
-      assert_equal true, URI.accessible?(uri), "URI is not accessible uri: #{uri}"
+      assert_equal true, URI.accessible?(uri), "#{uri} is not accessible."
       assert_equal true, r.include?(uri)
       @formats.each do |f|
         rdf = OpenTox::RestClientWrapper.get(uri, {}, :accept => f[1])
@@ -61,7 +61,7 @@ class FeatureRestTest < MiniTest::Test
     @formats.each do |f|
       @uris.each do |uri|
         OpenTox::RestClientWrapper.put(uri, serialize(@rdf,f[0]), :content_type => f[1])
-        assert_equal true, URI.accessible?(uri), "URI is not accessible uri: #{uri}"
+        assert_equal true, URI.accessible?(uri), "#{uri} is not accessible."
         refute_match /XYZ/, OpenTox::RestClientWrapper.get(uri,{},:accept => f[1])
       end
     end
@@ -79,7 +79,7 @@ class FeatureRestTest < MiniTest::Test
     @feature.title = "tost"
     @feature.put
     uri = @feature.uri
-    assert_equal true, URI.accessible?(@feature.uri), "URI is not accessible uri: #{@feature.uri}"
+    assert_equal true, URI.accessible?(@feature.uri), "#{@feature.uri} is not accessible."
 
     list = OpenTox::Feature.all 
     listsize1 = list.length
@@ -100,7 +100,7 @@ class FeatureRestTest < MiniTest::Test
 
     uri = @feature2.uri
     @feature2.delete
-    assert_equal false, URI.accessible?(uri), "URI is still accessible uri: #{uri}"
+    assert_equal false, URI.accessible?(uri), "#{uri} is still accessible."
   end
 
   def test_duplicated_features
diff --git a/test/setup.rb b/test/setup.rb
index 8a69ddc..a90ed66 100644
--- a/test/setup.rb
+++ b/test/setup.rb
@@ -10,5 +10,6 @@ DATA_DIR ||= File.join(TEST_DIR,"data")
 unless $aa[:uri].to_s == ""
   $pi[:subjectid] = OpenTox::Authorization.authenticate($pi[:name], $pi[:password])
   $secondpi[:subjectid] = OpenTox::Authorization.authenticate($secondpi[:name], $secondpi[:password])
-  unauthorized_error "Failed to authenticate user \"#{$aa[:user]}\"." unless OpenTox::Authorization.is_token_valid(OpenTox::SUBJECTID)
+  unauthorized_error "Failed to authenticate user \"#{$aa[:user]}\"." unless OpenTox::Authorization.is_token_valid $pi[:subjectid]
+  unauthorized_error "Failed to authenticate user \"#{$aa[:user]}\"." unless OpenTox::Authorization.is_token_valid $secondpi[:subjectid]
 end
diff --git a/test/toxbank-investigation-curl.rb b/test/toxbank-investigation-curl.rb
index 8407a7b..a63af98 100644
--- a/test/toxbank-investigation-curl.rb
+++ b/test/toxbank-investigation-curl.rb
@@ -1,4 +1,4 @@
-require_relative "setup.rb"
+require_relative "toxbank-setup.rb"
 
 begin
   puts "Service URI is: #{$investigation[:uri]}"
diff --git a/test/toxbank-investigation-policy.rb b/test/toxbank-investigation-policy.rb
index eed3c62..1fcfcd3 100644
--- a/test/toxbank-investigation-policy.rb
+++ b/test/toxbank-investigation-policy.rb
@@ -1,4 +1,4 @@
-require_relative "setup.rb"
+require_relative "toxbank-setup.rb"
 require File.join(File.expand_path(File.dirname(__FILE__)),"..","..","toxbank-investigation","tbaccount.rb")
 
 class TBAccountBasicTest < MiniTest::Test
diff --git a/test/toxbank-investigation-rest.rb b/test/toxbank-investigation-rest.rb
index 142cdbf..a047fc3 100644
--- a/test/toxbank-investigation-rest.rb
+++ b/test/toxbank-investigation-rest.rb
@@ -1,4 +1,4 @@
-require_relative "setup.rb"
+require_relative "toxbank-setup.rb"
 require File.join(File.expand_path(File.dirname(__FILE__)),".." ,".." ,"toxbank-investigation", "util.rb")
 
 begin
diff --git a/test/toxbank-investigation-stress.rb b/test/toxbank-investigation-stress.rb
index c983fe9..9a0db72 100644
--- a/test/toxbank-investigation-stress.rb
+++ b/test/toxbank-investigation-stress.rb
@@ -1,4 +1,4 @@
-require_relative "setup.rb"
+require_relative "toxbank-setup.rb"
 
 begin
   puts "Service URI is: #{$investigation[:uri]}"
diff --git a/test/toxbank-investigation-workflow.rb b/test/toxbank-investigation-workflow.rb
index 3543cf6..3de64c8 100644
--- a/test/toxbank-investigation-workflow.rb
+++ b/test/toxbank-investigation-workflow.rb
@@ -1,4 +1,4 @@
-require_relative "setup.rb"
+require_relative "toxbank-setup.rb"
 require File.join(File.expand_path(File.dirname(__FILE__)),".." ,".." ,"toxbank-investigation", "util.rb")
 
 begin
diff --git a/test/toxbank-investigation-xls.rb b/test/toxbank-investigation-xls.rb
index d781fec..dc9fd85 100644
--- a/test/toxbank-investigation-xls.rb
+++ b/test/toxbank-investigation-xls.rb
@@ -1,4 +1,4 @@
-require_relative "setup.rb"
+require_relative "toxbank-setup.rb"
 
 class ExcelUploadTest < MiniTest::Test
 
diff --git a/test/validation-long.rb b/test/validation-long.rb
index d82edf6..7cc376c 100644
--- a/test/validation-long.rb
+++ b/test/validation-long.rb
@@ -45,18 +45,9 @@ class ValidationTest < MiniTest::Test
   i_suck_and_my_tests_are_order_dependent!
 
   def global_setup
-=begin
-    # SUBJECTID is set in setup.rb
+    # subjectid is set in setup.rb
     puts "login and upload datasets"
-    if $aa[:uri]
-      SUBJECTID = OpenTox::Authorization.authenticate($aa[:user],$aa[:password])
-      internal_server_error "could not log in" unless SUBJECTID
-      puts "logged in: "+SUBJECTID.to_s
-    else
-      puts "AA disabled"
-      SUBJECTID = nil
-    end
-=end
+    OpenTox::RestClientWrapper.subjectid ? puts("logged in: "+OpenTox::RestClientWrapper.subjectid.to_s) : puts("AA disabled")
     FILES.each do |file,type|
       DATA << { :type => type,
         :data => ValidationTestUtil.upload_dataset(file),
@@ -71,15 +62,12 @@ class ValidationTest < MiniTest::Test
       [:data, :train_data, :test_data].each do |d|
         DATA.each do |data| 
           OpenTox::Dataset.new(data[d]).delete if data[d] and data[:delete]
-          # CH: Dataset.exist? has been removed, find checks if uri is accessible
-          # and OpenTox::Dataset.exist?(data[d], SUBJECTID)
         end
       end
       @@vs.each{|v| v.delete} if defined?@@vs
       @@cvs.each{|cv| cv.delete} if defined?@@cvs
       @@reports.each{|report| report.delete} if defined?@@reports
     end
-    #OpenTox::Authorization.logout(SUBJECTID) if $aa[:uri]
   end  
 
   def test_validation_list