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

4 files changed, 10 insertions, 7 deletions

diff --git a/test/data/multi_cell_call.csv b/test/data/multi_cell_call.csv
index a4f4762..cebe58b 100644
--- a/test/data/multi_cell_call.csv
+++ b/test/data/multi_cell_call.csv
@@ -350,7 +350,7 @@ O=C(N(CC)N=O)OCC, 1
 N=C\2/N=C3/O[C@H]1[C@H](O)[C@@H](CO)O[C@H]1N3/C=C/2, 0
 CC(C(O)=O)(OC1=CC=C(C=C1)C2CCCC3=C2C=CC=C3)C, 1
 [Cl-].[Cd+2].[Cl-], 1
-O[C@@H]8[C@@H](O)[C@@H]1O[C@H](CO)[C@H]8O[C@H]7O[C@H](CO)[C@@H](O[C@H]6O[C@H](CO)[C@@H](O[C@H]5O[C@H](CO)[C@@H](O[C@H]4O[C@H](CO)[C@@H](O[C@H]3O[C@H](CO)[C@@H](O[C@H]2O[C@H](CO)[C@@H](O1)[C@H](O)[C@H]2O)[C@H](O)[C@H]3O)[C@H](O)[C@H]4O)[C@H](O)[C@H]5O)[C, 0
+C([C@@H]1[C@@H]8[C@@H]([C@H]([C@H](O1)O[C@@H]2[C@@H](CO)O[C@@H]([C@@H]([C@H]2O)O)O[C@@H]3[C@@H](CO)O[C@@H]([C@@H]([C@H]3O)O)O[C@@H]4[C@@H](CO)O[C@@H]([C@@H]([C@H]4O)O)O[C@@H]5[C@@H](CO)O[C@@H]([C@@H]([C@H]5O)O)O[C@@H]6[C@@H](CO)O[C@@H]([C@@H]([C@H]6O)O)O[C@@H]7[C@@H](CO)O[C@@H]([C@@H]([C@H]7O)O)O8)O)O)O, 0
 O=NN1CCCCCCC1, 1
 O=C1C2=C(N=C(C=C2)C)N(C=C1C(=O)O)CC, 1
 [Cd+2].[Cl-].[Cl-].[H]O[H], 0
diff --git a/test/data/multi_cell_call_no_dup.csv b/test/data/multi_cell_call_no_dup.csv
index 1af2191..78ef7eb 100644
--- a/test/data/multi_cell_call_no_dup.csv
+++ b/test/data/multi_cell_call_no_dup.csv
@@ -343,7 +343,7 @@ O=C(N(CC)N=O)OCC, 1
 N=C\2/N=C3/O[C@H]1[C@H](O)[C@@H](CO)O[C@H]1N3/C=C/2, 0
 CC(C(O)=O)(OC1=CC=C(C=C1)C2CCCC3=C2C=CC=C3)C, 1
 [Cl-].[Cd+2].[Cl-], 1
-O[C@@H]8[C@@H](O)[C@@H]1O[C@H](CO)[C@H]8O[C@H]7O[C@H](CO)[C@@H](O[C@H]6O[C@H](CO)[C@@H](O[C@H]5O[C@H](CO)[C@@H](O[C@H]4O[C@H](CO)[C@@H](O[C@H]3O[C@H](CO)[C@@H](O[C@H]2O[C@H](CO)[C@@H](O1)[C@H](O)[C@H]2O)[C@H](O)[C@H]3O)[C@H](O)[C@H]4O)[C@H](O)[C@H]5O)[C, 0
+C([C@@H]1[C@@H]8[C@@H]([C@H]([C@H](O1)O[C@@H]2[C@@H](CO)O[C@@H]([C@@H]([C@H]2O)O)O[C@@H]3[C@@H](CO)O[C@@H]([C@@H]([C@H]3O)O)O[C@@H]4[C@@H](CO)O[C@@H]([C@@H]([C@H]4O)O)O[C@@H]5[C@@H](CO)O[C@@H]([C@@H]([C@H]5O)O)O[C@@H]6[C@@H](CO)O[C@@H]([C@@H]([C@H]6O)O)O[C@@H]7[C@@H](CO)O[C@@H]([C@@H]([C@H]7O)O)O8)O)O)O, 0
 O=NN1CCCCCCC1, 1
 O=C1C2=C(N=C(C=C2)C)N(C=C1C(=O)O)CC, 1
 [Cd+2].[Cl-].[Cl-].[H]O[H], 0
diff --git a/test/lazar-long.rb b/test/lazar-long.rb
index 69485a6..c541b43 100644
--- a/test/lazar-long.rb
+++ b/test/lazar-long.rb
@@ -47,7 +47,10 @@ class LazarExtendedTest < MiniTest::Test
     assert_equal prediction_dataset.uri.uri?, true
     prediction = prediction_dataset.predictions.select{|p| p[:compound].uri == compound.uri}.first
     assert_equal "0", prediction[:value]
-    assert_equal 0.025885845574483608, prediction[:confidence]
+    #assert_equal 0.025885845574483608, prediction[:confidence]
+    # with compound change in training_dataset see:
+    # https://github.com/opentox/opentox-test/commit/0e78c9c59d087adbd4cc58bab60fb29cbe0c1da0
+    assert_equal 0.02422364949075546, prediction[:confidence]
     dataset.delete
     model.delete
     feature_dataset.delete
diff --git a/test/urilist.rb b/test/urilist.rb
index c606aad..f3adac3 100644
--- a/test/urilist.rb
+++ b/test/urilist.rb
@@ -3,10 +3,10 @@ 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!"
+    services = [$algorithm[:uri], $dataset[:uri], $feature[:uri], $model[:uri], $task[:uri]]
+    services.each do |service|
+      s_urilist = `curl -H accept:text/uri-list #{service}`.split("\n")
+      assert_equal s_urilist.uniq.length, s_urilist.length, "Attention, dublicates found in #{service.split("/").last} uri-list!"
     end
   end