Implement proper slice assignment for QByteArray

Index assignment now only accept str/bytes, bytearray, QByteArray with
size 1;
Slice assignment only accept str/bytes, bytearray, QByteArray with
limitation, that is if the step is not 1, then the number slots and
the size of the target value must be equal.

Range delete: a[2:5] = None
Shrink: value length smaller than the slot length of the slice
Expanse: value length bigger than the slot length of the slice
Range assignment with step: a[2:5:1] = ...
Range assignment with step which bigger than 1: a[2:9:2] = ...
Range assignment with native step: a[5:2:-1]

Change-Id: Ib9b929d09a691ed18c91e0c1c6b5dde827bf8d42
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 85 insertions, 40 deletions

diff --git a/sources/pyside2/tests/QtCore/qbytearray_test.py b/sources/pyside2/tests/QtCore/qbytearray_test.py
index 3f7de66fb..dba9ecfea 100644
--- a/sources/pyside2/tests/QtCore/qbytearray_test.py
+++ b/sources/pyside2/tests/QtCore/qbytearray_test.py
@@ -108,46 +108,6 @@ class QByteArrayOperatorAtSetter(unittest.TestCase):
         obj[1] = py3k.b('0')
         self.assertEqual(obj, QByteArray(py3k.b('103456')))
 
-    def testSetterStringLarge(self):
-        '''QByteArray[x] = pythonstring (larget than 1 char)'''
-        obj = QByteArray(py3k.b('123456'))
-        obj[3] = py3k.b('abba')
-        self.assertEqual(obj, QByteArray(py3k.b('123abba56')))
-
-    def testSetterQByteArray(self):
-        '''QByteArray[x] = qbytearray'''
-        obj = QByteArray(py3k.b('123456'))
-        obj[3] = QByteArray(py3k.b('array'))
-        self.assertEqual(obj, QByteArray(py3k.b('123array56')))
-
-
-class QByteArrayOperatorAtSetterNegativeIndex(unittest.TestCase):
-    '''Test case for QByteArray[] - __setitem__ - for negative index'''
-
-    def testSetterNegativeIndex(self):
-        '''QByteArray[x] = string - negative index'''
-        obj = QByteArray(py3k.b('123456'))
-        obj[-3] = py3k.b('array')
-        self.assertEqual(obj, QByteArray(py3k.b('123array56')))
-
-
-class QByteArrayOperatorAtSetterLargeIndex(unittest.TestCase):
-    '''Test case for QByteArray[] - __setitem__ - for 'overflown' index'''
-
-    def testSetterLargeIndexEmpty(self):
-        '''QByteArray[x] = somestring - Overflow index on empty string'''
-        # should pad with spaces if the index is larger
-        obj = QByteArray(py3k.b(''))
-        obj[2] = py3k.b('a')
-        self.assertEqual(obj, QByteArray(py3k.b('  a')))
-
-    def testSetterLargeIndexNormal(self):
-        '''QByteArray[x] = somestring - Overflow index on normal string'''
-        # should pad with spaces if the index is larger
-        obj = QByteArray(py3k.b('mystring'))
-        obj[10] = py3k.b('normal')
-        self.assertEqual(obj, QByteArray(py3k.b('mystring  normal')))
-
 class QByteArrayOnQDataStream(unittest.TestCase):
     '''
     Bug PYSIDE-232
@@ -221,5 +181,90 @@ class QByteArrayImplicitConvert(unittest.TestCase):
         self.assertRaises(TypeError, obj.setObjectName, ba)
 
 
+class QByteArraySliceAssignment(unittest.TestCase):
+    def testIndexAssignment(self):
+        a = QByteArray(py3k.b('abc'))
+        a[0] = py3k.b('x')
+        self.assertEqual(a[0], py3k.b('x'))
+
+        def test_1():
+            a[0] = py3k.b('xy')
+        self.assertRaises(ValueError, test_1)
+
+    def testSliceAssignmentBytes(self):
+        b = QByteArray(py3k.b('0123456789'))
+        b[2:8] = py3k.b('abcdef')
+        self.assertEqual(b[2:8], py3k.b('abcdef'))
+        # Delete behavior
+        b[2:8] = None
+        self.assertEqual(b, py3k.b('0189'))
+
+        # number of slots and number of values doesn't match
+        def test_2():
+            b[2:8:2] = py3k.b('')
+        self.assertRaises(ValueError, test_2)
+        b = QByteArray(py3k.b('0123456789'))
+        # reverse slice
+        b[5:2:-1] = py3k.b('ABC')
+        self.assertEqual(b, py3k.b('012CBA6789'))
+        # step is not 1
+        b[2:9:3] = py3k.b('XYZ')
+        self.assertEqual(b, py3k.b('01XCBY67Z9'))
+        b = QByteArray(py3k.b('0123456789'))
+        b[9:2:-3] = py3k.b('XYZ')
+        self.assertEqual(b, py3k.b('012Z45Y78X'))
+
+    def testSliceAssignmentQByteArray(self):
+        b = QByteArray(py3k.b('0123456789'))
+        b[2:8] = QByteArray(py3k.b('abcdef'))
+        self.assertEqual(b[2:8], py3k.b('abcdef'))
+        # shrink
+        b[2:8] = QByteArray(py3k.b('aaa'))
+        self.assertEqual(b, py3k.b('01aaa89'))
+        # expanse
+        b[2:5] = QByteArray(py3k.b('uvwxyz'))
+        self.assertEqual(b, py3k.b('01uvwxyz89'))
+        # Delete behavior
+        b[2:8] = QByteArray()
+        self.assertEqual(b, py3k.b('0189'))
+
+        b = QByteArray(py3k.b('0123456789'))
+        # reverse assginment
+        b[5:2:-1] = QByteArray(py3k.b('ABC'))
+        self.assertEqual(b, py3k.b('012CBA6789'))
+        # step is not 1
+        b[2:9:3] = QByteArray(py3k.b('XYZ'))
+        self.assertEqual(b, py3k.b('01XCBY67Z9'))
+        b = QByteArray(py3k.b('0123456789'))
+        b[9:2:-3] = QByteArray(py3k.b('XYZ'))
+        self.assertEqual(b, py3k.b('012Z45Y78X'))
+
+    def testSliceAssignmentByteArray(self):
+        b = QByteArray(py3k.b('0123456789'))
+        # replace
+        b[2:8] = bytearray(py3k.b('abcdef'))
+        self.assertEqual(b[2:8], py3k.b('abcdef'))
+        # shrink
+        b[2:8] = bytearray(py3k.b('aaa'))
+        self.assertEqual(b, py3k.b('01aaa89'))
+        # expanse
+        b[2:5] = bytearray(py3k.b('uvwxyz'))
+        self.assertEqual(b, py3k.b('01uvwxyz89'))
+        # Delete behavior
+        b[2:8] = bytearray(py3k.b(''))
+        self.assertEqual(b, py3k.b('0189'))
+
+        b = QByteArray(py3k.b('0123456789'))
+        # reverse assginment
+        b[5:2:-1] = bytearray(py3k.b('ABC'))
+        self.assertEqual(b, py3k.b('012CBA6789'))
+        # step is not 1
+        b[2:9:3] = bytearray(py3k.b('XYZ'))
+        self.assertEqual(b, py3k.b('01XCBY67Z9'))
+        b = QByteArray(py3k.b('0123456789'))
+        b[9:2:-3] = bytearray(py3k.b('XYZ'))
+        self.assertEqual(b, py3k.b('012Z45Y78X'))
+
+
 if __name__ == '__main__':
     unittest.main()