integrate authorization.rb in Rakefile and set subjectid in setup/teardown

2 files changed, 17 insertions, 32 deletions

diff --git a/Rakefile b/Rakefile
index eb2d231..01050c8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,7 +21,7 @@ task :teardown do
   OpenTox::Authorization.logout(@@subjectid)
 end
 
-[:all, :feature, :dataset, :fminer, :lazar].each do |t|
+[:all, :feature, :dataset, :fminer, :lazar, :authorization].each do |t|
   task :teardown => t
   task t => :setup 
 end
diff --git a/authorization.rb b/authorization.rb
index b12ae49..0d3508b 100644
--- a/authorization.rb
+++ b/authorization.rb
@@ -1,9 +1,7 @@
 require "rubygems"
-require "opentox-ruby-api-wrapper"
+require "opentox-ruby"
 require "test/unit"
 
-TEST_USER = "guest"
-TEST_PW   = "guest"
 TEST_URI  = "http://only_a_test/test/" + rand(1000000).to_s
 
 class TestOpenToxAuthorizationBasic < Test::Unit::TestCase
@@ -14,9 +12,7 @@ class TestOpenToxAuthorizationBasic < Test::Unit::TestCase
   end
  
   def test_02_get_token
-    tok = login
-    assert_not_nil tok
-    logout(tok)
+    assert_not_nil @@subjectid
   end
   
   def test_03_is_valid_token
@@ -32,9 +28,7 @@ class TestOpenToxAuthorizationBasic < Test::Unit::TestCase
   end
   
   def test_05_list_policies
-    tok = login
-    assert_kind_of Array, OpenTox::Authorization.list_policies(tok)
-    logout(tok)
+    assert_kind_of Array, OpenTox::Authorization.list_policies(@@subjectid)
   end
   
 end
@@ -42,21 +36,15 @@ end
 class TestOpenToxAuthorizationLDAP < Test::Unit::TestCase
 
   def test_01_list_groups
-    tok = login
-    assert_kind_of Array, OpenTox::Authorization.list_groups(tok)
-    logout(tok)
+    assert_kind_of Array, OpenTox::Authorization.list_groups(@@subjectid)
   end  
 
   def test_02_list_user_groups
-    tok = login
-    assert_kind_of Array, OpenTox::Authorization.list_groups(tok)
-    logout(tok)
+    assert_kind_of Array, OpenTox::Authorization.list_groups(@@subjectid)
   end
   
   def test_03_get_user
-    tok = login
-    assert_equal TEST_USER, OpenTox::Authorization.get_user(tok)
-    logout(tok)
+    assert_equal TEST_USER, OpenTox::Authorization.get_user(@@subjectid)
   end
 
 end
@@ -64,40 +52,37 @@ end
 class TestOpenToxAuthorizationLDAP < Test::Unit::TestCase
 
   def test_01_create_check_delete_default_policies
-    tok = login
-    res = OpenTox::Authorization.send_policy(TEST_URI, tok)
+    res = OpenTox::Authorization.send_policy(TEST_URI, @@subjectid)
     assert res
-    assert OpenTox::Authorization.uri_has_policy(TEST_URI, tok)
-    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, tok)
+    assert OpenTox::Authorization.uri_has_policy(TEST_URI, @@subjectid)
+    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, @@subjectid)
     assert_kind_of Array, policies
     policies.each do |policy|
-      assert OpenTox::Authorization.delete_policy(policy, tok)
+      assert OpenTox::Authorization.delete_policy(policy, @@subjectid)
     end
-    logout(tok)
   end
 
   def test_02_check_policy_rules
-    tok = login
     tok_anonymous = OpenTox::Authorization.authenticate("anonymous","anonymous")
     assert_not_nil tok_anonymous
-    res = OpenTox::Authorization.send_policy(TEST_URI, tok)
+    res = OpenTox::Authorization.send_policy(TEST_URI, @@subjectid)
     assert res
-    assert OpenTox::Authorization.uri_has_policy(TEST_URI, tok)
+    assert OpenTox::Authorization.uri_has_policy(TEST_URI, @@subjectid)
     owner_rights = {"GET" => true, "POST" => true, "PUT" => true, "DELETE" => true}
     groupmember_rights = {"GET" => true, "POST" => nil, "PUT" => nil, "DELETE" => nil}
     owner_rights.each do |request, right|
-      assert_equal right, OpenTox::Authorization.authorize(TEST_URI, request, tok), "#{TEST_USER} requests #{request} to #{TEST_URI}"
+      assert_equal right, OpenTox::Authorization.authorize(TEST_URI, request, @@subjectid), "#{TEST_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, tok)
+    policies = OpenTox::Authorization.list_uri_policies(TEST_URI, @@subjectid)
     assert_kind_of Array, policies
     policies.each do |policy|
-      assert OpenTox::Authorization.delete_policy(policy, tok)
+      assert OpenTox::Authorization.delete_policy(policy, @@subjectid)
     end
-    logout(tok)
+    logout(tok_anonymous)
   end