[Checkins] SVN: zope.structuredtext/trunk/src/zope/structuredtext/tests.py Modernize a bit.
Tres Seaver
tseaver at palladion.com
Fri Apr 30 18:10:20 EDT 2010
Log message for revision 111786:
Modernize a bit.
Changed:
U zope.structuredtext/trunk/src/zope/structuredtext/tests.py
-=-
Modified: zope.structuredtext/trunk/src/zope/structuredtext/tests.py
===================================================================
--- zope.structuredtext/trunk/src/zope/structuredtext/tests.py 2010-04-30 22:10:19 UTC (rev 111785)
+++ zope.structuredtext/trunk/src/zope/structuredtext/tests.py 2010-04-30 22:10:19 UTC (rev 111786)
@@ -10,26 +10,24 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
-"""
-$Id$
-"""
+import unittest
-import sys
import os
-import unittest
-import StringIO
-from zope.structuredtext import stng
-from zope.structuredtext.document import Document, DocumentWithImages
-from zope.structuredtext.html import HTML, HTMLWithImages
+here = os.path.dirname(__file__)
+regressions = os.path.join(here, 'regressions')
-package_dir = os.path.dirname(stng.__file__)
-regressions = os.path.join(package_dir, 'regressions')
+files = ['index.stx',
+ 'Acquisition.stx',
+ 'ExtensionClass.stx',
+ 'MultiMapping.stx',
+ 'examples.stx',
+ 'Links.stx',
+ 'examples1.stx',
+ 'table.stx',
+ 'InnerLinks.stx',
+ ]
-files = ['index.stx','Acquisition.stx','ExtensionClass.stx',
- 'MultiMapping.stx','examples.stx','Links.stx','examples1.stx',
- 'table.stx','InnerLinks.stx']
-
def readFile(dirname,fname):
myfile = open(os.path.join(dirname, fname), "r")
lines = myfile.readlines()
@@ -41,6 +39,8 @@
def testDocumentClass(self):
# testing Document
# *cough* *cough* this can't be enough...
+ from zope.structuredtext import stng
+ from zope.structuredtext.document import Document
for f in files:
doc = Document()
raw_text = readFile(regressions, f)
@@ -49,6 +49,9 @@
def testRegressionsTests(self):
# HTML regression test
+ from zope.structuredtext import stng
+ from zope.structuredtext.document import Document
+ from zope.structuredtext.html import HTML
for f in files:
raw_text = readFile(regressions, f)
doc = stng.structurize(raw_text)
@@ -63,6 +66,9 @@
class BasicTests(unittest.TestCase):
def _test(self, stxtxt, expected):
+ from zope.structuredtext import stng
+ from zope.structuredtext.document import DocumentWithImages
+ from zope.structuredtext.html import HTMLWithImages
doc = stng.structurize(stxtxt)
doc = DocumentWithImages()(doc)
output = HTMLWithImages()(doc, level=1)
@@ -257,7 +263,7 @@
def testHeader1(self):
self._test("Title\n\n following paragraph", ("<h1>Title</h1>\n<p> following paragraph</p>"))
- def testHeader1(self):
+ def testHeader1_again(self):
self._test("""Title
first paragraph
@@ -281,9 +287,3 @@
suite.addTest(unittest.makeSuite(StngTests))
suite.addTest(unittest.makeSuite(BasicTests))
return suite
-
-def main():
- unittest.TextTestRunner().run(test_suite())
-
-if __name__ == '__main__':
- main()
More information about the checkins
mailing list