Make the new reST tests clearer in intent.

713b5dcf · Tres Seaver · b55c9294 · 713b5dcf · 713b5dcf
Commit 713b5dcf authored Jul 10, 2006 by Tres Seaver
Showing with 28 additions and 8 deletions

lib/python/Products/ZReST/tests/test_ZReST.py lib/python/Products/ZReST/tests/test_ZReST.py +14 -4

lib/python/reStructuredText/tests/testReST.py lib/python/reStructuredText/tests/testReST.py +14 -4

No files found.
--- a/lib/python/Products/ZReST/tests/test_ZReST.py
+++ b/lib/python/Products/ZReST/tests/test_ZReST.py
@@ -64,22 +64,32 @@ class TestZReST(unittest.TestCase):
        self.assertEqual('<html' in html, True)
        self.assertEqual('<body>' in html, True)
-    def testFileInclusion(self):
+    def test_include_directive_raises(self):
        resty = self._makeOne()
        resty.source = 'hello world\n .. include:: /etc/passwd'
        self.assertRaises(NotImplementedError, resty.render)
+    def test_raw_directive_disabled(self):
-    def testRawPassthrough(self):
+        EXPECTED = '<h1>HELLO WORLD</h1>'
        resty = self._makeOne()
-        resty.source = '.. raw:: html\n  <h1>HELLO WORLD</h1>'
+        resty.source = '.. raw:: html\n\n  %s\n' % EXPECTED
-        result = resty.render() # should not fail
+        result = resty.render() # don't raise, but don't work either
+        self.failIf(EXPECTED in result)
+        self.failUnless("&quot;raw&quot; directive disabled" in result)
+        from cgi import escape
+        self.failUnless(escape(EXPECTED) in result)
+    def test_raw_directive_file_directive_raises(self):
        resty = self._makeOne()
        resty.source = '.. raw:: html\n  :file: inclusion.txt'
        self.assertRaises(NotImplementedError, resty.render)
+    def test_raw_directive_url_directive_raises(self):
        resty = self._makeOne()
        resty.source = '.. raw:: html\n  :url: http://www.zope.org/'
        self.assertRaises(NotImplementedError, resty.render)

--- a/lib/python/reStructuredText/tests/testReST.py
+++ b/lib/python/reStructuredText/tests/testReST.py
@@ -82,19 +82,29 @@ text
        self.assertEquals(output, expected) 
-    def testFileInclusion(self):
+    def test_include_directive_raises(self):
        source = 'hello world\n .. include:: /etc/passwd'
        self.assertRaises(NotImplementedError, HTML, source)
+    def test_raw_directive_disabled(self):
-    def testRawPassthrough(self):
+        EXPECTED = '<h1>HELLO WORLD</h1>'
-        source = '.. raw:: html\n  <h1>HELLO WORLD</h1>'
+        source = '.. raw:: html\n\n  %s\n' % EXPECTED
-        result = HTML(source)       # don't raise
+        result = HTML(source)       # don't raise, but don't work either
+        self.failIf(EXPECTED in result)
+        self.failUnless("&quot;raw&quot; directive disabled" in result)
+        from cgi import escape
+        self.failUnless(escape(EXPECTED) in result)
+    def test_raw_directive_file_option_raises(self):
        source = '.. raw:: html\n  :file: inclusion.txt'
        self.assertRaises(NotImplementedError, HTML, source)
+    def test_raw_directive_url_option_raises(self):
        source = '.. raw:: html\n  :url: http://www.zope.org'
        self.assertRaises(NotImplementedError, HTML, source)