diff options
| author | rautenberg <rautenberg@in-silico.ch> | 2013-07-29 10:14:33 +0200 |
|---|---|---|
| committer | rautenberg <rautenberg@in-silico.ch> | 2013-07-29 10:14:33 +0200 |
| commit | dee09ef0fb399cf5b342a38628460ca843ec18d9 (patch) | |
| tree | f4b17dbf1c18623a7badec449f03b43f56a1062c | |
| parent | 0928ecc0b7fcadd08f11d4b757c1213b30201b7b (diff) | |
adapt toxbank-investigation-policy test to new A&A
| -rw-r--r-- | test/toxbank-investigation-policy.rb | 16 | ||||
| -rw-r--r-- | test/toxbank-setup.rb | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/test/toxbank-investigation-policy.rb b/test/toxbank-investigation-policy.rb index 4637c8c..22d4e97 100644 --- a/test/toxbank-investigation-policy.rb +++ b/test/toxbank-investigation-policy.rb @@ -74,10 +74,10 @@ class TBAccountBasicTest < MiniTest::Test guest = OpenTox::TBAccount.new("#{RDF::TBU.U2}") #PI creates policies guest.send_policy(@@fake_uri) assert_equal true, OpenTox::Authorization.uri_has_policy(@@fake_uri) - assert_equal false, OpenTox::Authorization.authorize(@@fake_uri, "POST") - assert_equal false, OpenTox::Authorization.authorize(@@fake_uri, "PUT") - assert_equal false, OpenTox::Authorization.authorize(@@fake_uri, "DELETE") - assert_equal true, OpenTox::Authorization.authorize(@@fake_uri,"GET") + assert_equal false, OpenTox::Authorization.authorize(@@fake_uri, "POST", $guestid) + assert_equal false, OpenTox::Authorization.authorize(@@fake_uri, "PUT", $guestid) + assert_equal false, OpenTox::Authorization.authorize(@@fake_uri, "DELETE", $guestid) + assert_equal true, OpenTox::Authorization.authorize(@@fake_uri,"GET", $guestid) test_98_delete_policies end @@ -124,10 +124,10 @@ class TBAccountBasicTest < MiniTest::Test guest = OpenTox::TBAccount.new("#{RDF::TBU.U2}") #PI creates policies guest.send_policy(@@fake_uri, "readwrite") assert_equal true, OpenTox::Authorization.uri_has_policy(@@fake_uri) - assert_equal true, OpenTox::Authorization.authorize(@@fake_uri, "POST") - assert_equal true, OpenTox::Authorization.authorize(@@fake_uri, "PUT") - assert_equal false, OpenTox::Authorization.authorize(@@fake_uri, "DELETE") - assert_equal true, OpenTox::Authorization.authorize(@@fake_uri,"GET") + assert_equal true, OpenTox::Authorization.authorize(@@fake_uri, "POST", $guestid) + assert_equal true, OpenTox::Authorization.authorize(@@fake_uri, "PUT", $guestid) + assert_equal false, OpenTox::Authorization.authorize(@@fake_uri, "DELETE", $guestid) + assert_equal true, OpenTox::Authorization.authorize(@@fake_uri,"GET", $guestid) policies = OpenTox::Authorization.list_uri_policies(@@fake_uri) assert_equal policies.size, 1 xml = OpenTox::Authorization.list_policy(policies[0]) diff --git a/test/toxbank-setup.rb b/test/toxbank-setup.rb index d2de2a5..fe64a8c 100644 --- a/test/toxbank-setup.rb +++ b/test/toxbank-setup.rb @@ -7,4 +7,5 @@ unless $aa[:uri].to_s == "" 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] OpenTox::Authorization.authenticate($aa[:user], $aa[:password]) + $guestid = OpenTox::RestClientWrapper.subjectid end |