[Zope-Checkins] CVS: Zope/lib/python/StructuredText/tests - framework.py:1.1 testStructuredText.py:1.2

Andreas Jung andreas@zope.com
Mon, 8 Oct 2001 09:24:46 -0400


Update of /cvs-repository/Zope/lib/python/StructuredText/tests
In directory cvs.zope.org:/tmp/cvs-serv25587

Modified Files:
	testStructuredText.py 
Added Files:
	framework.py 
Log Message:
Major rework and removal of redundant code.
Warning: this test is incomplete like the former
version because the real regression tests are not working
because the reference HTML files were generated
for the old ST - and not STXNG.



=== Added File Zope/lib/python/StructuredText/tests/framework.py ===
##############################################################################
# 
# Zope Public License (ZPL) Version 1.0
# -------------------------------------
# 
# Copyright (c) Digital Creations.  All rights reserved.
# 
# This license has been certified as Open Source(tm).
# 
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
# 
# 1. Redistributions in source code must retain the above copyright
#    notice, this list of conditions, and the following disclaimer.
# 
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions, and the following disclaimer in
#    the documentation and/or other materials provided with the
#    distribution.
# 
# 3. Digital Creations requests that attribution be given to Zope
#    in any manner possible. Zope includes a "Powered by Zope"
#    button that is installed by default. While it is not a license
#    violation to remove this button, it is requested that the
#    attribution remain. A significant investment has been put
#    into Zope, and this effort will continue if the Zope community
#    continues to grow. This is one way to assure that growth.
# 
# 4. All advertising materials and documentation mentioning
#    features derived from or use of this software must display
#    the following acknowledgement:
# 
#      "This product includes software developed by Digital Creations
#      for use in the Z Object Publishing Environment
#      (http://www.zope.org/)."
# 
#    In the event that the product being advertised includes an
#    intact Zope distribution (with copyright and license included)
#    then this clause is waived.
# 
# 5. Names associated with Zope or Digital Creations must not be used to
#    endorse or promote products derived from this software without
#    prior written permission from Digital Creations.
# 
# 6. Modified redistributions of any form whatsoever must retain
#    the following acknowledgment:
# 
#      "This product includes software developed by Digital Creations
#      for use in the Z Object Publishing Environment
#      (http://www.zope.org/)."
# 
#    Intact (re-)distributions of any official Zope release do not
#    require an external acknowledgement.
# 
# 7. Modifications are encouraged but must be packaged separately as
#    patches to official Zope releases.  Distributions that do not
#    clearly separate the patches from the original work must be clearly
#    labeled as unofficial distributions.  Modifications which do not
#    carry the name Zope may be packaged in any form, as long as they
#    conform to all of the clauses above.
# 
# 
# Disclaimer
# 
#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
#   SUCH DAMAGE.
# 
# 
# This software consists of contributions made by Digital Creations and
# many individuals on behalf of Digital Creations.  Specific
# attributions are listed in the accompanying credits file.
# 
##############################################################################

######################################################################
# Set up unit testing framework
#
# The following code should be at the top of every test module:
#
# import os, sys
# execfile(os.path.join(sys.path[0], 'framework.py'))
#
# ...and the following at the bottom:
#
# framework()


# Find the Testing package
if not sys.modules.has_key('Testing'):
    p0 = sys.path[0]
    if p0 and __name__ == '__main__':
        os.chdir(p0)
        p0 = ''
    p = d = os.path.abspath(os.curdir)
    while d:
        if os.path.isdir(os.path.join(p, 'Testing')):
            sys.path[:1] = [p0, os.pardir, p]
            break
        p, d = os.path.split(p)
    else:
        print 'Unable to locate Testing package.'
        sys.exit(1)

import Testing, unittest
execfile(os.path.join(os.path.split(Testing.__file__)[0], 'common.py'))




=== Zope/lib/python/StructuredText/tests/testStructuredText.py 1.1 => 1.2 === (500/600 lines abridged)
 from StructuredText import StructuredText
 from StructuredText import HTMLClass
-from string import join
 import sys, os, unittest
+execfile(os.path.join(sys.path[0],'framework.py'))
 
 """
 This tester first ensures that all regression files
@@ -14,519 +14,78 @@
 to help ensure backwards compatability.
 """
 
-package_dir=os.path.split(ST.__file__)[0]
+package_dir = os.path.split(ST.__file__)[0]
 regressions=os.path.join(package_dir, 'regressions')
 
+files = ['index.stx','Acquisition.stx','ExtensionClass.stx',
+        'MultiMapping.stx','examples.stx']
 
-class StructuredTextIndexTestCase(unittest.TestCase):
-    def setUp(self):
-        myfile  = open(os.path.join(regressions, 'index.stx'),"r")
-        lines   = myfile.readlines()
-        myfile.close()
-        lines = join(lines)
-        self.raw_text = lines
-    def runTest(self):
-        assert StructuredText.StructuredText(self.raw_text), \
-            'StructuredText failed on index'
-
-class StructuredTextAcquisitionTestCase(unittest.TestCase):
-    def setUp(self):
-        myfile  = open(os.path.join(regressions, 'Acquisition.stx'),"r")
-        lines   = myfile.readlines()
-        myfile.close()
-        lines = join(lines)
-        self.raw_text = lines
-    def runTest(self):
-        assert StructuredText.StructuredText(self.raw_text), \
-            'StructuredText failed on Acquisition'
-
-class StructuredTextExtensionClassTestCase(unittest.TestCase):
-    def setUp(self):
-        myfile  = open(os.path.join(regressions, 'index.stx'),"r")
-        lines   = myfile.readlines()
-        myfile.close()
-        lines = join(lines)
-        self.raw_text = lines
-    def runTest(self):
-        assert StructuredText.StructuredText(self.raw_text), \

[-=- -=- -=- 500 lines omitted -=- -=- -=-]

+    def testStructuredTextNG(self):
+        """ testing StructuredTextNG """
+
+        for f in files:
+            raw_text = readFile(regressions,f)
+            assert ST.StructuredText(raw_text),\
+                'StructuredText failed on %s' % f
+
+
+    def testDocumentClass(self):
+        """ testing DocumentClass"""
+
+        for f in files:
+            Doc = DocumentClass.DocumentClass()
+            raw_text = readFile(regressions,f)
+            text = ST.StructuredText(raw_text)
+            assert Doc(text),\
+                'DocumentClass failed on %s' % f
+
+    def testClassicDocumentClass(self):
+        """ testing ClassicDocumentClass"""
+
+        for f in files:
+            Doc = ClassicDocumentClass.DocumentClass()
+            raw_text = readFile(regressions,f)
+            text = ST.StructuredText(raw_text)
+            assert Doc(text),\
+                'ClassicDocumentClass failed on %s' % f
+
+    def testClassicHTMLDocumentClass(self):
+        """ testing HTML ClassicDocumentClass"""
+
+        for f in files:
+            Doc = ClassicDocumentClass.DocumentClass()
+            HTML = HTMLClass.HTMLClass()
+            raw_text = readFile(regressions,f)
+            text = Doc(ST.StructuredText(raw_text))
+            assert HTML(text),\
+                'HTML ClassicDocumentClass failed on %s' % f
+
+
+#    def testRegressionsTests(self)
+#        """ there should be a regression tests that compares 
+#             generated HTML against the reference HTML files.
+#             This test is commented in the 2.4 branch because
+#             of the change from ST to STXNG and the changed 
+#             HTML generation (HTML references files are no longer
+#             valid for STXNG)
+
+framework()