diff options
Diffstat (limited to 'sources/pyside2/tests/QtCore/qdatastream_test.py')
| -rw-r--r-- | sources/pyside2/tests/QtCore/qdatastream_test.py | 98 |
1 files changed, 30 insertions, 68 deletions
diff --git a/sources/pyside2/tests/QtCore/qdatastream_test.py b/sources/pyside2/tests/QtCore/qdatastream_test.py index a2d2908b2..2ea3460af 100644 --- a/sources/pyside2/tests/QtCore/qdatastream_test.py +++ b/sources/pyside2/tests/QtCore/qdatastream_test.py @@ -38,8 +38,6 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from init_paths import init_test_paths init_test_paths(False) -import py3kcompat as py3k - from PySide2.QtCore import QBitArray, QByteArray, QIODevice, QDataStream, QDate, QTime, QDateTime def create_bitarray(string): @@ -48,6 +46,14 @@ def create_bitarray(string): array.setBit(i, char != '0') return array + +def serialize_bitarray(bit_array): + buffer = QByteArray() + stream = QDataStream(buffer, QIODevice.WriteOnly) + stream << bit_array + return buffer + + class QDataStreamWrite(unittest.TestCase): '''Test case for QDatastream write* functions''' @@ -115,32 +121,32 @@ class QDataStreamShift(unittest.TestCase): self.stream.writeQChar(42) res = self.read_stream.readQChar() - self.assertEqual(res, py3k.unichr(42)) + self.assertEqual(res, chr(42)) def testQCharNull(self): '''QDataStream <<>> QChar - null''' self.stream.writeQChar(None) res = self.read_stream.readQChar() - self.assertEqual(res, py3k.unicode_('\x00')) + self.assertEqual(res, '\x00') def testQByteArrayValid(self): '''QDataStream <<>> QByteArray - valid''' - self.stream << QByteArray(py3k.b("hello")) + self.stream << QByteArray(bytes("hello", "UTF-8")) res = QByteArray() self.read_stream >> res - self.assertEqual(res, QByteArray(py3k.b("hello"))) + self.assertEqual(res, QByteArray(bytes("hello", "UTF-8"))) def testQByteArrayEmpty(self): '''QDataStream <<>> QByteArray - empty''' - self.stream << QByteArray(py3k.b("")) + self.stream << QByteArray(bytes("", "UTF-8")) res = QByteArray() self.read_stream >> res - self.assertEqual(res, QByteArray(py3k.b(""))) + self.assertEqual(res, QByteArray(bytes("", "UTF-8"))) self.assertTrue(res.isEmpty()) self.assertFalse(res.isNull()) @@ -160,21 +166,21 @@ class QDataStreamShift(unittest.TestCase): self.stream.writeQString('Ka-boom') res = self.read_stream.readQString() - self.assertEqual(res, py3k.unicode_('Ka-boom')) + self.assertEqual(res, 'Ka-boom') def testQStringEmpty(self): '''QDataStream <<>> QString - empty''' self.stream.writeQString('') res = self.read_stream.readQString() - self.assertEqual(res, py3k.unicode_('')) + self.assertEqual(res, '') def testQStringNull(self): '''QDataStream <<>> QString - null''' self.stream.writeQString(None) res = self.read_stream.readQString() - self.assertEqual(res, py3k.unicode_('')) + self.assertEqual(res, '') def testQBitArrayNull(self): '''QDataStream <<>> QBitArray - null''' @@ -282,67 +288,23 @@ class QDataStreamShiftBitArray(unittest.TestCase): def testOk(self): '''QDataStream with valid QBitArray''' - data = [] - - data.append((QByteArray(py3k.b('\x00\x00\x00\x00')), QDataStream.Ok, - QBitArray())) - data.append((QByteArray(py3k.b('\x00\x00\x00\x01\x00')), QDataStream.Ok, - create_bitarray('0'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x01\x01')), QDataStream.Ok, - create_bitarray('1'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x02\x03')), QDataStream.Ok, - create_bitarray('11'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x03\x07')), QDataStream.Ok, - create_bitarray('111'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x04\x0f')), QDataStream.Ok, - create_bitarray('1111'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x05\x1f')), QDataStream.Ok, - create_bitarray('11111'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x06\x3f')), QDataStream.Ok, - create_bitarray('111111'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x07\x7f')), QDataStream.Ok, - create_bitarray('1111111'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x07\x7e')), QDataStream.Ok, - create_bitarray('0111111'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x07\x00')), QDataStream.Ok, - create_bitarray('0000000'))) - data.append((QByteArray(py3k.b('\x00\x00\x00\x07\x39')), QDataStream.Ok, - create_bitarray('1001110'))) + test_set = [QBitArray()] + for i in range(1, 7): + test_set.append(create_bitarray(i * '1')) + for s in ['0111111', '0000000', '1001110']: + test_set.append(create_bitarray(s)) + data = [] + for expected in test_set: + data.append((serialize_bitarray(expected), QDataStream.Ok, expected)) self._check_bitarray(data) def testPastEnd(self): '''QDataStream >> QBitArray reading past the end of the data''' - data = [] + serialized = serialize_bitarray(create_bitarray('1001110')) + serialized.resize(serialized.size() - 2) + self._check_bitarray([(serialized, QDataStream.ReadPastEnd, QBitArray())]) - data.append((QByteArray(), QDataStream.ReadPastEnd, - QBitArray())) - data.append((QByteArray(py3k.b('\x00')), QDataStream.ReadPastEnd, - QBitArray())) - data.append((QByteArray(py3k.b('\x00\x00')), QDataStream.ReadPastEnd, - QBitArray())) - data.append((QByteArray(py3k.b('\x00\x00\x00')), QDataStream.ReadPastEnd, - QBitArray())) - data.append((QByteArray(py3k.b('\x00\x00\x00\x01')), QDataStream.ReadPastEnd, - QBitArray())) - data.append((QByteArray(py3k.b('\x00\x00\x00\x02')), QDataStream.ReadPastEnd, - QBitArray())) - data.append((QByteArray(py3k.b('\x00\x00\x00\x03')), QDataStream.ReadPastEnd, - QBitArray())) - data.append((QByteArray(py3k.b('\x00\x00\x00\x04')), QDataStream.ReadPastEnd, - QBitArray())) - - self._check_bitarray(data) - - def testCorruptData(self): - '''QDataStream reading corrupt data''' - data = [] - - data.append((QByteArray(py3k.b('\x00\x00\x00\x01\x02')), - QDataStream.ReadCorruptData, - QBitArray())) - - self._check_bitarray(data) class QDataStreamRawData(unittest.TestCase): def testRawData(self): @@ -352,10 +314,10 @@ class QDataStreamRawData(unittest.TestCase): ba = QByteArray() data = QDataStream(ba, QIODevice.WriteOnly) data.writeRawData('AB\x00C') - self.assertEqual(ba.data(), py3k.b('AB\x00C')) + self.assertEqual(ba.data(), bytes('AB\x00C', "UTF-8")) data = QDataStream(ba) - self.assertEqual(data.readRawData(4), py3k.b('AB\x00C')) + self.assertEqual(data.readRawData(4), bytes('AB\x00C', "UTF-8")) if __name__ == '__main__': unittest.main() |