remove some test code debugging print statements

[htsworkflow.git] / htsworkflow / util / test / test_rdfinfer.py

diff --git a/htsworkflow/util/test/test_rdfinfer.py b/htsworkflow/util/test/test_rdfinfer.py
index 380c1e640bd8133aadf5ff8ce7325026a1981814..c6164fa6ec81334dbf91a6486edf9d81a0ef5e29 100644 (file)
--- a/htsworkflow/util/test/test_rdfinfer.py
+++ b/htsworkflow/util/test/test_rdfinfer.py
@@ -1,4 +1,4 @@
-import unittest
+from unittest2 import TestCase
 
 import RDF
 
@@ -88,7 +88,7 @@ _:me
      foaf:depicts _:me .
 """
 
-class TestInfer(unittest.TestCase):
+class TestInfer(TestCase):
     def setUp(self):
         self.model = get_model()
         add_default_schemas(self.model)
@@ -172,8 +172,9 @@ class TestInfer(unittest.TestCase):
         self.model.append(s)
         errors = list(inference._validate_property_types())
         self.assertEqual(len(errors), 1)
-        startswith = 'Domain of <http://example.org/me.jpg>'
+        startswith = 'Domain of '
         self.assertEqual(errors[0][:len(startswith)], startswith)
+        self.assertTrue('http://example.org/me.jpg' in errors[0])
         endswith = 'http://xmlns.com/foaf/0.1/Person'
         self.assertEqual(errors[0][-len(endswith):], endswith)
         del self.model[s]
@@ -189,8 +190,9 @@ class TestInfer(unittest.TestCase):
 
         errors = list(inference._validate_property_types())
         self.assertEqual(len(errors), 1)
-        startswith = 'Range of <http://example.org/me.jpg>'
+        startswith = 'Range of '
         self.assertEqual(errors[0][:len(startswith)], startswith)
+        self.assertTrue('http://example.org/me.jpg' in errors[0])
         endswith = 'http://www.w3.org/2002/07/owl#Thing'
         self.assertEqual(errors[0][-len(endswith):], endswith)
         del self.model[s]
@@ -223,11 +225,16 @@ class TestInfer(unittest.TestCase):
         inference = Infer(self.model)
 
         errmsg = list(inference._validate_property_types())
-        print errmsg
         self.failUnlessEqual(len(errmsg), 0)
 
+
 def suite():
-    return unittest.makeSuite(TestInfer, 'test')
+    from unittest2 import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestInfer))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest='suite')
+    from unittest2 import main
+    main(defaultTest="suite")