huge commit, main changes: validation_type and .finished introduced, supporting subtasks, reporting slightly refactored

1 files changed, 14 insertions, 8 deletions

diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index 5e068a3..31495a2 100644
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -34,9 +34,9 @@ class ValidationTest < Test::Unit::TestCase
   def test_it
     $test_case = self
     
-    #get "/report/crossvalidation/15",nil,'HTTP_ACCEPT' => "text/html" 
+    #get "/1",nil,'HTTP_ACCEPT' => "text/html" 
 #    get "/",nil,'HTTP_ACCEPT' => "text/html" 
-#    puts last_response.body
+    #puts last_response.body
     
 #    d = OpenTox::Dataset.find("http://ot-dev.in-silico.ch/dataset/307")
 #    puts d.compounds.inspect
@@ -64,7 +64,7 @@ class ValidationTest < Test::Unit::TestCase
 #      :test_target_dataset_uri=>"http://localhost/dataset/1"
 
 #    get "/crossvalidation/2",nil,'HTTP_ACCEPT' => "application/rdf+xml" 
-#    puts last_response.body
+    #puts last_response.body
     
     #get "/crossvalidation?model_uri=lazar"
 #    post "/test_validation",:select=>"6d" #,:report=>"yes,please"
@@ -80,18 +80,24 @@ class ValidationTest < Test::Unit::TestCase
 #      #:classification=>"true"}
 #    puts last_response.body
     
-   #run_test("1b")#,"http://localhost/validation/394");
+    #run_test("1b","http://localhost/validation/20")#,"http://localhost/validation/394");
     
-    #run_test("11b", "http://localhost/validation/crossvalidation/2" )# //localhost/validation/42")#, "http://localhost/validation/report/validation/8") #,"http://localhost/validation/report/validation/36") #, "http://localhost/validation/321")
+    #run_test("7b","http://localhost/validation/21")
     
-   # run_test("7a","http://localhost/validation/40") #,"http://localhost/validation/crossvalidation/10") #, "http://localhost/validation/321")
+    #run_test("3a","http://localhost/validation/crossvalidation/4")
+    #run_test("3b","http://localhost/validation/crossvalidation/3")
     
+    run_test("8a", "http://localhost/validation/crossvalidation/6")
+    #run_test("8b", "http://localhost/validation/crossvalidation/5")
+
+    #run_test("11b", "http://localhost/validation/crossvalidation/2" )# //localhost/validation/42")#, "http://localhost/validation/report/validation/8") #,"http://localhost/validation/report/validation/36") #, "http://localhost/validation/321")
+   # run_test("7a","http://localhost/validation/40") #,"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
+  # prepare_examples
+    #do_test_examples # USES CURL, DO NOT FORGET TO RESTART VALIDATION SERVICE
     #do_test_examples_ortona
   end