Merge branch 'hotfix/v2.0.1' into development

Conflicts:
	fminer.rb
	lazar.rb
	toxcreate.rb

3 files changed, 5 insertions, 5 deletions

diff --git a/fminer.rb b/fminer.rb
index aa95d11..93644c4 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -19,6 +19,7 @@ class FminerTest < Test::Unit::TestCase
     dataset_uri = OpenTox::Algorithm::Fminer::BBRC.new.run({:dataset_uri => @@regression_training_dataset.uri, :prediction_feature => feature, :subjectid => @@subjectid, :feature_type=>"paths"}).to_s
     d =OpenTox::Dataset.new dataset_uri, @@subjectid
     d.load_features(@@subjectid)
+    #assert_equal 185, d.features.size
     assert_equal 219, d.features.size
     d.delete(@@subjectid)
   end
diff --git a/lazar.rb b/lazar.rb
index b5de8aa..b60794c 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -29,7 +29,6 @@ class LazarTest < Test::Unit::TestCase
     validate_owl model_uri,@@subjectid
     lazar = OpenTox::Model::Lazar.find model_uri, @@subjectid
     @models << lazar
-    assert_equal 219, lazar.features.size
     compound = OpenTox::Compound.from_smiles("c1ccccc1NN")
     prediction_uri = lazar.run(:compound_uri => compound.uri, :subjectid => @@subjectid).to_s
     prediction = OpenTox::LazarPrediction.find(prediction_uri, @@subjectid)
@@ -153,6 +152,7 @@ class LazarTest < Test::Unit::TestCase
 
   end
 
+=begin
   def test_ambit_classification_model
 
     # create model
@@ -194,7 +194,6 @@ class LazarTest < Test::Unit::TestCase
     # dataset prediction
     #@lazar.delete(@@subjectid)
   end
-=begin
 =end
 
 end
diff --git a/toxcreate.rb b/toxcreate.rb
index c6b38d9..8287140 100644
--- a/toxcreate.rb
+++ b/toxcreate.rb
@@ -70,9 +70,9 @@ class ToxCreateTest < Test::Unit::TestCase
       time +=5
     end
     assert first(".model_status").has_content?("Completed")
-    #click_on "Predict"
-    #fill_in "or enter a Name, InChI, Smiles, CAS, ...", :with => "NNc1ccccc1"
-    #check "hamster_carcinogenicity"
+    click_on "Predict"
+    fill_in "or enter a Name, InChI, Smiles, CAS, ...", :with => "NNc1ccccc1"
+    check "hamster_carcinogenicity"
     #click_button "Predict"
     #assert page.has_content? "false"
     #assert page.has_content? "0.294"