# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1286529069 -7200
# Node ID 2ca48e45522e200f3ef190754f2d36f420c48574
# Parent  b0b0f097a72d7847aa4c107f52b6b4a080eae3c5
fix bad merge

diff -r b0b0f097a72d -r 2ca48e45522e test/unittest_entity.py
--- a/test/unittest_entity.py	Fri Oct 08 11:11:08 2010 +0200
+++ b/test/unittest_entity.py	Fri Oct 08 11:11:09 2010 +0200
@@ -340,6 +340,7 @@
         e.cw_attr_cache['content'] = u'<b>yo (zou éà ;)</b>'
         e.cw_attr_cache['content_format'] = 'text/html'
         self.assertEqual(e.printable_value('content', format='text/plain').strip(),
+                         u'**yo (zou éà ;)**')
         if HAS_TAL:
             e.cw_attr_cache['content'] = '<h1 tal:content="self/title">titre</h1>'
             e.cw_attr_cache['content_format'] = 'text/cubicweb-page-template'
@@ -396,11 +397,10 @@
                          u'yo !! R&amp;D <div> pas fermé</div>')
         e.cw_attr_cache['content'] = u'été <div> été'
         self.assertEqual(tidy(e.printable_value('content')),
+                         u'été <div> été</div>')
         e.cw_attr_cache['content'] = u'C&apos;est un exemple s&eacute;rieux'
         self.assertEqual(tidy(e.printable_value('content')),
-        e['content'] = u'C&apos;est un exemple s&eacute;rieux'
-        self.assertEqual(tidy(e.printable_value('content')),
-                          u"C'est un exemple sérieux")
+                         u"C'est un exemple sérieux")
         # make sure valid xhtml is left untouched
         e.cw_attr_cache['content'] = u'<div>R&amp;D<br/></div>'
         self.assertEqual(e.printable_value('content'), e.cw_attr_cache['content'])
@@ -441,7 +441,7 @@
         e.cw_attr_cache['data_encoding'] = 'ascii'
         e._cw.transaction_data = {} # XXX req should be a session
         self.assertEqual(e.cw_adapt_to('IFTIndexable').get_words(),
-                          {'C': [u'du', u'html', 'an', 'html', 'file', u'some', u'data']})
+                          {'C': ['an', 'html', 'file', 'du', 'html', 'some', 'data']})
 
 
     def test_nonregr_relation_cache(self):