[Zope3-checkins] CVS: Zope3/lib/python/Zope/TAL/tests - test_files.py:1.8 test_sourcepos.py:1.5

Barry Warsaw barry@wooz.org
Fri, 20 Dec 2002 14:34:49 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/TAL/tests
In directory cvs.zope.org:/tmp/cvs-serv11652/lib/python/Zope/TAL/tests

Modified Files:
	test_files.py test_sourcepos.py 
Log Message:
test module cleanups:

- no docstrings in test methods (convert to comments)
- whitespace normalization
- other minor cleanups


=== Zope3/lib/python/Zope/TAL/tests/test_files.py 1.7 => 1.8 ===
--- Zope3/lib/python/Zope/TAL/tests/test_files.py:1.7	Tue Jul  2 14:27:45 2002
+++ Zope3/lib/python/Zope/TAL/tests/test_files.py	Fri Dec 20 14:34:48 2002
@@ -3,14 +3,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Tests that run driver.py over input files comparing to output files."""
 
@@ -30,9 +30,10 @@
         self.__dir = dir
         unittest.TestCase.__init__(self)
 
+    # For unittest.
     def shortDescription(self):
-        return os.path.join("...", "TAL", "tests", "input",
-                            os.path.basename(self.__file))
+        path = os.path.basename(self.__file)
+        return '%s (%s)' % (path, self.__class__)
 
     def runTest(self):
         basename = os.path.basename(self.__file)


=== Zope3/lib/python/Zope/TAL/tests/test_sourcepos.py 1.4 => 1.5 ===
--- Zope3/lib/python/Zope/TAL/tests/test_sourcepos.py:1.4	Wed Jun 12 10:45:00 2002
+++ Zope3/lib/python/Zope/TAL/tests/test_sourcepos.py	Fri Dec 20 14:34:48 2002
@@ -3,14 +3,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Tests for TALInterpreter."""
 
@@ -67,7 +67,7 @@
         return program, macros
 
     def testSourcePositions(self):
-        """Ensure source file and position are set correctly by TAL"""
+        # Ensure source file and position are set correctly by TAL
         macros = {}
         eng = DummyEngine(macros)
         page1_program, page1_macros = self.parse(eng, page1, 'page1')
@@ -90,6 +90,7 @@
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(Tests))
     return suite
+
 
 if __name__ == "__main__":
     unittest.main()