summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2012-03-08 15:23:43 +0000
committerChristoph Helma <helma@in-silico.ch>2012-03-08 15:23:43 +0000
commit63fcd8f8feed58af4b1e1ff0e5fdaa09791c9596 (patch)
tree97103c785013abd8fe2b3798f73ebec4bcb9e885 /test
parent2f6d5c75fc1fece5fc10cc7c45ad59cf6b820d64 (diff)
improved integration of error reports, call stack added as errorDetails
Diffstat (limited to 'test')
-rw-r--r--test/dataset.rb44
-rw-r--r--test/error.rb2
-rw-r--r--test/feature.rb4
-rw-r--r--test/task.rb6
4 files changed, 29 insertions, 27 deletions
diff --git a/test/dataset.rb b/test/dataset.rb
index 13012bd..d2c8d57 100644
--- a/test/dataset.rb
+++ b/test/dataset.rb
@@ -4,43 +4,39 @@ require File.join File.dirname(__FILE__),'..','lib','opentox-client.rb'
class DatasetTest < Test::Unit::TestCase
-=begin
- def test_post_get_delete
- service_uri = "http://ot-dev.in-silico.ch/dataset"
- dataset = OpenTox::Dataset.create service_uri
- assert_match /#{service_uri}/, dataset.uri.to_s
- puts dataset.uri
- puts dataset.class
- puts dataset.to_yaml
- metadata = dataset.metadata
- puts dataset.class
- assert_equal RDF::OT.Dataset, metadata[RDF.type]
- assert_equal dataset.uri, metadata[RDF::XSD.anyURI]
- dataset.delete
- end
def test_all
datasets = OpenTox::Dataset.all "http://ot-dev.in-silico.ch/dataset"
assert_equal OpenTox::Dataset, datasets.first.class
end
- def test_create
- d = OpenTox::Dataset.create "http://ot-dev.in-silico.ch/dataset"
+ def test_create_empty
+ service_uri = "http://ot-dev.in-silico.ch/dataset"
+ d = OpenTox::Dataset.create service_uri
assert_equal OpenTox::Dataset, d.class
- puts d.delete
- assert_raise OpenTox::NotFoundError do
- puts d.get(:accept => 'application/x-yaml')
- end
+ assert_match /#{service_uri}/, d.uri.to_s
+ d.delete
end
-=end
def test_create_from_file
- d = OpenTox::Dataset.from_file "http://ot-dev.in-silico.ch/dataset", "data/EPAFHM.mini.csv"
+ d = OpenTox::Dataset.from_file "http://ot-dev.in-silico.ch/dataset", File.join(File.dirname(__FILE__),"data","EPAFHM.mini.csv")
assert_equal OpenTox::Dataset, d.class
- puts d.inspect
-
+ d.delete
+ assert_raise OpenTox::NotFoundError do
+ d.get
+ end
end
+
=begin
+ def test_metadata
+ d = OpenTox::Dataset.from_file "http://ot-dev.in-silico.ch/dataset", "data/EPAFHM.mini.csv"
+ assert_equal OpenTox::Dataset, d.class
+ # TODO fix metadata retrieval
+ metadata = d.metadata
+ assert_equal RDF::OT.Dataset, metadata[RDF.type]
+ assert_equal dataset.uri, metadata[RDF::XSD.anyURI]
+ d.delete
+ end
def test_save
d = OpenTox::Dataset.create "http://ot-dev.in-silico.ch/dataset"
d.metadata
diff --git a/test/error.rb b/test/error.rb
index af5db52..d736620 100644
--- a/test/error.rb
+++ b/test/error.rb
@@ -6,7 +6,7 @@ class ErrorTest < Test::Unit::TestCase
def test_bad_request
object = OpenTox::Feature.new "http://this-is-a/fantasy/url"
- assert_raise OpenTox::BadRequestError do
+ assert_raise OpenTox::NotFoundError do
response = object.get
end
end
diff --git a/test/feature.rb b/test/feature.rb
index 1308e77..01c2206 100644
--- a/test/feature.rb
+++ b/test/feature.rb
@@ -16,7 +16,9 @@ class FeatureTest < Test::Unit::TestCase
def test_feature
@features.each do |uri|
f = OpenTox::Feature.new(uri)
- assert_equal RDF::OT1.Feature, f.metadata[RDF.type]
+ assert_equal [RDF::OT1.TUM_CDK_nAtom], f[RDF::OWL.sameAs]
+ assert_equal RDF::OT1.TUM_CDK_nAtom, f.metadata[RDF::OWL.sameAs].first
+ assert_equal [RDF::OT1.Feature,RDF::OT1.NumericFeature].sort, f[RDF.type].sort
end
end
diff --git a/test/task.rb b/test/task.rb
index 932d5c9..adbba12 100644
--- a/test/task.rb
+++ b/test/task.rb
@@ -10,12 +10,14 @@ TASK_SERVICE_URI = "http://ot-dev.in-silico.ch/task"
class TaskTest < Test::Unit::TestCase
+=begin
+=end
def test_all
all = OpenTox::Task.all(TASK_SERVICE_URI)
assert_equal Array, all.class
t = all.last
assert_equal OpenTox::Task, t.class
- assert_equal RDF::OT1.Task, t.metadata[RDF.type]
+ assert_equal RDF::OT1.Task, t[RDF.type].first
end
def test_create_and_complete
@@ -77,5 +79,7 @@ class TaskTest < Test::Unit::TestCase
assert task.error?
assert_equal "Error", task.hasStatus
end
+=begin
+=end
end