Merge branch 'release/v1.0.1'v1.0.1

1 files changed, 13 insertions, 6 deletions

diff --git a/test/test_application.rb b/test/test_application.rb
index cbc1057..f255d1d 100644..100755
--- a/test/test_application.rb
+++ b/test/test_application.rb
@@ -2,16 +2,23 @@
 post '/test_validation/?' do
   validationExamples = ValidationExamples.select(params[:select])
   return "please \"select\" a single validation example:\n"+ValidationExamples.list if validationExamples.size!=1 or validationExamples[0].size!=1
-  OpenTox::Task.as_task do
+  task = OpenTox::Task.create("Test validation",url_for("/test_validation",:full)) do |task| 
     v = validationExamples[0][0]
     ex = v.new
+    ex.subjectid = @subjectid
     ex.upload_files
+    task.progress(10)
     ex.check_requirements
-    ex.validate
-    raise ex.validation_error if ex.validation_error
-    ex.report if params[:report]
-    raise ex.report_error if ex.report_error
-    ex.validation_uri + (params[:report] ? ","+ex.report_uri : "")
+    ex.validate(OpenTox::SubTask.create(task,10,80))
+    #raise ex.validation_error if ex.validation_error
+    ex.report(OpenTox::SubTask.create(task,80,99)) unless params[:report]=="false"
+    #raise ex.report_error if ex.report_error
+    if ex.report_uri
+      ex.report_uri
+    else
+      ex.validation_uri
+    end
   end
+  return_task(task)
 end