diff options
author | mr <mr@mrautenberg.de> | 2011-01-13 11:56:56 +0100 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-01-13 11:56:56 +0100 |
commit | fdea4a4f126072c6dbd0fda54e1fa5cf114577b0 (patch) | |
tree | 2293044b3b8eefa86f9fc3e223fac9627a6f1dc7 | |
parent | 08fcc17d5fa809fb497031dad3578a924d16a496 (diff) |
A&A GET requests
-rw-r--r-- | dataset.rb | 30 | ||||
-rw-r--r-- | parser.rb | 4 |
2 files changed, 17 insertions, 17 deletions
@@ -29,7 +29,7 @@ class DatasetTest < Test::Unit::TestCase =begin def test_save_external - @dataset = OpenTox::Dataset.find "http://apps.ideaconsult.net:8080/ambit2/dataset/2698" + @dataset = OpenTox::Dataset.find "http://apps.ideaconsult.net:8080/ambit2/dataset/2698", @@subjectid #File.open("test.rdf","w+"){|f| f.puts @dataset.to_rdfxml} @dataset.uri = "http://apps.ideaconsult.net:8080/ambit2/dataset" uri = @dataset.save(@@subjectid) @@ -59,21 +59,21 @@ class DatasetTest < Test::Unit::TestCase end def test_from_yaml - @dataset = OpenTox::Dataset.new + @dataset = OpenTox::Dataset.new nil, @@subjectid @dataset.load_yaml(File.open("data/hamster_carcinogenicity.yaml").read) hamster_carc? end def test_rest_csv uri = OpenTox::RestClientWrapper.post(CONFIG[:services]["opentox-dataset"],{:accept => "text/uri-list"}, {:file => File.new("data/hamster_carcinogenicity.csv"), :subjectid => @@subjectid}).to_s.chomp - @dataset = OpenTox::Dataset.new uri + @dataset = OpenTox::Dataset.new uri, @@subjectid @dataset.load_all(@@subjectid) hamster_carc? end def test_multicolumn_csv uri = OpenTox::RestClientWrapper.post(CONFIG[:services]["opentox-dataset"],{:accept => "text/uri-list"}, {:file => File.new("data/multicolumn.csv"), :subjectid => @@subjectid}).to_s.chomp - @dataset = OpenTox::Dataset.new uri + @dataset = OpenTox::Dataset.new uri, @@subjectid @dataset.load_all(@@subjectid) assert_equal 5, @dataset.features.size assert_equal 4, @dataset.compounds.size @@ -81,14 +81,14 @@ class DatasetTest < Test::Unit::TestCase end def test_from_csv - @dataset = OpenTox::Dataset.new + @dataset = OpenTox::Dataset.new(nil, @@subjectid) @dataset.load_csv(File.open("data/hamster_carcinogenicity.csv").read, @@subjectid) hamster_carc? @dataset.delete(@@subjectid) end def test_from_excel - @dataset = OpenTox::Dataset.new + @dataset = OpenTox::Dataset.new(nil, @@subjectid) @dataset.load_spreadsheet(Excel.new("data/hamster_carcinogenicity.xls"), @@subjectid) hamster_carc? @dataset.delete(@@subjectid) @@ -103,7 +103,7 @@ class DatasetTest < Test::Unit::TestCase def test_load_compounds @datasets.each do |uri,data| - @dataset = OpenTox::Dataset.new(uri) + @dataset = OpenTox::Dataset.new(uri, @@subjectid) @dataset.load_compounds(@@subjectid) assert_equal @dataset.compounds.size,data[:nr_compounds] end @@ -111,15 +111,15 @@ class DatasetTest < Test::Unit::TestCase def test_load_features @datasets.each do |uri,data| - @dataset = OpenTox::Dataset.new(uri) - @dataset.load_features + @dataset = OpenTox::Dataset.new(uri, @@subjectid) + @dataset.load_features(@@subjectid) assert_equal @dataset.features.keys.size,data[:nr_dataset_features] end end def test_load_all @datasets.each do |uri,data| - @dataset = OpenTox::Dataset.new(uri) + @dataset = OpenTox::Dataset.new(uri, @@subjectid) @dataset.load_all(@@subjectid) validate data end @@ -127,7 +127,7 @@ class DatasetTest < Test::Unit::TestCase def test_yaml @datasets.each do |uri,data| - @dataset = OpenTox::Dataset.new(uri) + @dataset = OpenTox::Dataset.new(uri, @@subjectid) @dataset.load_all(@@subjectid) #@dataset = YAML.load @dataset.to_yaml validate data @@ -136,7 +136,7 @@ class DatasetTest < Test::Unit::TestCase def test_csv @datasets.each do |uri,data| - @dataset = OpenTox::Dataset.new(uri) + @dataset = OpenTox::Dataset.new(uri, @@subjectid) @dataset.load_all(@@subjectid) csv = @dataset.to_csv.split("\n") assert_equal csv.size, data[:nr_compounds]+1 @@ -146,7 +146,7 @@ class DatasetTest < Test::Unit::TestCase def test_excel @datasets.each do |uri,data| - @dataset = OpenTox::Dataset.new(uri) + @dataset = OpenTox::Dataset.new(uri, @@subjectid) @dataset.load_all(@@subjectid) book = @dataset.to_spreadsheet assert_kind_of Spreadsheet::Workbook, book @@ -156,7 +156,7 @@ class DatasetTest < Test::Unit::TestCase def test_ntriples @datasets.each do |uri,data| - @dataset = OpenTox::Dataset.new(uri) + @dataset = OpenTox::Dataset.new(uri, @@subjectid) @dataset.load_all(@@subjectid) assert_kind_of String, @dataset.to_ntriples end @@ -164,7 +164,7 @@ class DatasetTest < Test::Unit::TestCase def test_owl @datasets.each do |uri,data| - @dataset = OpenTox::Dataset.new(uri) + @dataset = OpenTox::Dataset.new(uri, @@subjectid) @dataset.load_all(@@subjectid) assert_kind_of String, @dataset.to_rdfxml end @@ -32,8 +32,8 @@ class ParserTest < Test::Unit::TestCase def test_dataset @datasets.each do |uri,properties| - parser = OpenTox::Parser::Owl::Dataset.new uri - @dataset = parser.load_uri + parser = OpenTox::Parser::Owl::Dataset.new uri, @@subjectid + @dataset = parser.load_uri(@@subjectid) validate properties end end |