summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-05-03 15:58:24 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-18 10:46:43 +1000
commitdffae678ddfb124ade608b2fb0f062b72abfe1b7 (patch)
treec7a74a4524dc4d8a6e384f610db6860874b76b6d /tests/auto
parentfd714ec5aa3418b55c7c8bf7d77cbdb2a6798135 (diff)
Remove Q_ASSERT's from QVariant autotest.
Print a meaningful warning message instead of aborting in debug mode builds and failing silently in release mode builds. Change-Id: I44143c5fbe6b6af87bdf5bd231cfaf9a3c9c33f8 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit a8dc321b6669dd263a25a0cb5766e5b7150c6e20)
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qvariant/tst_qvariant.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index 3e65d7e728..69855a1597 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -3239,18 +3239,21 @@ struct MyData
{
void *ptr;
MyData() : ptr(this) {}
- ~MyData() { Q_ASSERT(ptr == this); }
+ ~MyData()
+ {
+ if (ptr != this) qWarning("MyData::~MyData(): object has moved");
+ }
MyData(const MyData& o) : ptr(this) { Q_ASSERT(o.ptr == &o); }
MyData &operator=(const MyData &o)
{
- Q_ASSERT(ptr == this);
- Q_ASSERT(o.ptr == &o);
+ if (ptr != this) qWarning("MyData::operator=(): object has moved");
+ if (o.ptr != &o) qWarning("MyData::operator=(): other object has moved");
return *this;
}
bool operator==(const MyData &o) const
{
- Q_ASSERT(ptr == this);
- Q_ASSERT(o.ptr == &o);
+ if (ptr != this) qWarning("MyData::operator==(): object has moved");
+ if (o.ptr != &o) qWarning("MyData::operator==(): other object has moved");
return true;
}
};