configuration settings partially fixed

3 files changed, 20 insertions, 18 deletions

diff --git a/test/authorization.rb b/test/authorization.rb
index 38b0db6..1556187 100644
--- a/test/authorization.rb
+++ b/test/authorization.rb
@@ -1,16 +1,18 @@
-require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)),"setup.rb")
 
 TEST_URI  = "http://only_a_test/test/" + rand(1000000).to_s
-AA ||= "https://opensso.in-silico.ch"
-AA_USER = "guest"
-AA_PASS = "guest"
-@@subjectid = OpenTox::Authorization.authenticate(AA_USER,AA_PASS)
+unless defined? $aa[:uri] #overwrite turned off A&A server for testing
+  $aa[:uri] = "https://opensso.in-silico.ch"
+  @@subjectid = OpenTox::Authorization.authenticate($aa[:user],$aa[:password])
+end
+
+@@subjectid ||= OpenTox::Authorization.authenticate($aa[:user],$aa[:password]) 
 
 class TestOpenToxAuthorizationBasic < Test::Unit::TestCase
  
   def test_01_server
-    assert_equal(AA, OpenTox::Authorization.server)
+    @aaserver = $aa[:uri]
+    assert_equal(@aaserver, OpenTox::Authorization.server)
   end
  
   def test_02_get_token
@@ -25,7 +27,7 @@ class TestOpenToxAuthorizationBasic < Test::Unit::TestCase
   end
   
   def test_04_logout
-    tok = login
+    tok = login 
     assert logout(tok)
     assert_equal false, OpenTox::Authorization.is_token_valid(tok)
   end
@@ -39,11 +41,11 @@ end
 class TestOpenToxAuthorizationLDAP < Test::Unit::TestCase
 
   def test_01_list_user_groups
-    assert_kind_of Array, OpenTox::Authorization.list_user_groups(AA_USER, @@subjectid)
+    assert_kind_of Array, OpenTox::Authorization.list_user_groups($aa[:user], @@subjectid)
   end
   
   def test_02_get_user
-    assert_equal AA_USER, OpenTox::Authorization.get_user(@@subjectid)
+    assert_equal $aa[:user], OpenTox::Authorization.get_user(@@subjectid)
   end
 
 end
@@ -71,7 +73,7 @@ class TestOpenToxAuthorizationLDAP < Test::Unit::TestCase
     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, @@subjectid), "#{AA_USER} requests #{request} to #{TEST_URI}"
+      assert_equal right, OpenTox::Authorization.authorize(TEST_URI, request, @@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}"
@@ -103,5 +105,5 @@ def logout (token)
 end
 
 def login
-  OpenTox::Authorization.authenticate(AA_USER,AA_PASS)
+  OpenTox::Authorization.authenticate($aa[:user],$aa[:password])
 end 
diff --git a/test/store_query.rb b/test/store_query.rb
index db33352..f0b5b35 100644
--- a/test/store_query.rb
+++ b/test/store_query.rb
@@ -17,10 +17,10 @@ class UploadTest < Test::Unit::TestCase
   
   def test_02_add_data
     # upload invalid data
-    response = `curl -0 -i -k -u #{$four_store[:user]}:#{$four_store[:password]} -T '#{File.join File.dirname(__FILE__),"data/invalid/BII-invalid.n3"}' '#{$four_store[:uri]}/data/?graph=#{$four_store[:uri]}/data/#{$four_store[:user]}/BII-I-1.n3'`.chomp
+    response = `curl -0 -i -k -u #{$four_store[:user]}:#{$four_store[:password]} -T '#{File.join File.dirname(__FILE__),"data/toxbank-investigation/invalid/BII-invalid.n3"}' '#{$four_store[:uri]}/data/?graph=#{$four_store[:uri]}/data/#{$four_store[:user]}/BII-I-1.n3'`.chomp
     assert_match /400/, response
     # upload valid data
