Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
2de4acee
Commit
2de4acee
authored
Oct 14, 2022
by
Kazuhiko Shiozaki
Committed by
Arnaud Fontaine
Mar 10, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: OOo ZMI returns bytes.
parent
25dc242f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
product/ERP5OOo/tests/testOOoStyle.py
product/ERP5OOo/tests/testOOoStyle.py
+6
-5
No files found.
product/ERP5OOo/tests/testOOoStyle.py
View file @
2de4acee
...
@@ -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
(
'<Escape>&<text:line-break/>newline'
,
content_xml
)
self
.
assertIn
(
'<Escape>&<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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment