summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-02 13:44:17 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-02 13:44:17 (GMT)
commit501d1395bd3fc6c67e50216345959d31c0db7707 (patch)
tree0fcbc61cf5251f8e70bb4ed86391e184b32f9dde /tests
parentd70839d4fd855d6d5f6bf8d982b677402f71e5ba (diff)
downloadQt-501d1395bd3fc6c67e50216345959d31c0db7707.zip
Qt-501d1395bd3fc6c67e50216345959d31c0db7707.tar.gz
Qt-501d1395bd3fc6c67e50216345959d31c0db7707.tar.bz2
Revert "Add support for creating the object alongside the Data structure in QSharedPointer"
This reverts commit fb51a10ee0451274a430227566ae26efb2ac4474. Sorry, it didn't work. I can fix the MSVC error, but the problem is that older GCC versions (4.2) fail with the following code: template<typename T> struct Buffer { char buffer[128] __attribute__((aligned(__alignof__(T)))); }; The same works fine in GCC 4.4.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsharedpointer/tst_qsharedpointer.cpp102
1 files changed, 2 insertions, 100 deletions
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index dd53e3c..5cb435a 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -65,9 +65,8 @@ private slots:
void dynamicCastVirtualBase();
void dynamicCastFailure();
#endif
- void constCorrectness();
void customDeleter();
- void creating();
+ void constCorrectness();
void validConstructs();
void invalidConstructs_data();
void invalidConstructs();
@@ -105,8 +104,6 @@ public:
{
delete this;
}
-
- virtual int classLevel() { return 1; }
};
int Data::generationCounter = 0;
int Data::destructorCounter = 0;
@@ -335,8 +332,6 @@ public:
{
delete this;
}
-
- virtual int classLevel() { return 2; }
};
int DerivedData::derivedDestructorCounter = 0;
@@ -344,23 +339,15 @@ class Stuffing
{
public:
char buffer[16];
- Stuffing() { for (uint i = 0; i < sizeof buffer; ++i) buffer[i] = 16 - i; }
virtual ~Stuffing() { }
};
class DiffPtrDerivedData: public Stuffing, public Data
{
-public:
- virtual int classLevel() { return 3; }
};
class VirtualDerived: virtual public Data
{
-public:
- int moreData;
-
- VirtualDerived() : moreData(0xc0ffee) { }
- virtual int classLevel() { return 4; }
};
void tst_QSharedPointer::downCast()
@@ -1006,82 +993,6 @@ void tst_QSharedPointer::customDeleter()
QCOMPARE(derivedDataDeleter.callCount, 1);
}
-void tst_QSharedPointer::creating()
-{
- Data::generationCounter = Data::destructorCounter = 0;
- {
- QSharedPointer<Data> ptr = QSharedPointer<Data>::create();
- QVERIFY(ptr.data());
- QCOMPARE(Data::generationCounter, 1);
- QCOMPARE(ptr->generation, 1);
- QCOMPARE(Data::destructorCounter, 0);
-
- QCOMPARE(ptr->classLevel(), 1);
-
- ptr.clear();
- QCOMPARE(Data::destructorCounter, 1);
- }
-
- Data::generationCounter = Data::destructorCounter = 0;
- {
- QSharedPointer<Data> ptr = QSharedPointer<Data>::create();
- QWeakPointer<Data> weakptr = ptr;
- QtSharedPointer::ExternalRefCountData *d = ptr.d;
-
- ptr.clear();
- QVERIFY(ptr.isNull());
- QCOMPARE(Data::destructorCounter, 1);
-
- // valgrind will complain here if something happened to the pointer
- QVERIFY(d->weakref == 1);
- QVERIFY(d->strongref == 0);
- }
-
- Data::generationCounter = Data::destructorCounter = 0;
- DerivedData::derivedDestructorCounter = 0;
- {
- QSharedPointer<Data> ptr = QSharedPointer<DerivedData>::create();
- QCOMPARE(ptr->classLevel(), 2);
- QCOMPARE(ptr.staticCast<DerivedData>()->moreData, 0);
- ptr.clear();
-
- QCOMPARE(Data::destructorCounter, 1);
- QCOMPARE(DerivedData::derivedDestructorCounter, 1);
- }
-
- {
- QSharedPointer<Data> ptr = QSharedPointer<DiffPtrDerivedData>::create();
- QCOMPARE(ptr->classLevel(), 3);
- QCOMPARE(ptr.staticCast<DiffPtrDerivedData>()->buffer[7]+0, 16-7);
- QCOMPARE(ptr.staticCast<DiffPtrDerivedData>()->buffer[3]+0, 16-3);
- QCOMPARE(ptr.staticCast<DiffPtrDerivedData>()->buffer[0]+0, 16);
- }
-
- {
- QSharedPointer<VirtualDerived> ptr = QSharedPointer<VirtualDerived>::create();
- QCOMPARE(ptr->classLevel(), 4);
- QCOMPARE(ptr->moreData, 0xc0ffee);
-
- QSharedPointer<Data> baseptr = ptr;
- QCOMPARE(baseptr->classLevel(), 4);
- }
-
- {
- QSharedPointer<QObject> ptr = QSharedPointer<QObject>::create();
- QCOMPARE(ptr->metaObject(), &QObject::staticMetaObject);
-
- QPointer<QObject> qptr = ptr.data();
- ptr.clear();
-
- QVERIFY(qptr.isNull());
- }
-
- {
- QSharedPointer<QObject> ptr = QSharedPointer<OtherObject>::create();
- QCOMPARE(ptr->metaObject(), &OtherObject::staticMetaObject);
- }
-}
-
void tst_QSharedPointer::validConstructs()
{
{
@@ -1133,9 +1044,6 @@ void tst_QSharedPointer::invalidConstructs_data()
<< "forwardDeclaredDestructorRunCount = 0;\n"
"{ QSharedPointer<ForwardDeclared> ptr = QSharedPointer<ForwardDeclared>(forwardPointer()); }\n"
"exit(forwardDeclaredDestructorRunCount);";
- QTest::newRow("creating-forward-declaration")
- << &QTest::QExternalTest::tryCompileFail
- << "QSharedPointer<ForwardDeclared>::create();";
// upcast without cast operator:
QTest::newRow("upcast1")
@@ -1168,16 +1076,10 @@ void tst_QSharedPointer::invalidConstructs_data()
<< "QSharedPointer<const Data> baseptr = QSharedPointer<const Data>(new Data);\n"
"qSharedPointerDynamicCast<DerivedData>(baseptr);";
#endif
- QTest::newRow("const-dropping-object-cast1")
+ QTest::newRow("const-dropping-object-cast")
<< &QTest::QExternalTest::tryCompileFail
<< "QSharedPointer<const QObject> baseptr = QSharedPointer<const QObject>(new QObject);\n"
"qSharedPointerObjectCast<QCoreApplication>(baseptr);";
-#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
- QTest::newRow("const-dropping-object-cast2")
- << &QTest::QExternalTest::tryCompileFail
- << "QSharedPointer<const QObject> baseptr = QSharedPointer<const QObject>(new QObject);\n"
- "qobject_cast<QCoreApplication *>(baseptr);";
-#endif
// arithmethics through automatic cast operators
QTest::newRow("arithmethic1")