1 files changed, 10 insertions, 12 deletions
diff --git a/test/lazar-fminer.rb b/test/lazar-fminer.rb
index 4f146c6..e2b689d 100644
--- a/test/lazar-fminer.rb
+++ b/test/lazar-fminer.rb
@@ -5,16 +5,14 @@ class LazarFminerTest < MiniTest::Test
   def test_lazar_fminer
     dataset = OpenTox::Dataset.new
     dataset.upload File.join(DATA_DIR,"hamster_carcinogenicity.csv")
-    assert_equal dataset.uri.uri?, true
-    model_uri = OpenTox::Model::Lazar.create :dataset_uri => dataset.uri, :feature_generation_uri => File.join($algorithm[:uri],"fminer","bbrc")
-    assert_equal model_uri.uri?, true
-    model = OpenTox::Model::Lazar.new model_uri
-    assert_equal model.uri.uri?, true
-    feature_dataset_uri = model[RDF::OT.featureDataset]
-    feature_dataset = OpenTox::Dataset.new feature_dataset_uri
+    model = OpenTox::Model::Lazar.create OpenTox::Algorithm::Fminer.bbrc(:dataset => dataset)
+    feature_dataset = OpenTox::Dataset.find model.feature_dataset_id
     assert_equal dataset.compounds.size, feature_dataset.compounds.size
     assert_equal 54, feature_dataset.features.size
-    assert_equal '[#6&A]-[#6&A]-[#6&A]=[#6&A]', OpenTox::Feature.new(feature_dataset.features.first.uri).title
+    feature_dataset.data_entries.each do |e|
+      assert_equal e.size, feature_dataset.features.size
+    end
+    assert_equal '[#6&A]-[#6&A]-[#6&A]=[#6&A]', feature_dataset.features.first.title
 
     [ {
       :compound => OpenTox::Compound.from_inchi("InChI=1S/C6H6/c1-2-4-6-5-3-1/h1-6H"),
@@ -25,10 +23,10 @@ class LazarFminerTest < MiniTest::Test
       :prediction => "false",
       :confidence => 0.3639589577089577
     } ].each do |example|
-      prediction_uri = model.predict :compound_uri => example[:compound].uri
-      #puts prediction_uri
-      prediction_dataset = OpenTox::Dataset.new prediction_uri
-      assert_equal prediction_dataset.uri.uri?, true
+      prediction = model.predict :compound => example[:compound]
+      p prediction
+      p prediction.features
+      p prediction.compounds
       prediction = prediction_dataset.predictions.select{|p| p[:compound].uri == example[:compound].uri}.first
       assert_equal example[:prediction], prediction[:value]
       assert_equal example[:confidence], prediction[:confidence]