Initial port to python3

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

diff --git a/htsworkflow/util/test/test_alphanum.py b/htsworkflow/util/test/test_alphanum.py
index 3fd60250cbe392f9208c077076253fd6aed10f94..e6ad5bd644784f87520d2c2b0d061146cb1e08df 100644 (file)
--- a/htsworkflow/util/test/test_alphanum.py
+++ b/htsworkflow/util/test/test_alphanum.py
@@ -1,19 +1,19 @@
 import copy
 import os
-import unittest
+from unittest import TestCase
 
 from htsworkflow.util.alphanum import alphanum
 
-class testAlphanum(unittest.TestCase):
+class testAlphanum(TestCase):
     def test_string(self):
       unsorted = ['z5', 'b3', 'b10', 'a001', 'a2']
       sorted = [ 'a001', 'a2', 'b3', 'b10', 'z5']
       scratch = copy.copy(unsorted)
       scratch.sort(alphanum)
 
-      for i in xrange(len(scratch)):
+      for i in range(len(scratch)):
         self.failIfEqual(scratch[i], unsorted[i])
-      for i in xrange(len(scratch)):
+      for i in range(len(scratch)):
         self.failUnlessEqual(scratch[i], sorted[i])
 
     def test_numbers(self):
@@ -22,9 +22,9 @@ class testAlphanum(unittest.TestCase):
       scratch = copy.copy(unsorted)
       scratch.sort(alphanum)
 
-      for i in xrange(len(scratch)):
+      for i in range(len(scratch)):
         self.failIfEqual(scratch[i], unsorted[i])
-      for i in xrange(len(scratch)):
+      for i in range(len(scratch)):
         self.failUnlessEqual(scratch[i], sorted[i])
 
     def test_long_names(self):
@@ -42,7 +42,12 @@ class testAlphanum(unittest.TestCase):
 
 
 def suite():
-    return unittest.makeSuite(testAlphanum, 'test')
+    from unittest import TestSuite, defaultTestLoader
+    suite = TestSuite()
+    suite.addTests(defaultTestLoader.loadTestsFromTestCase(testAlphanum))
+    return suite
+
 
 if __name__ == "__main__":
-    unittest.main(defaultTest='suite')
+    from unittest import main
+    main(defaultTest="suite")