-    response = `curl -0 -i -k -u #{$four_store[:user]}:#{$four_store[:password]} -T '#{File.join File.dirname(__FILE__),"data/valid/BII-I-1.n3"}' '#{$four_store[:uri]}/data/?graph=#{$four_store[:uri]}/data/#{$four_store[:user]}/BII-I-1.n3'`.chomp
+    response = `curl -0 -i -k -u #{$four_store[:user]}:#{$four_store[:password]} -T '#{File.join File.dirname(__FILE__),"data/toxbank-investigation/valid/BII-I-1.n3"}' '#{$four_store[:uri]}/data/?graph=#{$four_store[:uri]}/data/#{$four_store[:user]}/BII-I-1.n3'`.chomp
     assert_match /201/, response
   end
   
@@ -55,7 +55,7 @@ class UploadTest < Test::Unit::TestCase
     5.times do |t|
       threads << Thread.new(t) do |up|
         #puts "Start Time >> " << (Time.now).to_s
-        response = `curl -0 -i -k -u #{$four_store[:user]}:#{$four_store[:password]} -T '#{File.join File.dirname(__FILE__),"data/valid/BII-I-1.n3"}' '#{$four_store[:uri]}/data/?graph=#{$four_store[:user]}/test#{t}.n3'`.chomp
+        response = `curl -0 -i -k -u #{$four_store[:user]}:#{$four_store[:password]} -T '#{File.join File.dirname(__FILE__),"data/toxbank-investigation/valid/BII-I-1.n3"}' '#{$four_store[:uri]}/data/?graph=#{$four_store[:user]}/test#{t}.n3'`.chomp
         assert_match /201/, response
       end
     end
diff --git a/test/upload.rb b/test/upload.rb
index 95c9e6b..ffc06d5 100644
--- a/test/upload.rb
+++ b/test/upload.rb
@@ -76,14 +76,14 @@ class UploadTest < Test::Unit::TestCase
 =begin
   def test_rest_client_wrapper
     ["BII-I-1.zip","isa-tab-renamed.zip"].each do |f|
-      file = File.join File.dirname(__FILE__), "toxbank-investigation","data/valid", f
+      file = File.join File.dirname(__FILE__), "toxbank-investigation","data/toxbank-investigation/valid", f
       investigation_uri = OpenTox::RestClientWrapper.post $toxbank_investigation[:uri], {:file => File.read(file),:name => file}, {:content_type => "application/zip", :subjectid => @@subjectid}
       puts investigation_uri
       zip = File.join @tmpdir,"tmp.zip"
       #puts "curl -k -H 'Accept:application/zip' -H 'subjectid:#{@@subjectid}' #{uri} > #{zip}"
       `curl -k -H "Accept:application/zip" -H "subjectid:#{@@subjectid}" #{uri} > #{zip}`
       `unzip -o #{zip} -d #{@tmpdir}`
-      files = `unzip -l toxbank-investigation/data/valid/#{f}|grep txt|cut -c 31- | sed 's#^.*/##'`.split("\n")
+      files = `unzip -l toxbank-investigation/data/toxbank-investigation/valid/#{f}|grep txt|cut -c 31- | sed 's#^.*/##'`.split("\n")
       files.each{|f| assert_equal true, File.exists?(File.join(File.expand_path(@tmpdir),f)) }
 
       # get isatab files
@@ -106,13 +106,13 @@ class UploadTest < Test::Unit::TestCase
 =begin
   def test_ruby_api
     ["BII-I-1.zip","isa-tab-renamed.zip"].each do |f|
-      file = File.join File.dirname(__FILE__), "data/valid", f
+      file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", f
       investigation = OpenTox::Investigation.create $toxbank_investigation[:uri], :file => file, :headers => {:content_type => "application/zip", :subjectid => @@subjectid}
       zip = File.join @tmpdir,"tmp.zip"
       #puts "curl -k -H 'Accept:application/zip' -H 'subjectid:#{@@subjectid}' #{uri} > #{zip}"
       `curl -k -H "Accept:application/zip" -H "subjectid:#{@@subjectid}" #{uri} > #{zip}`
       `unzip -o #{zip} -d #{@tmpdir}`
-      files = `unzip -l data/valid/#{f}|grep txt|cut -c 31- | sed 's#^.*/##'`.split("\n")
+      files = `unzip -l data/toxbank-investigation/valid/#{f}|grep txt|cut -c 31- | sed 's#^.*/##'`.split("\n")
       files.each{|f| assert_equal true, File.exists?(File.join(File.expand_path(@tmpdir),f)) }
 
       # get isatab files