1 files changed, 21 insertions, 5 deletions
diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index ce53c99..cbaa84b 100644
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -1,4 +1,3 @@
-require "logger"
 require "uri"
 require "yaml"
 ENV['RACK_ENV'] = 'test'
@@ -7,16 +6,20 @@ require 'test/unit'
 require 'rack/test'
 require 'lib/test_util.rb'
 require 'test/test_examples.rb'
+
 LOGGER = MyLogger.new(STDOUT)
 LOGGER.datetime_format = "%Y-%m-%d %H:%M:%S "
+LOGGER.formatter = Logger::Formatter.new
+
 
 class ValidationTest < Test::Unit::TestCase
   include Rack::Test::Methods
   include Lib::TestUtil
   
   def test_it
-    #$test_case = self
+    $test_case = self
 
+    #get "/crossvalidation/4/statistics"
 #    post "",:model_uri=>"http://localhost/model/1",:test_dataset_uri=>"http://localhost/dataset/3",
 #      :test_target_dataset_uri=>"http://localhost/dataset/1"
 
@@ -26,13 +29,26 @@ class ValidationTest < Test::Unit::TestCase
 #    post "/test_validation",:select=>"6d" #,:report=>"yes,please"
 #    puts last_response.body
     
-    #run_test("1b") #, "http://localhost/validation/321")
-    #run_test("3b", "http://localhost/validation/crossvalidation/1")
+#    post "/validate_datasets",{
+#      :test_dataset_uri=>"http://localhost/dataset/204",
+#      :prediction_dataset_uri=>"http://localhost/dataset/206",
+#      :test_target_dataset_uri=>"http://localhost/dataset/202",
+#      :prediction_feature=>"http://ot-dev.in-silico.ch/toxcreate/feature#IRIS%20unit%20risk",
+#      :predicted_feature=>"http://ot-dev.in-silico.ch/toxcreate/feature#IRIS%20unit%20risk_lazar_regression",
+#      :regression=>"true"}
+#      #:classification=>"true"}
+#    puts last_response.body
+    
+    run_test("3b" ) #, "http://localhost/validation/826") #,"http://localhost/validation/report/validation/36") #, "http://localhost/validation/321")
+    
+    #run_test("7a") #,"http://localhost/validation/crossvalidation/10") #, "http://localhost/validation/321")
+    
+    #run_test("8b", "http://localhost/validation/crossvalidation/4")
  
     #puts Nightly.build_nightly("1")
     
     #prepare_examples
-    do_test_examples # USES CURL, DO NOT FORGET TO RESTART VALIDATION SERVICE
+    #do_test_examples # USES CURL, DO NOT FORGET TO RESTART VALIDATION SERVICE
   end
 
   def app