1 files changed, 116 insertions, 7 deletions

diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index b5912badf2..7998f7b7fd 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -57,11 +57,13 @@ private slots:
     void basics_data();
     void basics();
     void operators();
+    void nullptrOps();
     void swap();
     void moveSemantics();
     void useOfForwardDeclared();
     void memoryManagement();
     void dropLastReferenceOfForwardDeclared();
+    void nonVirtualDestructors();
     void lock();
     void downCast();
     void functionCallDownCast();
@@ -362,6 +364,30 @@ void tst_QSharedPointer::operators()
     QCOMPARE(qHash(p2), qHash(p2.data()));
 }
 
+void tst_QSharedPointer::nullptrOps()
+{
+    QSharedPointer<char> p1(nullptr);
+    QSharedPointer<char> p2 = nullptr;
+    QSharedPointer<char> null;
+
+    QVERIFY(p1 == null);
+    QVERIFY(p2 == null);
+    QVERIFY(!p1.data());
+    QVERIFY(!p2.data());
+
+    QSharedPointer<char> p3 = p1;
+    QVERIFY(p3 == null);
+    QVERIFY(!p3.data());
+
+    p3 = nullptr;
+
+    // check for non-ambiguity
+    QSharedPointer<char> p1_zero(0);
+    QSharedPointer<char> p2_zero = 0;
+
+    p3 = 0;
+}
+
 void tst_QSharedPointer::swap()
 {
     QSharedPointer<int> p1, p2(new int(42)), control = p2;
@@ -578,6 +604,56 @@ void tst_QSharedPointer::dropLastReferenceOfForwardDeclared()
     QCOMPARE(forwardDeclaredDestructorRunCount, 1);
 }
 
+// NVD for "non-virtual destructor"
+struct NVDData
+{
+    static int destructorCounter;
+    ~NVDData() { ++destructorCounter; }
+
+    int dummy;
+};
+int NVDData::destructorCounter;
+
+struct NVDDerivedData : NVDData
+{
+    static int destructorCounter;
+    ~NVDDerivedData() { ++destructorCounter; }
+};
+int NVDDerivedData::destructorCounter;
+
+void tst_QSharedPointer::nonVirtualDestructors()
+{
+    NVDData::destructorCounter = NVDDerivedData::destructorCounter = 0;
+    {
+        QSharedPointer<NVDData> ptr(new NVDData);
+    }
+    QCOMPARE(NVDData::destructorCounter, 1);
+    QCOMPARE(NVDDerivedData::destructorCounter, 0);
+
+    NVDData::destructorCounter = NVDDerivedData::destructorCounter = 0;
+    {
+        QSharedPointer<NVDDerivedData> ptr(new NVDDerivedData);
+    }
+    QCOMPARE(NVDData::destructorCounter, 1);
+    QCOMPARE(NVDDerivedData::destructorCounter, 1);
+
+    NVDData::destructorCounter = NVDDerivedData::destructorCounter = 0;
+    {
+        QSharedPointer<NVDData> bptr;
+        QSharedPointer<NVDDerivedData> ptr(new NVDDerivedData);
+        bptr = ptr;
+    }
+    QCOMPARE(NVDData::destructorCounter, 1);
+    QCOMPARE(NVDDerivedData::destructorCounter, 1);
+
+    NVDData::destructorCounter = NVDDerivedData::destructorCounter = 0;
+    {
+        QSharedPointer<NVDData> ptr(new NVDDerivedData);
+    }
+    QCOMPARE(NVDData::destructorCounter, 1);
+    QCOMPARE(NVDDerivedData::destructorCounter, 1);
+}
+
 void tst_QSharedPointer::lock()
 {
     QSharedPointer<int> sp = QSharedPointer<int>::create();
@@ -1310,6 +1386,18 @@ template<typename T> int CustomDeleter<T>::callCount = 0;
 void tst_QSharedPointer::customDeleter()
 {
     {
+        QSharedPointer<Data> ptr(0, &Data::doDelete);
+        QSharedPointer<Data> ptr2(0, &Data::alsoDelete);
+        QSharedPointer<Data> ptr3(0, &Data::virtualDelete);
+    }
+    safetyCheck();
+    {
+        QSharedPointer<Data> ptr(nullptr, &Data::doDelete);
+        QSharedPointer<Data> ptr2(nullptr, &Data::alsoDelete);
+        QSharedPointer<Data> ptr3(nullptr, &Data::virtualDelete);
+    }
+    safetyCheck();
+    {
         QSharedPointer<Data> ptr(new Data, &Data::doDelete);
         QSharedPointer<Data> ptr2(new Data, &Data::alsoDelete);
         QSharedPointer<Data> ptr3(new Data, &Data::virtualDelete);
@@ -1492,6 +1580,33 @@ void tst_QSharedPointer::customDeleter()
     QCOMPARE(refcount, 2);
     safetyCheck();
 
+    CustomDeleter<NVDData> nvdeleter;
+    nvdeleter.callCount = 0;
+    {
+        QSharedPointer<NVDData> ptr(new NVDData, nvdeleter);
+    }
+    QCOMPARE(nvdeleter.callCount, 1);
+    safetyCheck();
+
+    CustomDeleter<NVDDerivedData> nvderiveddeleter;
+    nvdeleter.callCount = 0;
+    nvderiveddeleter.callCount = 0;
+    {
+        QSharedPointer<NVDDerivedData> ptr(new NVDDerivedData, nvderiveddeleter);
+    }
+    QCOMPARE(nvdeleter.callCount, 0);
+    QCOMPARE(nvderiveddeleter.callCount, 1);
+    safetyCheck();
+
+    nvdeleter.callCount = 0;
+    nvderiveddeleter.callCount = 0;
+    {
+        QSharedPointer<NVDData> ptr(new NVDDerivedData, nvderiveddeleter);
+    }
+    QCOMPARE(nvdeleter.callCount, 0);
+    QCOMPARE(nvderiveddeleter.callCount, 1);
+    safetyCheck();
+
     // a custom deleter with a different pointer parameter
     {
         QSharedPointer<char> ptr(static_cast<char *>(malloc(1)), free);
@@ -1771,13 +1886,11 @@ void tst_QSharedPointer::threadStressTest_data()
     QTest::newRow("1+1") << 1 << 1;
 
     QTest::newRow("2+10") << 2 << 10;
-#ifndef Q_OS_WINCE
-    // Windows CE cannot run this many threads
+
     QTest::newRow("5+10") << 5 << 10;
     QTest::newRow("5+30") << 5 << 30;
 
     QTest::newRow("100+100") << 100 << 100;
-#endif
 }
 
 void tst_QSharedPointer::threadStressTest()
@@ -1811,11 +1924,7 @@ void tst_QSharedPointer::threadStressTest()
 
         base.clear();
 
-#ifdef Q_OS_WINCE
-        srand(QDateTime::currentDateTime().toTime_t());
-#else
         srand(time(NULL));
-#endif
         // start threads
         for (int i = 0; i < allThreads.count(); ++i)
             if (allThreads[i]) allThreads[i]->start();