From 354aaa649e9eeed5d81793e09d9714b45063c147 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Wed, 8 Feb 2012 13:14:11 +0100
Subject: toxbank-investigation compatible version

---
 test/rest.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'test/rest.rb')

diff --git a/test/rest.rb b/test/rest.rb
index 1000b4e..bb91b68 100644
--- a/test/rest.rb
+++ b/test/rest.rb
@@ -1,19 +1,15 @@
-$LOAD_PATH << File.expand_path( File.dirname(__FILE__) + '/../lib' )
-require 'rubygems'
-require 'opentox-ruby-minimal.rb'
 require 'test/unit'
+$LOAD_PATH << File.join(File.dirname(__FILE__),'..','lib')
+require File.join File.dirname(__FILE__),'..','lib','opentox-client.rb'
 
 class RestTest < Test::Unit::TestCase
 
   def test_post_get_delete
-    uristring = "http://ot-dev.in-silico.ch/dataset" 
-    uri = uristring
+    uri = "http://ot-dev.in-silico.ch/dataset" 
     dataset_service = OpenTox::Dataset.new uri
-    assert_match /#{uristring}/, dataset_service.get
-    dataset_uri = dataset_service.post 
-    assert_match /#{uristring}/, dataset_uri.to_s
-    dataset = OpenTox::Dataset.new dataset_uri
-    assert_equal dataset_uri, dataset.uri
+    assert_match /#{uri}/, dataset_service.get
+    dataset = dataset_service.post 
+    assert_match /#{uri}/, dataset.uri.to_s
     metadata =  dataset.metadata
     assert_equal RDF::OT.Dataset, metadata[RDF.type]
     assert_equal dataset.uri, metadata[RDF::XSD.anyURI]
-- 
cgit v1.2.3