[Python-checkins] r62486 - in python/trunk/Lib/test: test_pydoc.py test_sundry.py

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Thu Apr 24 22:22:26 2008
New Revision: 62486

Log:
Add a few tests for pydoc.

This is a modified version of a patch proposed by Guilherme Polo
in the discussion of issue1883.

I will merge manually this change into the py3k branch: the tests must be adapted.


Added:
   python/trunk/Lib/test/test_pydoc.py
Modified:
   python/trunk/Lib/test/test_sundry.py

Added: python/trunk/Lib/test/test_pydoc.py
==============================================================================
--- (empty file)
+++ python/trunk/Lib/test/test_pydoc.py	Thu Apr 24 22:22:26 2008
@@ -0,0 +1,33 @@
+from test import test_support
+import unittest
+import pydoc
+
+class TestDescriptions(unittest.TestCase):
+    def test_module(self):
+        # Check that pydocfodder module can be described
+        import pydocfodder
+        doc = pydoc.render_doc(pydocfodder)
+        assert "pydocfodder" in doc
+
+    def test_classic_class(self):
+        class C: "Classic class"
+        c = C()
+        self.failUnlessEqual(pydoc.describe(C), 'class C')
+        self.failUnlessEqual(pydoc.describe(c), 'instance of C')
+        self.failUnless('instance of C in module test.test_pydoc'
+                        in pydoc.render_doc(c))
+
+    def test_class(self):
+        class C(object): "New-style class"
+        c = C()
+
+        self.failUnlessEqual(pydoc.describe(C), 'class C')
+        self.failUnlessEqual(pydoc.describe(c), 'C')
+        self.failUnless('C in module test.test_pydoc object'
+                        in pydoc.render_doc(c))
+
+def test_main():
+    test_support.run_unittest(TestDescriptions)
+
+if __name__ == "__main__":
+    unittest.main()

Modified: python/trunk/Lib/test/test_sundry.py
==============================================================================
--- python/trunk/Lib/test/test_sundry.py	(original)
+++ python/trunk/Lib/test/test_sundry.py	Thu Apr 24 22:22:26 2008
@@ -90,7 +90,6 @@
             import posixfile
             import pstats
             import py_compile
-            import pydoc
             import rexec
             import rlcompleter
             import sched