[Python-checkins] r54698 - python/trunk/Lib/test/test_normalization.py (original) (raw)
collin.winter python-checkins at python.org
Thu Apr 5 22:09:02 CEST 2007
- Previous message: [Python-checkins] r54697 - python/trunk/Lib/test/test_long_future.py
- Next message: [Python-checkins] Python Regression Test Failures opt (1)
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: collin.winter Date: Thu Apr 5 22:08:56 2007 New Revision: 54698
Modified: python/trunk/Lib/test/test_normalization.py Log: Convert test_normalization to use unittest.
Modified: python/trunk/Lib/test/test_normalization.py
--- python/trunk/Lib/test/test_normalization.py (original)
+++ python/trunk/Lib/test/test_normalization.py Thu Apr 5 22:08:56 2007
@@ -1,5 +1,6 @@
-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
@@ -28,61 +29,66 @@
if x > sys.maxunicode:
raise RangeError
return u"".join([unichr(x) for x in data])
+
+class NormalizationTest(unittest.TestCase):
+ def test_main(self):
+ part1_data = {}
+ for line in open_urlresource(TESTDATAURL):
+ if '#' in line:
+ line = line.split('#')[0]
+ line = line.strip()
+ if not line:
+ continue
+ if line.startswith("@Part"):
+ part = line.split()[0]
+ continue
+ if part == "@Part3":
+ # XXX we don't support PRI #29 yet, so skip these tests for now
+ continue
+ try:
+ c1,c2,c3,c4,c5 = [unistr(x) for x in line.split(';')[:-1]]
+ except RangeError:
+ # Skip unsupported characters;
+ # try atleast adding c1 if we are in part1
+ if part == "@Part1":
+ try:
+ c1 = unistr(line.split(';')[0])
+ except RangeError:
+ pass
+ else:
+ part1_data[c1] = 1
+ continue
+
+ # Perform tests
+ 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)
+ self.failUnless(c5 == NFKD(c1) == NFKD(c2) ==
+ NFKD(c3) == NFKD(c4) == NFKD(c5),
+ line)
-def test_main():
- part1_data = {}
- for line in open_urlresource(TESTDATAURL):
- if '#' in line:
- line = line.split('#')[0]
- line = line.strip()
- if not line:
- continue
- if line.startswith("@Part"):
- part = line.split()[0]
- continue
- if part == "@Part3":
- # XXX we don't support PRI #29 yet, so skip these tests for now
- continue
- try:
- c1,c2,c3,c4,c5 = [unistr(x) for x in line.split(';')[:-1]]
- except RangeError:
- # Skip unsupported characters;
- # try atleast adding c1 if we are in part1
+ # Record part 1 data
if part == "@Part1":
- try:
- c1=unistr(line.split(';')[0])
- except RangeError:
- pass
- else:
- part1_data[c1] = 1
- continue
if verbose:print line# Perform testsverify(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),line)verify(c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5),line)# Record part 1 dataif part == "@Part1":part1_data[c1] = 1Perform tests for all other data
- for c in range(sys.maxunicode+1):
X = unichr(c)if X in part1_data:continueassert X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X), c
part1_data[c1] = 1# Perform tests for all other datafor c in range(sys.maxunicode+1):X = unichr(c)if X in part1_data:continueself.failUnless(X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X), c)- def test_bug_834676(self):
# Check for bug 834676normalize('NFC', u'\ud55c\uae00')
Check for bug 834676
- normalize('NFC',u'\ud55c\uae00')
- +def test_main():
- run_unittest(NormalizationTest)
if name == "main": test_main()
- Previous message: [Python-checkins] r54697 - python/trunk/Lib/test/test_long_future.py
- Next message: [Python-checkins] Python Regression Test Failures opt (1)
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]