[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_ - some test cleanup
Yvo Schubbe
y.2011 at wcm-solutions.de
Sat Jul 9 05:10:08 EDT 2011
Log message for revision 122138:
- some test cleanup
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Link.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_NewsItem.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py 2011-07-08 12:58:19 UTC (rev 122137)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py 2011-07-09 09:10:06 UTC (rev 122138)
@@ -46,14 +46,14 @@
from Products.CMFCore.tests.base.content import STX_NO_HEADERS_BUT_COLON
from Products.CMFCore.tests.base.content import STX_WITH_HTML
from Products.CMFCore.tests.base.dummy import DummySite
-from Products.CMFCore.tests.base.testcase import RequestTest
+from Products.CMFCore.tests.base.testcase import TransactionalTest
from Products.CMFCore.tests.base.tidata import FTIDATA_CMF
from Products.CMFCore.TypesTool import FactoryTypeInformation as FTI
from Products.CMFCore.TypesTool import TypesTool
from Products.CMFDefault import utils
-class RequestTestBase(RequestTest):
+class TransactionalTestBase(TransactionalTest):
def _getTargetClass(self):
from Products.CMFDefault.Document import Document
@@ -79,7 +79,7 @@
return text.replace(self.before, self.after)
-class DocumentTests(ConformsToContent, RequestTestBase):
+class DocumentTests(ConformsToContent, TransactionalTestBase):
def test_interfaces(self):
from Products.CMFDefault.interfaces import IDocument
@@ -91,67 +91,67 @@
def test_Empty(self):
d = self._makeOne('foo', text_format='structured-text')
- self.assertEqual( d.title, '' )
- self.assertEqual( d.description, '' )
- self.assertEqual( d.text, '' )
- self.assertEqual( d.text_format, 'structured-text' )
- self.assertEqual( d._stx_level, 1 )
- self.assertEqual( d.get_size(), 0 )
+ self.assertEqual(d.title, '')
+ self.assertEqual(d.description, '')
+ self.assertEqual(d.text, '')
+ self.assertEqual(d.text_format, 'structured-text')
+ self.assertEqual(d._stx_level, 1)
+ self.assertEqual(d.get_size(), 0)
def test_editBasicHTML(self):
d = self._makeOne('foo')
d.edit('html', BASIC_HTML)
- self.failUnless( hasattr(d, 'cooked_text') )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.text.find('</body>'), -1 )
- self.assertEqual( d.cooked_text, '\n <h1>Not a lot here</h1>\n ' )
+ self.assertTrue(hasattr(d, 'cooked_text'))
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.text.find('</body>'), -1)
+ self.assertEqual(d.cooked_text, '\n <h1>Not a lot here</h1>\n ')
# Since the format is html, the STX level operands should
# have no effect.
- ct = d.CookedBody(stx_level=3, setlevel=1)
- self.assertEqual( d._stx_level, 1 )
+ d.CookedBody(stx_level=3, setlevel=1)
+ self.assertEqual(d._stx_level, 1)
def test_editSimpleXHTML(self):
d = self._makeOne('foo')
d.edit('html', SIMPLE_XHTML)
- self.failUnless( hasattr(d, 'cooked_text') )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.cooked_text, '\n <h1>Not a lot here</h1>\n ')
+ self.assertTrue(hasattr(d, 'cooked_text'))
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.cooked_text, '\n <h1>Not a lot here</h1>\n ')
def test_UpperedHtml(self):
self.REQUEST['BODY'] = BASIC_HTML.upper()
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.title, 'TITLE IN TAG' )
- self.assertEqual( d.text.find('</BODY'), -1 )
- self.assertEqual( d.Description(), 'DESCRIBE ME' )
- self.assertEqual( len(d.Contributors()), 3 )
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.title, 'TITLE IN TAG')
+ self.assertEqual(d.text.find('</BODY'), -1)
+ self.assertEqual(d.Description(), 'DESCRIBE ME')
+ self.assertEqual(len(d.Contributors()), 3)
def test_EntityInTitle(self):
self.REQUEST['BODY'] = ENTITY_IN_TITLE
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.title, '&Auuml;rger' )
+ self.assertEqual(d.title, '&Auuml;rger')
def test_HtmlWithDoctype(self):
self.REQUEST['BODY'] = '%s\n%s' % (DOCTYPE, BASIC_HTML)
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Description(), 'Describe me' )
+ self.assertEqual(d.Description(), 'Describe me')
def test_HtmlWithoutNewlines(self):
self.REQUEST['BODY'] = ''.join((BASIC_HTML.split('\n')))
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.Description(), 'Describe me' )
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.Description(), 'Describe me')
def test_EditPlainDocumentWithEmbeddedHTML(self):
d = self._makeOne('foo')
@@ -159,7 +159,7 @@
fully_edited = d.cooked_text
d._edit(FAUX_HTML_LEADING_TEXT)
partly_edited = d.cooked_text
- self.assertEquals(fully_edited, partly_edited)
+ self.assertEqual(fully_edited, partly_edited)
def test_BigHtml(self):
d = self._makeOne('foo')
@@ -170,7 +170,7 @@
self.REQUEST['BODY'] = HTML_TEMPLATE % {'title': 'big document',
'body': body}
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.CookedBody(), body )
+ self.assertEqual(d.CookedBody(), body)
def test_BigHtml_via_upload(self):
d = self._makeOne('foo')
@@ -180,9 +180,9 @@
body = '<ul>\n%s\n</ul>' % '\n'.join(s)
html = HTML_TEMPLATE % {'title': 'big document',
'body': body}
- _file = StringIO( html )
+ _file = StringIO(html)
d.edit(text_format='html', text='', file=_file)
- self.assertEqual( d.CookedBody(), body )
+ self.assertEqual(d.CookedBody(), body)
def test_Htmltag_removal_and_formatchange(self):
# Test for http://www.zope.org/Collectors/CMF/214
@@ -192,91 +192,88 @@
# Put HTML into a plain text document
d.edit(text_format='plain', text=BASIC_HTML)
new_body = d.CookedBody()
- self.failIf(new_body==BASIC_HTML)
- self.failUnless(new_body.startswith(quoted_html[:5]))
+ self.assertFalse(new_body == BASIC_HTML)
+ self.assertTrue(new_body.startswith(quoted_html[:5]))
# Now we change the format. The body *must* change because
# the format change will trigger re-cooking
old_body = d.CookedBody()
d.setFormat('html')
new_body = d.CookedBody()
- self.failIf(old_body==new_body)
- self.failIf(new_body==BASIC_HTML)
+ self.assertFalse(old_body == new_body)
+ self.assertFalse(new_body == BASIC_HTML)
def test_Html_Fragment(self):
# Test that edits with HTML fragments behave nicely
FRAGMENT = '<div id="placeholder">CONTENT</div>'
d = self._makeOne('foo')
d.edit(text_format='html', text=FRAGMENT)
- self.assertEqual( d.CookedBody(), FRAGMENT )
- self.assertEqual( d.get_size(), len(FRAGMENT) )
+ self.assertEqual(d.CookedBody(), FRAGMENT)
+ self.assertEqual(d.get_size(), len(FRAGMENT))
def test_plain_text(self):
# test that plain text forrmat works
PLAIN_TEXT = '*some plain text*\nwith a newline'
d = self._makeOne('foo')
d.edit(text_format='plain', text=PLAIN_TEXT)
- self.assertEqual( d.CookedBody(),
+ self.assertEqual(d.CookedBody(),
'*some plain text*<br />with a newline')
- self.assertEqual( d.get_size(), len(PLAIN_TEXT) )
+ self.assertEqual(d.get_size(), len(PLAIN_TEXT))
def test_EditStructuredTextWithHTML(self):
d = self._makeOne('foo')
d.edit(text_format='structured-text', text=STX_WITH_HTML)
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.get_size(), len(STX_WITH_HTML) )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.get_size(), len(STX_WITH_HTML))
def test_StructuredText(self):
self.REQUEST['BODY'] = BASIC_STRUCTUREDTEXT
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.failUnless( hasattr(d, 'cooked_text') )
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.Title(), 'My Document' )
- self.assertEqual( d.Description(), 'A document by me' )
- self.assertEqual( len(d.Contributors()), 3 )
- self.failUnless( d.cooked_text.find('<p>') >= 0 )
- self.failUnless( d.CookedBody().find('<h1') >= 0 )
+ self.assertTrue(hasattr(d, 'cooked_text'))
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.Title(), 'My Document')
+ self.assertEqual(d.Description(), 'A document by me')
+ self.assertEqual(len(d.Contributors()), 3)
+ self.assertTrue(d.cooked_text.find('<p>') >= 0)
+ self.assertTrue(d.CookedBody().find('<h1') >= 0)
# Make sure extra HTML is NOT found
- self.failUnless( d.cooked_text.find('<title>') < 0 )
- self.failUnless( d.cooked_text.find('<body>') < 0 )
+ self.assertTrue(d.cooked_text.find('<title>') < 0)
+ self.assertTrue(d.cooked_text.find('<body>') < 0)
# test subject/keyword headers
subj = list(d.Subject())
- self.assertEqual( len(subj), 4 )
+ self.assertEqual(len(subj), 4)
subj.sort()
- self.assertEqual( subj, [ 'content management'
- , 'framework'
- , 'unit tests'
- , 'zope'
- ] )
+ self.assertEqual(subj, ['content management', 'framework',
+ 'unit tests', 'zope'])
def test_STX_Levels(self):
d = self._makeOne('foo')
d.edit(text_format='structured-text', text=BASIC_STRUCTUREDTEXT)
- self.assertEqual( d._stx_level, 1 )
+ self.assertEqual(d._stx_level, 1)
ct = d.CookedBody()
- self.failUnless( d.CookedBody().find('<h1') >= 0 )
- self.assertEqual( d._stx_level, 1 )
+ self.assertTrue(ct.find('<h1') >= 0)
+ self.assertEqual(d._stx_level, 1)
ct = d.CookedBody(stx_level=2)
- self.failIf( ct.find('<h1') >= 0 )
- self.failUnless( ct.find('<h2') >= 0 )
- self.assertEqual( d._stx_level, 1 )
+ self.assertFalse(ct.find('<h1') >= 0)
+ self.assertTrue(ct.find('<h2') >= 0)
+ self.assertEqual(d._stx_level, 1)
ct = d.CookedBody(stx_level=2, setlevel=1)
- self.failIf( ct.find('<h1') >= 0 )
- self.failUnless( ct.find('<h2') >= 0 )
- self.assertEqual( d._stx_level, 2 )
+ self.assertFalse(ct.find('<h1') >= 0)
+ self.assertTrue(ct.find('<h2') >= 0)
+ self.assertEqual(d._stx_level, 2)
ct = d.CookedBody()
- self.assertEqual( d._stx_level, 2 )
- self.failIf( d.CookedBody().find('<h1') >= 0 )
- self.failUnless( d.CookedBody().find('<h2') >= 0 )
+ self.assertEqual(d._stx_level, 2)
+ self.assertFalse(d.CookedBody().find('<h1') >= 0)
+ self.assertTrue(d.CookedBody().find('<h2') >= 0)
def test_ReStructuredText(self):
from Products.CMFDefault.Document import REST_AVAILABLE
@@ -287,34 +284,31 @@
d.PUT(self.REQUEST, self.RESPONSE)
d.edit(text_format='restructured-text', text=BASIC_ReST)
- self.failUnless( hasattr(d, 'cooked_text') )
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.Title(), 'My Document' )
- self.assertEqual( d.Description(), 'A document by me' )
- self.assertEqual( len(d.Contributors()), 3 )
+ self.assertTrue(hasattr(d, 'cooked_text'))
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.Title(), 'My Document')
+ self.assertEqual(d.Description(), 'A document by me')
+ self.assertEqual(len(d.Contributors()), 3)
# CookedBody() for consistency
- self.failUnless( d.CookedBody().find('<p>') >= 0 )
+ self.assertTrue(d.CookedBody().find('<p>') >= 0)
# override default
- self.failUnless( d.CookedBody(rest_level=0).find('<h1') >= 0 )
+ self.assertTrue(d.CookedBody(rest_level=0).find('<h1') >= 0)
# we should check for the list
- self.failUnless( d.CookedBody().find('<ul') >= 0 )
+ self.assertTrue(d.CookedBody().find('<ul') >= 0)
# Make sure extra HTML is NOT found
- self.failUnless( d.cooked_text.find('<title>') < 0 )
- self.failUnless( d.cooked_text.find('<body>') < 0 )
+ self.assertTrue(d.cooked_text.find('<title>') < 0)
+ self.assertTrue(d.cooked_text.find('<body>') < 0)
# test subject/keyword headers
subj = list(d.Subject())
- self.assertEqual( len(subj), 4 )
+ self.assertEqual(len(subj), 4)
subj.sort()
- self.assertEqual( subj, [ 'content management'
- , 'framework'
- , 'unit tests'
- , 'zope'
- ] )
+ self.assertEqual(subj, ['content management', 'framework',
+ 'unit tests', 'zope'])
def test_EditReStructuredTextWithHTML(self):
from Products.CMFDefault.Document import REST_AVAILABLE
@@ -333,179 +327,174 @@
d = self._makeOne('foo')
d.edit(text_format='restructured-text', text=BASIC_ReST)
d.CookedBody(rest_level=0, setlevel=True)
- self.assertEqual( d._rest_level, 0)
+ self.assertEqual(d._rest_level, 0)
ct = d.CookedBody()
# ReST always augments the level by one
- self.failUnless( d.CookedBody().find('<h1') >= 0 )
- self.assertEqual( d._rest_level, 0)
+ self.assertTrue(ct.find('<h1') >= 0)
+ self.assertEqual(d._rest_level, 0)
ct = d.CookedBody(rest_level=1)
- self.failIf( ct.find('<h1') >= 0 )
- self.failUnless( ct.find('<h2') >= 0 )
- self.assertEqual( d._rest_level, 0 )
+ self.assertFalse(ct.find('<h1') >= 0)
+ self.assertTrue(ct.find('<h2') >= 0)
+ self.assertEqual(d._rest_level, 0)
ct = d.CookedBody(rest_level=1, setlevel=1)
- self.failIf( ct.find('<h1') >= 0 )
- self.failUnless( ct.find('<h2') >= 0 )
- self.assertEqual( d._rest_level, 1 )
+ self.assertFalse(ct.find('<h1') >= 0)
+ self.assertTrue(ct.find('<h2') >= 0)
+ self.assertEqual(d._rest_level, 1)
ct = d.CookedBody()
- self.assertEqual( d._rest_level, 1 )
- self.failIf( d.CookedBody().find('<h1') >= 0 )
- self.failUnless( d.CookedBody().find('<h2') >= 0 )
+ self.assertEqual(d._rest_level, 1)
+ self.assertFalse(d.CookedBody().find('<h1') >= 0)
+ self.assertTrue(d.CookedBody().find('<h2') >= 0)
def test_Init(self):
- self.REQUEST['BODY']=BASIC_STRUCTUREDTEXT
+ self.REQUEST['BODY'] = BASIC_STRUCTUREDTEXT
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.Title(), 'My Document' )
- self.assertEqual( d.Description(), 'A document by me' )
- self.assertEqual( len(d.Contributors()), 3 )
- self.failUnless( d.cooked_text.find('<p>') >= 0 )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.Title(), 'My Document')
+ self.assertEqual(d.Description(), 'A document by me')
+ self.assertEqual(len(d.Contributors()), 3)
+ self.assertTrue(d.cooked_text.find('<p>') >= 0)
d = self._makeOne('foo', text='')
- self.REQUEST['BODY']=BASIC_HTML
+ self.REQUEST['BODY'] = BASIC_HTML
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.Title(), 'Title in tag' )
- self.assertEqual( len(d.Contributors()), 3 )
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.Title(), 'Title in tag')
+ self.assertEqual(len(d.Contributors()), 3)
d = self._makeOne('foo', text_format='structured-text',
title='Foodoc')
- self.assertEqual( d.text, '' )
- self.failIf( d.CookedBody() )
- self.assertEqual( d.title, 'Foodoc' )
- self.assertEqual( d.Format(), 'text/plain' )
+ self.assertEqual(d.text, '')
+ self.assertFalse(d.CookedBody())
+ self.assertEqual(d.title, 'Foodoc')
+ self.assertEqual(d.Format(), 'text/plain')
# Tracker issue 435: initial text is not cooked.
d = self._makeOne('foo', text_format='structured-text',
text=STX_NO_HEADERS)
- self.assertEqual( d.EditableBody(), STX_NO_HEADERS )
- self.failUnless( d.CookedBody() )
- self.assertEqual( d.Format(), 'text/plain' )
+ self.assertEqual(d.EditableBody(), STX_NO_HEADERS)
+ self.assertTrue(d.CookedBody())
+ self.assertEqual(d.Format(), 'text/plain')
- def test_STX_NoHeaders( self ):
- self.REQUEST['BODY']=STX_NO_HEADERS
+ def test_STX_NoHeaders(self):
+ self.REQUEST['BODY'] = STX_NO_HEADERS
d = self._makeOne('foo')
- d.editMetadata( title="Plain STX"
- , description="Look, Ma, no headers!"
- , subject=( "plain", "STX" )
- )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.Title(), 'Plain STX' )
- self.assertEqual( d.Description(), 'Look, Ma, no headers!' )
- self.assertEqual( len( d.Subject() ), 2 )
- self.failUnless( 'plain' in d.Subject() )
- self.failUnless( 'STX' in d.Subject() )
+ d.editMetadata(title="Plain STX",
+ description="Look, Ma, no headers!",
+ subject=("plain", "STX"))
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.Title(), 'Plain STX')
+ self.assertEqual(d.Description(), 'Look, Ma, no headers!')
+ self.assertEqual(len(d.Subject()), 2)
+ self.assertTrue('plain' in d.Subject())
+ self.assertTrue('STX' in d.Subject())
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.Title(), 'Plain STX' )
- self.assertEqual( d.Description(), 'Look, Ma, no headers!' )
- self.assertEqual( len( d.Subject() ), 2 )
- self.failUnless( 'plain' in d.Subject() )
- self.failUnless( 'STX' in d.Subject() )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.Title(), 'Plain STX')
+ self.assertEqual(d.Description(), 'Look, Ma, no headers!')
+ self.assertEqual(len(d.Subject()), 2)
+ self.assertTrue('plain' in d.Subject())
+ self.assertTrue('STX' in d.Subject())
- def test_ReST_NoHeaders( self ):
+ def test_ReST_NoHeaders(self):
from Products.CMFDefault.Document import REST_AVAILABLE
if not REST_AVAILABLE:
return
self.REQUEST['BODY'] = ReST_NO_HEADERS
d = self._makeOne('foo')
- d.editMetadata( title="Plain ReST"
- , description="Look, Ma, no headers!"
- , subject=( "plain", "ReST" )
- )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.Title(), 'Plain ReST' )
- self.assertEqual( d.Description(), 'Look, Ma, no headers!' )
- self.assertEqual( len( d.Subject() ), 2 )
- self.failUnless( 'plain' in d.Subject() )
- self.failUnless( 'ReST' in d.Subject() )
+ d.editMetadata(title="Plain ReST",
+ description="Look, Ma, no headers!",
+ subject=("plain", "ReST"))
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.Title(), 'Plain ReST')
+ self.assertEqual(d.Description(), 'Look, Ma, no headers!')
+ self.assertEqual(len(d.Subject()), 2)
+ self.assertTrue('plain' in d.Subject())
+ self.assertTrue('ReST' in d.Subject())
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.Title(), 'Plain ReST' )
- self.assertEqual( d.Description(), 'Look, Ma, no headers!' )
- self.assertEqual( len( d.Subject() ), 2 )
- self.failUnless( 'plain' in d.Subject() )
- self.failUnless( 'ReST' in d.Subject() )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.Title(), 'Plain ReST')
+ self.assertEqual(d.Description(), 'Look, Ma, no headers!')
+ self.assertEqual(len(d.Subject()), 2)
+ self.assertTrue('plain' in d.Subject())
+ self.assertTrue('ReST' in d.Subject())
- def test_STX_NoHeaders_but_colon( self ):
+ def test_STX_NoHeaders_but_colon(self):
d = self._makeOne('foo')
- d.editMetadata( title="Plain STX"
- , description="Look, Ma, no headers!"
- , subject=( "plain", "STX" )
- )
+ d.editMetadata(title="Plain STX",
+ description="Look, Ma, no headers!",
+ subject=("plain", "STX"))
d.edit(text_format='structured-text', text=STX_NO_HEADERS_BUT_COLON)
- self.assertEqual( d.EditableBody(), STX_NO_HEADERS_BUT_COLON )
+ self.assertEqual(d.EditableBody(), STX_NO_HEADERS_BUT_COLON)
- def test_ReST_NoHeaders_but_colon( self ):
+ def test_ReST_NoHeaders_but_colon(self):
from Products.CMFDefault.Document import REST_AVAILABLE
if not REST_AVAILABLE:
return
d = self._makeOne('foo')
- d.editMetadata( title="Plain ReST"
- , description="Look, Ma, no headers!"
- , subject=( "plain", "ST" )
- )
+ d.editMetadata(title="Plain ReST",
+ description="Look, Ma, no headers!",
+ subject=("plain", "ST"))
d.edit(text_format='restructured-text', text=ReST_NO_HEADERS_BUT_COLON)
- self.assertEqual( d.EditableBody(), ReST_NO_HEADERS_BUT_COLON )
+ self.assertEqual(d.EditableBody(), ReST_NO_HEADERS_BUT_COLON)
- def test_ZMI_edit( self ):
+ def test_ZMI_edit(self):
d = self._makeOne('foo')
- d.editMetadata( title="Plain STX"
- , description="Look, Ma, no headers!"
- , subject=( "plain", "STX" )
- )
+ d.editMetadata(title="Plain STX",
+ description="Look, Ma, no headers!",
+ subject=("plain", "STX"))
- d.manage_editDocument( text_format='structured-text'
+ d.manage_editDocument(text_format='structured-text'
, text=STX_NO_HEADERS_BUT_COLON)
- self.assertEqual( d.EditableBody(), STX_NO_HEADERS_BUT_COLON )
+ self.assertEqual(d.EditableBody(), STX_NO_HEADERS_BUT_COLON)
def test_Format_methods(self):
d = self._makeOne('foo')
d.setFormat('plain')
- self.assertEqual( d.text_format, 'plain' )
- self.assertEqual( d.Format(), 'text/plain' )
- d.setFormat( d.Format() )
- self.assertEqual( d.text_format, 'plain' )
+ self.assertEqual(d.text_format, 'plain')
+ self.assertEqual(d.Format(), 'text/plain')
+ d.setFormat(d.Format())
+ self.assertEqual(d.text_format, 'plain')
d.setFormat('structured-text')
- self.assertEqual( d.text_format, 'structured-text' )
- self.assertEqual( d.Format(), 'text/plain' )
- d.setFormat( d.Format() )
- self.assertEqual( d.text_format, 'structured-text' )
+ self.assertEqual(d.text_format, 'structured-text')
+ self.assertEqual(d.Format(), 'text/plain')
+ d.setFormat(d.Format())
+ self.assertEqual(d.text_format, 'structured-text')
from Products.CMFDefault.Document import REST_AVAILABLE
if REST_AVAILABLE:
d.setFormat('restructured-text')
- self.assertEqual( d.text_format, 'restructured-text' )
- self.assertEqual( d.Format(), 'text/plain' )
- d.setFormat( d.Format() )
- self.assertEqual( d.text_format, 'restructured-text' )
+ self.assertEqual(d.text_format, 'restructured-text')
+ self.assertEqual(d.Format(), 'text/plain')
+ d.setFormat(d.Format())
+ self.assertEqual(d.text_format, 'restructured-text')
d.setFormat('html')
- self.assertEqual( d.text_format, 'html' )
- self.assertEqual( d.Format(), 'text/html' )
- d.setFormat( d.Format() )
- self.assertEqual( d.text_format, 'html' )
+ self.assertEqual(d.text_format, 'html')
+ self.assertEqual(d.Format(), 'text/html')
+ d.setFormat(d.Format())
+ self.assertEqual(d.text_format, 'html')
d.setFormat('foo')
- self.assertEqual( d.text_format, 'structured-text' )
+ self.assertEqual(d.text_format, 'structured-text')
- def test_default_format( self ):
+ def test_default_format(self):
d = self._makeOne('foo', text='')
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.text_format, 'structured-text' )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.text_format, 'structured-text')
def test_normalize_linebreaks_incoming(self):
# New feature: Line breaks can be normalized on the way in
@@ -517,11 +506,11 @@
# First case, no normalizer installed. Text will stay the same.
d._edit(LF_TEXT)
- self.assertEquals(d.text, LF_TEXT)
+ self.assertEqual(d.text, LF_TEXT)
d._edit(CRLF_TEXT)
- self.assertEquals(d.text, CRLF_TEXT)
-
+ self.assertEqual(d.text, CRLF_TEXT)
+
# Now register a normalizer that always replaces CRLF with LF
# When I pass in CRLFs, the resulting text will only have LFs.
crlf_to_lf = DummyLinebreakNormalizer('\r\n', '\n')
@@ -529,10 +518,10 @@
sm.registerUtility(crlf_to_lf, ILinebreakNormalizer)
d._edit(CRLF_TEXT)
- self.assertEquals(d.text, LF_TEXT)
+ self.assertEqual(d.text, LF_TEXT)
d._edit(LF_TEXT)
- self.assertEquals(d.text, LF_TEXT)
+ self.assertEqual(d.text, LF_TEXT)
# cleanup
sm.unregisterUtility(crlf_to_lf, ILinebreakNormalizer)
@@ -548,10 +537,10 @@
# First case, no normalizer installed. Text will stay the same.
d.text = LF_TEXT
- self.assertEquals(d.manage_FTPget(), HEADERS + LF_TEXT)
+ self.assertEqual(d.manage_FTPget(), HEADERS + LF_TEXT)
d.text = CRLF_TEXT
- self.assertEquals(d.manage_FTPget(), HEADERS + CRLF_TEXT)
+ self.assertEqual(d.manage_FTPget(), HEADERS + CRLF_TEXT)
# Now register a normalizer that always replaces CRLF with LF
# When I pass in CRLFs, the resulting text will only have LFs.
@@ -560,32 +549,32 @@
sm.registerUtility(crlf_to_lf, ILinebreakNormalizer)
d.text = (CRLF_TEXT)
- self.assertEquals(d.manage_FTPget(), HEADERS + LF_TEXT)
+ self.assertEqual(d.manage_FTPget(), HEADERS + LF_TEXT)
d.text = LF_TEXT
- self.assertEquals(d.manage_FTPget(), HEADERS + LF_TEXT)
+ self.assertEqual(d.manage_FTPget(), HEADERS + LF_TEXT)
# cleanup
sm.unregisterUtility(crlf_to_lf, ILinebreakNormalizer)
-class DocumentFTPGetTests(RequestTestBase):
+class DocumentFTPGetTests(TransactionalTestBase):
def setUp(self):
- RequestTest.setUp(self)
+ TransactionalTest.setUp(self)
self.site = DummySite('site').__of__(self.root)
- def testHTML( self ):
- self.REQUEST['BODY']=BASIC_HTML
+ def testHTML(self):
+ self.REQUEST['BODY'] = BASIC_HTML
- ttool = self.site._setObject( 'portal_types', TypesTool() )
+ ttool = self.site._setObject('portal_types', TypesTool())
fti = FTIDATA_CMF[0].copy()
del fti['id']
- ttool._setObject( 'Document', FTI('Document', **fti) )
+ ttool._setObject('Document', FTI('Document', **fti))
- zpt = self.site._setObject( 'source_html',
- ZopePageTemplate('source_html') )
- dir = abspath( dirname(utils.__file__) )
+ zpt = self.site._setObject('source_html',
+ ZopePageTemplate('source_html'))
+ dir = abspath(dirname(utils.__file__))
_file = path_join(dir, 'skins', 'zpt_content', 'source_html.pt')
data = open(_file, 'r').read()
zpt.write(data)
@@ -594,150 +583,147 @@
d._setPortalTypeName('Document')
d.PUT(self.REQUEST, self.RESPONSE)
- rnlinesplit = compile( r'\r?\n?' )
- simple_lines = rnlinesplit.split( BASIC_HTML )
- get_lines = rnlinesplit.split( d.manage_FTPget() )
+ rnlinesplit = compile(r'\r?\n?')
+ simple_lines = rnlinesplit.split(BASIC_HTML)
+ get_lines = rnlinesplit.split(d.manage_FTPget())
# strip off headers
- meta_pattern = compile( r'meta name="([a-z]*)" '
+ meta_pattern = compile(r'meta name="([a-z]*)" '
+ r'content="([a-z]*)"'
)
- title_pattern = compile( r'<title>(.*)</title>' )
+ title_pattern = compile(r'<title>(.*)</title>')
simple_headers = []
while simple_lines and simple_lines[0] != '<BODY>':
header = simple_lines[0].strip().lower()
- match = meta_pattern.search( header )
+ match = meta_pattern.search(header)
if match:
- simple_headers.append( match.groups() )
+ simple_headers.append(match.groups())
else:
- match = title_pattern.search( header )
+ match = title_pattern.search(header)
if match:
- simple_headers.append( ( 'title', match.group(1) ) )
+ simple_headers.append(('title', match.group(1)))
simple_lines = simple_lines[1:]
get_headers = []
while get_lines and get_lines[0] != '<BODY>':
header = get_lines[0].strip().lower()
- match = meta_pattern.search( header )
+ match = meta_pattern.search(header)
if match:
- get_headers.append( match.groups() )
+ get_headers.append(match.groups())
else:
- match = title_pattern.search( header )
+ match = title_pattern.search(header)
if match:
- get_headers.append( ( 'title', match.group(1) ) )
+ get_headers.append(('title', match.group(1)))
get_lines = get_lines[1:]
- self.assertEqual( get_lines, simple_lines )
+ self.assertEqual(get_lines, simple_lines)
- self.failUnless( get_headers )
- self.failUnless( simple_headers )
- self.failUnless( len( get_headers ) >= len( simple_headers ) )
+ self.assertTrue(get_headers)
+ self.assertTrue(simple_headers)
+ self.assertTrue(len(get_headers) >= len(simple_headers))
for header in simple_headers:
- self.failUnless( header in get_headers )
+ self.assertTrue(header in get_headers)
body1 = d.EditableBody()
self.REQUEST['BODY'] = d.manage_FTPget()
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.EditableBody(), body1 )
+ self.assertEqual(d.EditableBody(), body1)
- def testSTX( self ):
- self.REQUEST['BODY']=SIMPLE_STRUCTUREDTEXT
+ def testSTX(self):
+ self.REQUEST['BODY'] = SIMPLE_STRUCTUREDTEXT
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- rnlinesplit = compile( r'\r?\n?' )
+ rnlinesplit = compile(r'\r?\n?')
get_text = d.manage_FTPget()
- simple_lines = rnlinesplit.split( SIMPLE_STRUCTUREDTEXT )
- get_lines = rnlinesplit.split( get_text )
+ simple_lines = rnlinesplit.split(SIMPLE_STRUCTUREDTEXT)
+ get_lines = rnlinesplit.split(get_text)
# strip off headers
simple_headers = []
while simple_lines and simple_lines[0]:
- simple_headers.append( simple_lines[0] )
+ simple_headers.append(simple_lines[0])
simple_lines = simple_lines[1:]
get_headers = []
while get_lines and get_lines[0]:
- get_headers.append( get_lines[0] )
+ get_headers.append(get_lines[0])
get_lines = get_lines[1:]
- self.assertEqual( get_lines, simple_lines )
+ self.assertEqual(get_lines, simple_lines)
for header in simple_headers:
- self.failUnless( header in get_headers )
+ self.assertTrue(header in get_headers)
-class DocumentPUTTests(RequestTestBase):
+class DocumentPUTTests(TransactionalTestBase):
def test_PUTBasicHTML(self):
self.REQUEST['BODY'] = BASIC_HTML
d = self._makeOne('foo')
r = d.PUT(self.REQUEST, self.RESPONSE)
- self.failUnless( hasattr(d, 'cooked_text') )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.title, 'Title in tag' )
- self.assertEqual( d.text.find('</body>'), -1 )
- self.assertEqual( d.Description(), 'Describe me' )
- self.assertEqual( len(d.Contributors()), 3 )
- self.assertEqual( d.Contributors()[-1],
- 'Benotz, Larry J (larry at benotz.stuff)' )
- self.assertEqual( d.cooked_text, '\n <h1>Not a lot here</h1>\n ' )
- self.assertEqual( r.status, 204 )
+ self.assertTrue(hasattr(d, 'cooked_text'))
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.title, 'Title in tag')
+ self.assertEqual(d.text.find('</body>'), -1)
+ self.assertEqual(d.Description(), 'Describe me')
+ self.assertEqual(len(d.Contributors()), 3)
+ self.assertEqual(d.Contributors()[-1],
+ 'Benotz, Larry J (larry at benotz.stuff)')
+ self.assertEqual(d.cooked_text, '\n <h1>Not a lot here</h1>\n ')
+ self.assertEqual(r.status, 204)
subj = list(d.Subject())
- self.assertEqual( len(subj), 4 )
+ self.assertEqual(len(subj), 4)
subj.sort()
- self.assertEqual( subj, [ 'content management'
- , 'framework'
- , 'unit tests'
- , 'zope'
- ] )
+ self.assertEqual(subj, ['content management', 'framework',
+ 'unit tests', 'zope'])
def test_PUTSimpleXHTML(self):
self.REQUEST['BODY'] = SIMPLE_XHTML
d = self._makeOne('foo')
r = d.PUT(self.REQUEST, self.RESPONSE)
- self.failUnless( hasattr(d, 'cooked_text') )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.Description(), 'Describe me' )
- self.assertEqual( d.cooked_text, '\n <h1>Not a lot here</h1>\n ' )
- self.assertEqual( r.status, 204 )
+ self.assertTrue(hasattr(d, 'cooked_text'))
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.Description(), 'Describe me')
+ self.assertEqual(d.cooked_text, '\n <h1>Not a lot here</h1>\n ')
+ self.assertEqual(r.status, 204)
def test_PutStructuredTextWithHTML(self):
self.REQUEST['BODY'] = STX_WITH_HTML
d = self._makeOne('foo')
r = d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( r.status, 204 )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(r.status, 204)
def test_PutStructuredText(self):
self.REQUEST['BODY'] = BASIC_STRUCTUREDTEXT
d = self._makeOne('foo')
r = d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( r.status, 204 )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(r.status, 204)
def test_PutReStructuredTextWithHTML(self):
self.REQUEST['BODY'] = ReST_WITH_HTML
d = self._makeOne('foo')
r = d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( r.status, 204 )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(r.status, 204)
def test_PutReStructuredText(self):
self.REQUEST['BODY'] = BASIC_ReST
d = self._makeOne('foo')
r = d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( r.status, 204 )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(r.status, 204)
def test_PutHtmlWithDoctype(self):
html = '%s\n\n \n %s' % (DOCTYPE, BASIC_HTML)
@@ -745,9 +731,9 @@
d = self._makeOne('foo')
r = d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.Description(), 'Describe me' )
- self.assertEqual( r.status, 204 )
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.Description(), 'Describe me')
+ self.assertEqual(r.status, 204)
def test_PutHtmlWithoutMetadata(self):
html = HTML_TEMPLATE % {'title': 'Foo', 'body': 'Bar'}
@@ -755,16 +741,16 @@
d = self._makeOne('foo')
r = d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Title(), 'Foo' )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.Description(), '' )
- self.assertEqual( d.Subject(), () )
- self.assertEqual( d.Contributors(), () )
- self.assertEqual( d.EffectiveDate(), 'None' )
- self.assertEqual( d.ExpirationDate(), 'None' )
- self.assertEqual( d.Language(), '' )
- self.assertEqual( d.Rights(), '' )
- self.assertEqual( r.status, 204 )
+ self.assertEqual(d.Title(), 'Foo')
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.Description(), '')
+ self.assertEqual(d.Subject(), ())
+ self.assertEqual(d.Contributors(), ())
+ self.assertEqual(d.EffectiveDate(), 'None')
+ self.assertEqual(d.ExpirationDate(), 'None')
+ self.assertEqual(d.Language(), '')
+ self.assertEqual(d.Rights(), '')
+ self.assertEqual(r.status, 204)
def test_suite():
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Link.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Link.py 2011-07-08 12:58:19 UTC (rev 122137)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Link.py 2011-07-09 09:10:06 UTC (rev 122138)
@@ -52,13 +52,13 @@
verifyClass(ILink, self._getTargetClass())
verifyClass(IMutableLink, self._getTargetClass())
- def test_Empty( self ):
+ def test_Empty(self):
d = self._makeOne('foo')
- self.assertEqual( d.Title(), '' )
- self.assertEqual( d.Description(), '' )
- self.assertEqual( d.getRemoteUrl(), '' )
- self.assertEqual( d.format, 'text/url' )
- self.assertEqual( d.URL_FORMAT, 'text/url')
+ self.assertEqual(d.Title(), '')
+ self.assertEqual(d.Description(), '')
+ self.assertEqual(d.getRemoteUrl(), '')
+ self.assertEqual(d.format, 'text/url')
+ self.assertEqual(d.URL_FORMAT, 'text/url')
d = self._makeOne('foo', remote_url='bar')
d.edit('')
@@ -70,43 +70,6 @@
d = self._makeOne('foo', remote_url='http:')
self.assertEqual(d.getRemoteUrl(), '')
- def test_RFC822(self):
- d = self._makeOne('foo')
- d._writeFromPUT( body=BASIC_RFC822 )
-
- self.assertEqual( d.Title(), 'Zope Community' )
- self.assertEqual( d.Description()
- , 'Link to the Zope Community website.' )
- self.assertEqual( len(d.Subject()), 3 )
- self.assertEqual( d.getRemoteUrl(), 'http://www.zope.org' )
-
- def test_RFC822_w_Continuation(self):
- d = self._makeOne('foo')
- d._writeFromPUT( body=RFC822_W_CONTINUATION )
- rnlinesplit = compile( r'\r?\n?' )
- desc_lines = rnlinesplit.split( d.Description() )
-
- self.assertEqual( d.Title(), 'Zope Community' )
- self.assertEqual( desc_lines[0]
- , 'Link to the Zope Community website,' )
- self.assertEqual( desc_lines[1]
- , ' including hundreds of contributed Zope products.' )
- self.assertEqual( len(d.Subject()), 3 )
- self.assertEqual( d.getRemoteUrl(), 'http://www.zope.org' )
-
- def test_PutWithoutMetadata(self):
- d = self._makeOne('foo')
- d._writeFromPUT( body='' )
- self.assertEqual( d.Title(), '' )
- self.assertEqual( d.Format(), 'text/url' )
- self.assertEqual( d.Description(), '' )
- self.assertEqual( d.Subject(), () )
- self.assertEqual( d.Contributors(), () )
- self.assertEqual( d.EffectiveDate(), 'None' )
- self.assertEqual( d.ExpirationDate(), 'None' )
- self.assertEqual( d.Language(), '' )
- self.assertEqual( d.Rights(), '' )
-
def test_fixupMissingScheme(self):
table = {
'http://foo.com': 'http://foo.com',
@@ -139,7 +102,56 @@
self.canonTest(table)
+class LinkPUTTests(unittest.TestCase):
+
+ def _getTargetClass(self):
+ from Products.CMFDefault.Link import Link
+
+ return Link
+
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
+ def test_RFC822(self):
+ d = self._makeOne('foo')
+ d._writeFromPUT(body=BASIC_RFC822)
+
+ self.assertEqual(d.Title(), 'Zope Community')
+ self.assertEqual(d.Description()
+ , 'Link to the Zope Community website.')
+ self.assertEqual(len(d.Subject()), 3)
+ self.assertEqual(d.getRemoteUrl(), 'http://www.zope.org')
+
+ def test_RFC822_w_Continuation(self):
+ d = self._makeOne('foo')
+ d._writeFromPUT(body=RFC822_W_CONTINUATION)
+ rnlinesplit = compile(r'\r?\n?')
+ desc_lines = rnlinesplit.split(d.Description())
+
+ self.assertEqual(d.Title(), 'Zope Community')
+ self.assertEqual(desc_lines[0]
+ , 'Link to the Zope Community website,')
+ self.assertEqual(desc_lines[1]
+ , ' including hundreds of contributed Zope products.')
+ self.assertEqual(len(d.Subject()), 3)
+ self.assertEqual(d.getRemoteUrl(), 'http://www.zope.org')
+
+ def test_PutWithoutMetadata(self):
+ d = self._makeOne('foo')
+ d._writeFromPUT(body='')
+ self.assertEqual(d.Title(), '')
+ self.assertEqual(d.Format(), 'text/url')
+ self.assertEqual(d.Description(), '')
+ self.assertEqual(d.Subject(), ())
+ self.assertEqual(d.Contributors(), ())
+ self.assertEqual(d.EffectiveDate(), 'None')
+ self.assertEqual(d.ExpirationDate(), 'None')
+ self.assertEqual(d.Language(), '')
+ self.assertEqual(d.Rights(), '')
+
+
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(LinkTests),
+ unittest.makeSuite(LinkPUTTests),
))
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_NewsItem.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_NewsItem.py 2011-07-08 12:58:19 UTC (rev 122137)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_NewsItem.py 2011-07-09 09:10:06 UTC (rev 122138)
@@ -23,7 +23,7 @@
from Products.CMFCore.tests.base.content import BASIC_STRUCTUREDTEXT
from Products.CMFCore.tests.base.content import DOCTYPE
from Products.CMFCore.tests.base.content import ENTITY_IN_TITLE
-from Products.CMFCore.tests.base.testcase import RequestTest
+from Products.CMFCore.tests.base.testcase import TransactionalTest
class NewsItemTests(ConformsToContent, unittest.TestCase):
@@ -50,39 +50,39 @@
def test_Empty_html(self):
d = self._makeOne('empty', text_format='html')
- self.assertEqual( d.Title(), '' )
- self.assertEqual( d.Description(), '' )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.text_format, 'html' )
- self.assertEqual( d.text, '' )
+ self.assertEqual(d.Title(), '')
+ self.assertEqual(d.Description(), '')
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.text_format, 'html')
+ self.assertEqual(d.text, '')
def test_Empty_stx(self):
d = self._makeOne('foo', text_format='structured-text')
- self.assertEqual( d.Title(), '' )
- self.assertEqual( d.Description(), '' )
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.text_format, 'structured-text' )
- self.assertEqual( d.text, '' )
+ self.assertEqual(d.Title(), '')
+ self.assertEqual(d.Description(), '')
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.text_format, 'structured-text')
+ self.assertEqual(d.text, '')
- def test_Init_with_stx( self ):
+ def test_Init_with_stx(self):
d = self._makeOne('foo', text_format='structured-text',
title='Foodoc')
- self.assertEqual( d.Title(), 'Foodoc' )
- self.assertEqual( d.Description(), '' )
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.text_format, 'structured-text' )
- self.assertEqual( d.text, '' )
+ self.assertEqual(d.Title(), 'Foodoc')
+ self.assertEqual(d.Description(), '')
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.text_format, 'structured-text')
+ self.assertEqual(d.text, '')
- def test_default_format( self ):
+ def test_default_format(self):
d = self._makeOne('foo', text='')
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.text_format, 'structured-text' )
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.text_format, 'structured-text')
-class NewsItemPUTTests(RequestTest):
+class NewsItemPUTTests(TransactionalTest):
def _getTargetClass(self):
from Products.CMFDefault.NewsItem import NewsItem
@@ -97,74 +97,74 @@
d = self._makeOne('foo', text='')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Title(), 'My Document' )
- self.assertEqual( d.Description(), 'A document by me' )
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.text_format, 'structured-text' )
- self.assertEqual( len(d.Contributors()), 3 )
- self.failUnless( d.cooked_text.find('<p>') >= 0 )
+ self.assertEqual(d.Title(), 'My Document')
+ self.assertEqual(d.Description(), 'A document by me')
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.text_format, 'structured-text')
+ self.assertEqual(len(d.Contributors()), 3)
+ self.assertTrue(d.cooked_text.find('<p>') >= 0)
def test_PUT_basic_html(self):
- self.REQUEST['BODY']=BASIC_HTML
+ self.REQUEST['BODY'] = BASIC_HTML
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Title(), 'Title in tag' )
- self.assertEqual( d.Description(), 'Describe me' )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.text_format, 'html' )
- self.assertEqual( d.text.find('</body>'), -1 )
- self.assertEqual( len(d.Contributors()), 3 )
+ self.assertEqual(d.Title(), 'Title in tag')
+ self.assertEqual(d.Description(), 'Describe me')
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.text_format, 'html')
+ self.assertEqual(d.text.find('</body>'), -1)
+ self.assertEqual(len(d.Contributors()), 3)
def test_PUT_uppered_html(self):
self.REQUEST['BODY'] = BASIC_HTML.upper()
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Title(), 'TITLE IN TAG' )
- self.assertEqual( d.Description(), 'DESCRIBE ME' )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.text_format, 'html' )
- self.assertEqual( d.text.find('</BODY'), -1 )
- self.assertEqual( len(d.Contributors()), 3 )
+ self.assertEqual(d.Title(), 'TITLE IN TAG')
+ self.assertEqual(d.Description(), 'DESCRIBE ME')
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.text_format, 'html')
+ self.assertEqual(d.text.find('</BODY'), -1)
+ self.assertEqual(len(d.Contributors()), 3)
def test_PUT_entity_in_title(self):
self.REQUEST['BODY'] = ENTITY_IN_TITLE
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Title(), '&Auuml;rger' )
+ self.assertEqual(d.Title(), '&Auuml;rger')
def test_PUT_html_with_doctype(self):
self.REQUEST['BODY'] = '%s\n%s' % (DOCTYPE, BASIC_HTML)
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Description(), 'Describe me' )
+ self.assertEqual(d.Description(), 'Describe me')
def test_PUT_html_without_newlines(self):
self.REQUEST['BODY'] = ''.join(BASIC_HTML.split('\n'))
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Title(), 'Title in tag' )
- self.assertEqual( d.Description(), 'Describe me' )
- self.assertEqual( d.Format(), 'text/html' )
- self.assertEqual( d.text_format, 'html' )
- self.assertEqual( d.text.find('</body>'), -1 )
- self.assertEqual( len(d.Contributors()), 3 )
+ self.assertEqual(d.Title(), 'Title in tag')
+ self.assertEqual(d.Description(), 'Describe me')
+ self.assertEqual(d.Format(), 'text/html')
+ self.assertEqual(d.text_format, 'html')
+ self.assertEqual(d.text.find('</body>'), -1)
+ self.assertEqual(len(d.Contributors()), 3)
def test_PUT_structured_text(self):
self.REQUEST['BODY'] = BASIC_STRUCTUREDTEXT
d = self._makeOne('foo')
- d.PUT( self.REQUEST, self.RESPONSE )
+ d.PUT(self.REQUEST, self.RESPONSE)
- self.assertEqual( d.Title(), 'My Document')
- self.assertEqual( d.Description(), 'A document by me')
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.text_format, 'structured-text' )
- self.assertEqual( len(d.Contributors()), 3 )
- self.failUnless( d.cooked_text.find('<p>') >= 0 )
+ self.assertEqual(d.Title(), 'My Document')
+ self.assertEqual(d.Description(), 'A document by me')
+ self.assertEqual(d.Format(), 'text/plain')
+ self.assertEqual(d.text_format, 'structured-text')
+ self.assertEqual(len(d.Contributors()), 3)
+ self.assertTrue(d.cooked_text.find('<p>') >= 0)
def test_suite():
More information about the checkins
mailing list