Fix moveAppend() implementation

When appending multiple items, we are fine with providing
weak exception safety only. This implies that we can simplify
the moveAppend() code and avoid having to potentiall
call destructors in there.

Change-Id: I31cef0e8589e28f3d3521c54db3f7910628e686f
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 1 insertions, 52 deletions

diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 9aa1b4e668..f39389fa60 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -2375,7 +2375,7 @@ void tst_QArrayData::exceptionSafetyPrimitives_constructor()
     {
         auto data = createDataPointer<ThrowingType>(20, 10);
         const auto originalSize = data.size;
-        std::array<ThrowingType, 0> emptyRange{};
+        const std::array<ThrowingType, 0> emptyRange{};
 
         doConstruction(data, data.end(), [] (Constructor &ctor) { return ctor.create(0); });
         QCOMPARE(data.size, originalSize);
@@ -2389,11 +2389,6 @@ void tst_QArrayData::exceptionSafetyPrimitives_constructor()
             return ctor.clone(0, ThrowingType(42));
         });
         QCOMPARE(data.size, originalSize);
-
-        doConstruction(data, data.end(), [emptyRange] (Constructor &ctor) mutable {
-            return ctor.move(emptyRange.begin(), emptyRange.end());
-        });
-        QCOMPARE(data.size, originalSize);
     }
 
     // successful create
@@ -2437,24 +2432,6 @@ void tst_QArrayData::exceptionSafetyPrimitives_constructor()
             QCOMPARE(data.data()[i], reference.data()[i]);
     }
 
-    // successful move
-    {
-        auto data = createDataPointer<ThrowingType>(20, 10);
-        auto reference = createDataPointer<ThrowingType>(20, 10);
-        std::array<ThrowingType, 3> source = {
-            ThrowingType(42), ThrowingType(43), ThrowingType(44)
-        };
-        reference->copyAppend(source.begin(), source.end());
-
-        doConstruction(data, data.end(), [source] (Constructor &ctor) mutable {
-            return ctor.move(source.begin(), source.end());
-        });
-
-        QCOMPARE(data.size, reference.size);
-        for (qsizetype i = 0; i < data.size; ++i)
-            QCOMPARE(data.data()[i], reference.data()[i]);
-    }
-
     // failed create
     {
         auto data = createDataPointer<ThrowingType>(20, 10);
@@ -2528,34 +2505,6 @@ void tst_QArrayData::exceptionSafetyPrimitives_constructor()
             }
         }
     }
-
-    // failed move
-    {
-        auto data = createDataPointer<ThrowingType>(20, 10);
-        auto reference = createDataPointer<ThrowingType>(20, 10);
-        std::array<ThrowingType, 4> source = {
-            ThrowingType(42), ThrowingType(43), ThrowingType(44), ThrowingType(170)
-        };
-
-        for (uint throwOnNthConstruction : {1, 3}) {
-            WatcherScope scope; Q_UNUSED(scope);
-            try {
-                ThrowingType::throwOnce = throwOnNthConstruction;
-                doConstruction(data, data.end(), [source] (Constructor &ctor) mutable {
-                    return ctor.move(source.begin(), source.end());
-                });
-            } catch (const std::runtime_error &e) {
-                QCOMPARE(std::string(e.what()), ThrowingType::throwString);
-                QCOMPARE(data.size, reference.size);
-                for (qsizetype i = 0; i < data.size; ++i)
-                    QCOMPARE(data.data()[i], reference.data()[i]);
-                const auto destroyedSize = throwingTypeWatcher().destroyedIds.size();
-                QCOMPARE(destroyedSize, (throwOnNthConstruction - 1));
-                for (size_t i = 0; i < destroyedSize; ++i)
-                    QCOMPARE(throwingTypeWatcher().destroyedIds[i], source[destroyedSize - i - 1]);
-            }
-        }
-    }
 }
 
 void tst_QArrayData::exceptionSafetyPrimitives_destructor()