From 9f20a5f96622bc90c406c65e1d600ad6374a699d Mon Sep 17 00:00:00 2001
From: ch <ch@ch.in-silico.ch>
Date: Sun, 12 Jul 2015 12:11:21 +0200
Subject: initial dataset tests

---
 test/dataset.rb | 8 ++++----
 test/feature.rb | 2 +-
 test/task.rb    | 6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/dataset.rb b/test/dataset.rb
index ffde32e..9a6996f 100644
--- a/test/dataset.rb
+++ b/test/dataset.rb
@@ -38,7 +38,7 @@ class DatasetTest < MiniTest::Test
   end
 
   def test_create_empty
-    d = OpenTox::Dataset.new File.join($dataset[:uri],SecureRandom.uuid)
+    d = OpenTox::Dataset.new #File.join($dataset[:uri],SecureRandom.uuid)
     assert_equal OpenTox::Dataset, d.class
     assert_match /#{$dataset[:uri]}/, d.uri.to_s
   end
@@ -56,7 +56,7 @@ class DatasetTest < MiniTest::Test
     d = OpenTox::Dataset.new nil
     assert_equal OpenTox::Dataset, d.class
     assert_match /#{$dataset[:uri]}/, d.uri.to_s
-    d.title = "Create dataset test"
+    d[:title] = "Create dataset test"
 
     # features not set
     assert_raises OpenTox::BadRequestError do
@@ -66,8 +66,8 @@ class DatasetTest < MiniTest::Test
     # add data entries
     d.features = ["test1", "test2"].collect do |title|
       f = OpenTox::Feature.new nil
-      f.title = title
-      f[RDF.type] = [RDF::OT.NumericFeature, RDF::OT.Feature]
+      f[:title] = title
+      f[:type] = ["NumericFeature", "Feature"]
       f.put
       f
     end
diff --git a/test/feature.rb b/test/feature.rb
index 54a68f2..5968602 100644
--- a/test/feature.rb
+++ b/test/feature.rb
@@ -88,7 +88,7 @@ class FeatureRestTest < MiniTest::Test
 
     list = OpenTox::Feature.all 
     listsize1 = list.length
-    assert_equal true, list.collect{|f| f.uri}.include?(@feature.uri)
+    assert_equal true, list.collect{|f| f["uri"]}.include?(@feature.uri)
 
     # modify feature
     @feature2 = OpenTox::Feature.new @feature.uri
diff --git a/test/task.rb b/test/task.rb
index dd0e7d4..fa81650 100644
--- a/test/task.rb
+++ b/test/task.rb
@@ -25,7 +25,6 @@ class TaskTest < MiniTest::Test
       sleep 5
       $task[:uri]
     end
-      p $task[:uri]
     assert_equal true,  task.running?
     assert_equal "Running", task.hasStatus
     assert_equal 202, task.code
@@ -203,7 +202,7 @@ class TaskTest < MiniTest::Test
     # TODO: remove test uris from services, e.g. dynamically instantiate Sinatra routes instead
     
     def check_msg(msg,complete)
-      assert msg=~/bad_request_error_in_task/,"orignial task error message ('bad_request_error_in_task') is lost: #{msg}"
+      assert msg=~/bad_request_error_in_task/,"original task error message ('bad_request_error_in_task') is lost: #{msg}"
       assert((msg=~/\\/)==nil,"no backslashes please!")
       assert complete=~/test.rb:9/,"code line number test.rb:9 is lost"
     end
@@ -222,6 +221,9 @@ class TaskTest < MiniTest::Test
         assert false,"should have thrown an error because there was an error in the task we have waited for"
       rescue => ex
         assert ex.is_a?(OpenTox::BadRequestError),"not a bad request error, instead: #{ex.class}"
+        p ex
+        p ex.message
+        p ex.error_cause
         check_msg(ex.message,ex.error_cause)
       end
 
-- 
cgit v1.2.3