QMap: add more negative tests to take() benchmark, bench detach()

Ensure each container size has one non-existing item test. Also, for
comparison, add "pure detach" tests with the same sizes as the take()
tests.

Amends the commit that added the take() benchmark.

Pick-to: 6.10 6.8 6.5
Change-Id: I4768be0cc73b03cc56ec4399320d1dbcfec75c9a
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 1bdaf02)
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

Author: marcmutz

tests/benchmarks/corelib/tools/qmap/tst_bench_qmap.cpp

@@ -40,6 +40,9 @@ private slots:
     void take_data();
     void take();
 
+    void detach_data();
+    void detach();
+
 private:
     QStringList helloEachWorld(int count);
 };
@@ -312,9 +315,11 @@ void tst_QMap::take_data()
     QTest::addRow("1 in {0}") << 1 << 1;
     QTest::addRow("0 in {0, 1}") << 2 << 0;
     QTest::addRow("1 in {0, 1}") << 2 << 1;
+    QTest::addRow("2 in {0, 1}") << 2 << 2;
     QTest::addRow("0 in {0...16}") << 17 << 0;
     QTest::addRow("7 in {0...16}") << 17 << 7;
     QTest::addRow("16 in {0...16}") << 17 << 16;
+    QTest::addRow("17 in {0...16}") << 17 << 17;
     QTest::addRow("1024 in {0...2047}") << 2048 << 1024;
 }
 
@@ -333,6 +338,28 @@ void tst_QMap::take()
     }
 }
 
+void tst_QMap::detach_data()
+{
+    QTest::addColumn<int>("size");
+
+    for (int sz : {0, 1, 2, 17, 2048})
+        QTest::addRow("%d", sz) << sz;
+}
+
+void tst_QMap::detach()
+{
+    QFETCH(const int, size);
+
+    QMap<int, QString> map;
+    for (int i = 0; i < size; ++i)
+        map[i] = QString::number(i);
+
+    QBENCHMARK {
+        auto copy = map;
+        copy.detach();
+    }
+}
+
 QTEST_MAIN(tst_QMap)
 
 #include "tst_bench_qmap.moc"