diff options
Diffstat (limited to 'src/zope/pagetemplate/tests/util.py')
| -rw-r--r-- | src/zope/pagetemplate/tests/util.py | 71 |
1 files changed, 23 insertions, 48 deletions
diff --git a/src/zope/pagetemplate/tests/util.py b/src/zope/pagetemplate/tests/util.py index 8dda99b..5ef2ad3 100644 --- a/src/zope/pagetemplate/tests/util.py +++ b/src/zope/pagetemplate/tests/util.py @@ -17,71 +17,46 @@ from __future__ import print_function import os import re import sys - - -class Bruce(object): - __allow_access_to_unprotected_subobjects__=1 - def __str__(self): return 'bruce' - def __int__(self): return 42 - def __float__(self): return 42.0 - def keys(self): return ['bruce']*7 - def values(self): return [self]*7 - def items(self): return [('bruce',self)]*7 - def __len__(self): return 7 - def __getitem__(self,index): - if isinstance(index, int) and (index < 0 or index > 6): - raise IndexError(index) - return self - isDocTemp = 0 - def __getattr__(self,name): - if name.startswith('_'): - raise AttributeError(name) - return self - -bruce = Bruce() +import unittest +import zope.pagetemplate.tests class arg(object): __allow_access_to_unprotected_subobjects__ = 1 - def __init__(self,nn,aa): self.num, self.arg = nn, aa - def __str__(self): return str(self.arg) + + def __init__(self, nn, aa): + self.num, self.arg = nn, aa + + def __str__(self): + return str(self.arg) class argv(object): __allow_access_to_unprotected_subobjects__ = 1 - def __init__(self, argv=sys.argv[1:]): + def __init__(self, argv=None): args = self.args = [] + argv = argv if argv is not None else sys.argv[1:] for aa in argv: - args.append(arg(len(args)+1,aa)) - - def items(self): - return map(lambda a: ('spam%d' % a.num, a), self.args) - - def values(self): return self.args - - def getRoot(self): - return self + args.append(arg(len(args) + 1, aa)) context = property(lambda self: self) -def nicerange(lo, hi): - if hi <= lo+1: - return str(lo+1) - else: - return "%d,%d" % (lo+1, hi) +class _Test(unittest.TestCase): + + def runTest(self): # pragma: no cover 2.7 compatibility + return -def dump(tag, x, lo, hi): - for i in xrange(lo, hi): - print('%s %s' % (tag, x[i]), end=' ') +_assertEqual = _Test().assertEqual +del _Test def check_html(s1, s2): s1 = normalize_html(s1) s2 = normalize_html(s2) - assert s1==s2, (s1, s2, "HTML Output Changed") + _assertEqual(s1, s2, "HTML Output Changed") def check_xml(s1, s2): s1 = normalize_xml(s1) s2 = normalize_xml(s2) - assert s1==s2, ("XML Output Changed:\n%r\n\n%r" % (s1, s2)) + _assertEqual(s1, s2, 'XML Output Changed') def normalize_html(s): s = re.sub(r"[ \t]+", " ", s) @@ -95,11 +70,11 @@ def normalize_xml(s): return s -import zope.pagetemplate.tests -dir = os.path.dirname(zope.pagetemplate.tests.__file__) -input_dir = os.path.join(dir, 'input') -output_dir = os.path.join(dir, 'output') + +here = os.path.dirname(zope.pagetemplate.tests.__file__) +input_dir = os.path.join(here, 'input') +output_dir = os.path.join(here, 'output') def read_input(filename): filename = os.path.join(input_dir, filename) |