Commit ec892c58 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

py2/py3: OOo ZMI returns bytes.

parent 4ac9b5f5
...@@ -31,6 +31,7 @@ import io ...@@ -31,6 +31,7 @@ import io
import unittest import unittest
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import DummyLocalizer from Products.ERP5Type.tests.utils import DummyLocalizer
from Products.ERP5Type.Utils import bytes2str
from Products.ERP5Form.Selection import Selection from Products.ERP5Form.Selection import Selection
from Testing import ZopeTestCase from Testing import ZopeTestCase
from Products.ERP5OOo.tests.utils import Validator from Products.ERP5OOo.tests.utils import Validator
...@@ -454,7 +455,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -454,7 +455,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional):
from Products.ERP5OOo.OOoUtils import OOoParser from Products.ERP5OOo.OOoUtils import OOoParser
parser = OOoParser() parser = OOoParser()
parser.openFromString(body) parser.openFromString(body)
content_xml = parser.oo_files['content.xml'] content_xml = bytes2str(parser.oo_files['content.xml'])
self.assertIn('&lt;Escape&gt;&amp;<text:line-break/>newline', content_xml) self.assertIn('&lt;Escape&gt;&amp;<text:line-break/>newline', content_xml)
def test_untranslatable_columns(self): def test_untranslatable_columns(self):
...@@ -484,7 +485,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -484,7 +485,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional):
from Products.ERP5OOo.OOoUtils import OOoParser from Products.ERP5OOo.OOoUtils import OOoParser
parser = OOoParser() parser = OOoParser()
parser.openFromString(body) parser.openFromString(body)
content_xml = parser.oo_files['content.xml'] content_xml = bytes2str(parser.oo_files['content.xml'])
self.assertIn(message, content_xml) self.assertIn(message, content_xml)
# This untranslatable column have not been translated # This untranslatable column have not been translated
...@@ -499,7 +500,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -499,7 +500,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional):
self.assertEqual('text/html;charset=utf-8', content_type.lower()) self.assertEqual('text/html;charset=utf-8', content_type.lower())
self.assertFalse(response.getHeader('content-disposition')) self.assertFalse(response.getHeader('content-disposition'))
# Simplistic assertion that we are viewing the ODF XML source # Simplistic assertion that we are viewing the ODF XML source
self.assertIn('office:document-content', response.getBody()) self.assertIn('office:document-content', bytes2str(response.getBody()))
def test_form_list_ZMI(self): def test_form_list_ZMI(self):
"""We can edit form_list in the ZMI.""" """We can edit form_list in the ZMI."""
...@@ -509,7 +510,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -509,7 +510,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional):
content_type = response.getHeader('content-type') content_type = response.getHeader('content-type')
self.assertEqual('text/html;charset=utf-8', content_type.lower()) self.assertEqual('text/html;charset=utf-8', content_type.lower())
self.assertFalse(response.getHeader('content-disposition')) self.assertFalse(response.getHeader('content-disposition'))
self.assertIn('office:document-content', response.getBody()) self.assertIn('office:document-content', bytes2str(response.getBody()))
def test_report_view_ZMI(self): def test_report_view_ZMI(self):
"""We can edit report_view in the ZMI.""" """We can edit report_view in the ZMI."""
...@@ -519,7 +520,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -519,7 +520,7 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional):
content_type = response.getHeader('content-type') content_type = response.getHeader('content-type')
self.assertEqual('text/html;charset=utf-8', content_type.lower()) self.assertEqual('text/html;charset=utf-8', content_type.lower())
self.assertFalse(response.getHeader('content-disposition')) self.assertFalse(response.getHeader('content-disposition'))
self.assertIn('office:document-content', response.getBody()) self.assertIn('office:document-content', bytes2str(response.getBody()))
class TestODTStyle(TestOOoStyle): class TestODTStyle(TestOOoStyle):
skin = 'ODT' skin = 'ODT'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment