Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

[htsworkflow.git] / htsworkflow / submission / test / test_daf.py

diff --git a/htsworkflow/submission/test/test_daf.py b/htsworkflow/submission/test/test_daf.py
index a7515b05374ac59a87cf6d845b2cfa073d26dc9d..5da4dc2faff3217fdf7386849add99c089ccc2d8 100644 (file)
--- a/htsworkflow/submission/test/test_daf.py
+++ b/htsworkflow/submission/test/test_daf.py
@@ -69,7 +69,8 @@ class TestDAF(unittest.TestCase):
 
         writer = get_serializer()
         turtle =  writer.serialize_model_to_string(model)
-        self.failUnless(str(signal_view_node) in turtle)
+
+        self.failUnless(str(signal_view_node.uri) in turtle)
 
         statements = list(model.find_statements(
             RDF.Statement(
@@ -170,10 +171,9 @@ class TestDAFMapper(unittest.TestCase):
         
         daf_mapper.construct_file_attributes('/tmp/analysis1', libNode, 'filename.bam')
         source = daf_mapper.model.get_source(rdfNS['type'], submissionOntology['submission'])
-        self.failUnlessEqual(str(source), "<http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/analysis1>")
+        self.failUnlessEqual(str(source.uri), "http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/analysis1")
         view = daf_mapper.model.get_target(source, submissionOntology['has_view'])
-        self.failUnlessEqual(str(view), "<http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/analysis1/Signal>")
-
+        self.failUnlessEqual(str(view.uri), "http://jumpgate.caltech.edu/wiki/SubmissionsLog/testfind/analysis1/Signal")
 
     def test_library_url(self):
         daf_mapper = load_daf_mapper('urltest')
@@ -183,7 +183,6 @@ class TestDAFMapper(unittest.TestCase):
         daf_mapper.library_url = 'http://google.com'
         self.failUnlessEqual(daf_mapper.library_url, 'http://google.com' )
         
-
 def suite():
     suite = unittest.makeSuite(TestDAF, 'test')
     suite.addTest(unittest.makeSuite(TestDAFMapper, 'test'))