Merge branch 'development' of github.com:opentox/opentox-test into development

Conflicts:
	test/feature.rb
	test/validation-long.rb

6 files changed, 37 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 27f1d23..d36849b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-test/urilist.rb
 *~
-test/dgtest.rb
diff --git a/test/dataset.rb b/test/dataset.rb
index a1dccba..d81cdcd 100644
--- a/test/dataset.rb
+++ b/test/dataset.rb
@@ -66,7 +66,7 @@ class DatasetTest < MiniTest::Test
     d.features = ["test1", "test2"].collect do |title|
       f = OpenTox::Feature.new nil,@subjectid
       f.title = title
-      f[RDF.type] = RDF::OT.NumericFeature
+      f[RDF.type] = [RDF::OT.NumericFeature, RDF::OT.Feature]
       f.put
       f
     end
@@ -193,6 +193,9 @@ class DatasetTest < MiniTest::Test
     assert_equal true, URI.accessible?(dataset.uri, SUBJECTID)
     assert_equal "Cannot parse compound '' at position 3, all entries are ignored.",  dataset[RDF::OT.Warnings]
     File.delete "#{DATA_DIR}/temp_test.csv"
+    dataset.features.each{|f| feature = OpenTox::Feature.find f.uri, @@subjectid; feature.delete}
+    dataset.delete
+    assert_equal false, URI.accessible?(dataset.uri, @@subjectid)
   end
 
 end
diff --git a/test/feature.rb b/test/feature.rb
index caa3732..2dbea26 100644
--- a/test/feature.rb
+++ b/test/feature.rb
@@ -81,9 +81,9 @@ class FeatureRestTest < MiniTest::Test
     uri = @feature.uri
     assert_equal true, URI.accessible?(@feature.uri, SUBJECTID), "URI is not accessible uri: #{@feature.uri}"
 
-    r = OpenTox::Feature.all SUBJECTID
-    fsize = r.size
-    assert_equal true, r.collect{|f| f.uri}.include?(@feature.uri)
+    list = OpenTox::Feature.all SUBJECTID
+    listsize1 = list.length
+    assert_equal true, list.collect{|f| f.uri}.include?(@feature.uri)
 
     # modify feature
     @feature2 = OpenTox::Feature.new @feature.uri, SUBJECTID
@@ -92,11 +92,11 @@ class FeatureRestTest < MiniTest::Test
 
     @feature2.title = "feature2"
     @feature2.put
-    f = OpenTox::Feature.all SUBJECTID
-    fsize2 = f.size
+    list = OpenTox::Feature.all SUBJECTID
+    listsize2 = list.length
     assert_match "feature2", OpenTox::RestClientWrapper.get(@feature2.uri)
     refute_match "tost", OpenTox::RestClientWrapper.get(@feature2.uri)
-    assert_equal fsize, fsize2
+    assert_equal listsize1, listsize2
 
     uri = @feature2.uri
     @feature2.delete
@@ -105,7 +105,7 @@ class FeatureRestTest < MiniTest::Test
 
   def test_duplicated_features
     metadata = {
-      RDF::DC.title => "test",
+      RDF::DC.title => "feature duplication test",
       RDF.type => [RDF::OT.Feature, RDF::OT.StringFeature],
       RDF::DC.description => "feature duplication test"
     }
diff --git a/test/toxbank-investigation-stress.rb b/test/toxbank-investigation-stress.rb
index fb001d5..c983fe9 100644
--- a/test/toxbank-investigation-stress.rb
+++ b/test/toxbank-investigation-stress.rb
@@ -10,6 +10,8 @@ end
 
 class StressTest < MiniTest::Test
 
+  i_suck_and_my_tests_are_order_dependent!
+
   # Do multiple POST and check if completed
   def test_01_multiple_upload
     file = File.join File.dirname(__FILE__), "data/toxbank-investigation/valid", "BII-I-1b-tb2.zip"
diff --git a/test/urilist.rb b/test/urilist.rb
new file mode 100644
index 0000000..0f63de2
--- /dev/null
+++ b/test/urilist.rb
@@ -0,0 +1,23 @@
+require_relative "setup.rb"
+
+class UriListTest < MiniTest::Test
+
+  def test_01_urilist_dublicates
+    services = {1=>"algorithm", 3=>"dataset", 4=>"feature", 5=>"model", 6=>"task"}
+    services.each do |k, service|
+      s_urilist = `curl -H accept:text/uri-list http://localhost:808#{k}/#{service}`.split("\n") 
+      assert_equal s_urilist.uniq.length, s_urilist.length, "Attention, dublicates found in #{service} uri-list!"
+    end
+  end
+
+  def test_02_urilist_mime
+    mime_types = ["application/rdf+xml", "text/turtle", "application/sparql-results+xml", "text/plain", "text/uri-list", "text/html"]
+    mime_types.each do |mt|
+      s_urilist = `curl -i -H accept:#{mt} http://localhost:8084/feature`
+      assert_match /200 OK/, s_urilist.to_s
+      refute_match /Content-Length: 0/, s_urilist.to_s, "Attention, content length empty!"
+      refute_match /dataset/, s_urilist.to_s, "Attention, found dataset in feature uri-list!"
+    end
+  end
+
+end
diff --git a/test/validation-long.rb b/test/validation-long.rb
index 3c60d05..f6b59a5 100644
--- a/test/validation-long.rb
+++ b/test/validation-long.rb
@@ -79,7 +79,7 @@ class ValidationTest < MiniTest::Test
       @@cvs.each{|cv| cv.delete} if defined?@@cvs
       @@reports.each{|report| report.delete} if defined?@@reports
     end
-    OpenTox::Authorization.logout(SUBJECTID) if $aa[:uri]
+    #OpenTox::Authorization.logout(SUBJECTID) if $aa[:uri]
   end  
 
   def test_validation_list