aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py')
-rw-r--r--sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py31
1 files changed, 9 insertions, 22 deletions
diff --git a/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py b/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py
index 308143d6d..1728c6823 100644
--- a/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py
+++ b/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py
@@ -34,38 +34,25 @@
import unittest
from PySide2.QtCore import QByteArray
+import py3kcompat as py3k
class QByteArrayConcatenationOperatorTest(unittest.TestCase):
'''Test cases for QByteArray concatenation with '+' operator'''
def testConcatQByteArrayAndPythonString(self):
- #Test concatenation of a QByteArray with a Python string, in this order
- qba = QByteArray('foo')
- result = qba + '\x00bar'
+ #Test concatenation of a QByteArray with a Python bytes, in this order
+ qba = QByteArray(py3k.b('foo'))
+ result = qba + py3k.b('\x00bar')
self.assertEqual(type(result), QByteArray)
- self.assertEqual(result, 'foo\x00bar')
+ self.assertEqual(result, py3k.b('foo\x00bar'))
def testConcatPythonStringAndQByteArray(self):
- #Test concatenation of a Python string with a QByteArray, in this order
+ #Test concatenation of a Python bytes with a QByteArray, in this order
concat_python_string_add_qbytearray_worked = True
- qba = QByteArray('foo')
- result = 'bar\x00' + qba
+ qba = QByteArray(py3k.b('foo'))
+ result = py3k.b('bar\x00') + qba
self.assertEqual(type(result), QByteArray)
- self.assertEqual(result, 'bar\x00foo')
-
- # NOTICE: Does not makes sense concat a unicode string with a QByteArray, because the
- # user does not know nothing about the internal representation of the unicode string.
- #def testConcatPythonUnicodeAndQByteArray(self):
- ##Test concatenation of a Python unicode object with a QByteArray, in this order
- #concat_python_unicode_add_qbytearray_worked = True
- #qba = QByteArray('foo')
- #result = None
- #try:
- #result = u'ümlaut' + qba
- #except:
- #concat_python_unicode_add_qbytearray_worked = False
- #self.assertTrue(concat_python_unicode_add_qbytearray_worked)
- #self.assertEqual(result.__class__.__name__, 'unicode')
+ self.assertEqual(result, py3k.b('bar\x00foo'))
if __name__ == '__main__':
unittest.main()