Change unittest2 back into unittest.

[htsworkflow.git] / htsworkflow / pipelines / test / test_samplekey.py

diff --git a/htsworkflow/pipelines/test/test_samplekey.py b/htsworkflow/pipelines/test/test_samplekey.py
index 703a03721cc43b84143147d9ae6b721b9423cea9..7861a58763f3d764df43bd3942496fcf218b2e7f 100644 (file)
--- a/htsworkflow/pipelines/test/test_samplekey.py
+++ b/htsworkflow/pipelines/test/test_samplekey.py
@@ -2,11 +2,11 @@
 """More direct synthetic test cases for the eland output file processing
 """
 from StringIO import StringIO
-import unittest
+from unittest import TestCase
 
 from htsworkflow.pipelines.samplekey import SampleKey
 
-class TestSampleKey(unittest.TestCase):
+class TestSampleKey(TestCase):
     def test_equality(self):
         k1 = SampleKey(lane=1, read='1', sample='12345')
         k2 = SampleKey(lane=1, read=1, sample='12345')
@@ -16,10 +16,10 @@ class TestSampleKey(unittest.TestCase):
         self.assertEqual(hash(k1), hash(k2))
         self.assertNotEqual(k1, k3)
 
-        self.assertLess(k1, k3)
-        self.assertLessEqual(k1, k2)
+        self.assertTrue(k1 < k3)
+        self.assertTrue(k1 <= k2)
 
-        self.assertGreater(k3, k1)
+        self.assertTrue(k3 > k1)
 
 
     def test_matching(self):
@@ -43,5 +43,13 @@ class TestSampleKey(unittest.TestCase):
         self.assertTrue(k2.matches(q3))
         self.assertTrue(k3.matches(q3))
 
+def suite():
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(TestSampleKey))
+    return suite
+
+
 if __name__ == "__main__":
-    unittest.main()
+    from unittest import main
+    main(defaultTest="suite")