Convert test_normalization to use unittest.

Lib/test/test_normalization.py

-from test.test_support import (verbose, TestFailed, TestSkipped, verify,
-                               open_urlresource)
+from test.test_support import run_unittest, open_urlresource
+import unittest
+
 import sys
 import os
 from unicodedata import normalize
@@ -29,7 +30,8 @@ def unistr(data):
             raise RangeError
     return u"".join([unichr(x) for x in data])
     
-def test_main():
+class NormalizationTest(unittest.TestCase):
+    def test_main(self):
         part1_data = {}
         for line in open_urlresource(TESTDATAURL):
             if '#' in line:
@@ -50,24 +52,23 @@ def test_main():
                 # try atleast adding c1 if we are in part1
                 if part == "@Part1":
                     try:
-                    c1=unistr(line.split(';')[0])
+                        c1 = unistr(line.split(';')[0])
                     except RangeError:
                         pass
                     else:
                         part1_data[c1] = 1
                 continue
 
-        if verbose:
-            print line
-
             # Perform tests
-        verify(c2 ==  NFC(c1) ==  NFC(c2) ==  NFC(c3), line)
-        verify(c4 ==  NFC(c4) ==  NFC(c5), line)
-        verify(c3 ==  NFD(c1) ==  NFD(c2) ==  NFD(c3), line)
-        verify(c5 ==  NFD(c4) ==  NFD(c5), line)
-        verify(c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5),
+            self.failUnless(c2 ==  NFC(c1) ==  NFC(c2) ==  NFC(c3), line)
+            self.failUnless(c4 ==  NFC(c4) ==  NFC(c5), line)
+            self.failUnless(c3 ==  NFD(c1) ==  NFD(c2) ==  NFD(c3), line)
+            self.failUnless(c5 ==  NFD(c4) ==  NFD(c5), line)
+            self.failUnless(c4 == NFKC(c1) == NFKC(c2) == \
+                            NFKC(c3) == NFKC(c4) == NFKC(c5),
                             line)
-        verify(c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5),
+            self.failUnless(c5 == NFKD(c1) == NFKD(c2) == \
+                            NFKD(c3) == NFKD(c4) == NFKD(c5),
                             line)
 
             # Record part 1 data
@@ -79,10 +80,15 @@ def test_main():
             X = unichr(c)
             if X in part1_data:
                 continue
-        assert X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X), c
+            self.failUnless(X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X), c)
 
+    def test_bug_834676(self):
         # Check for bug 834676
-    normalize('NFC',u'\ud55c\uae00')
+        normalize('NFC', u'\ud55c\uae00')
+
+
+def test_main():
+    run_unittest(NormalizationTest)
 
 if __name__ == "__main__":
     test_main()