feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: dumper tests code cosmetics

Browse Source 
Mainly squash compiler noise about 'offsetof'.
This commit is contained in:
hjk
2009-08-11 15:51:50 +02:00
parent bc61f9ddd9
commit 5435b09622
1 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/auto/debugger/main.cpp
View File

@@ -467,7 +467,8 @@ void tst_Debugger::dumperCompatibility()
// Ensure that no arbitrary padding is introduced by QVectorTypedData. // Ensure that no arbitrary padding is introduced by QVectorTypedData.
const size_t qVectorDataSize = 16; const size_t qVectorDataSize = 16;
QCOMPARE(sizeof(QVectorData), qVectorDataSize); QCOMPARE(sizeof(QVectorData), qVectorDataSize);
QCOMPARE( ((size_t)&(((QVectorTypedData<int> *)(0))->array)), qVectorDataSize); QVectorTypedData<int> *v = 0;
QCOMPARE(size_t(&v->array), qVectorDataSize);
} }
static const QByteArray utfToBase64(const QString &string) static const QByteArray utfToBase64(const QString &string)
@@ -693,6 +694,7 @@ void tst_Debugger::dumpQAbstractItemAndModelIndex()
int columnCount(const QModelIndex &parent = QModelIndex()) const int columnCount(const QModelIndex &parent = QModelIndex()) const
{ {
Q_UNUSED(parent);
return 1; return 1;
} }
@@ -753,7 +755,9 @@ void tst_Debugger::dumpQAbstractItemAndModelIndex()
mutable int parent2; mutable int parent2;
mutable int parent2Child1; mutable int parent2Child1;
mutable int parent2Child2; mutable int parent2Child2;
} m2; };
PseudoTreeItemModel m2;
// Case 2: ModelIndex with one child. // Case 2: ModelIndex with one child.
QModelIndex index2 = m2.index(0, 0); QModelIndex index2 = m2.index(0, 0);
@@ -892,7 +896,6 @@ void tst_Debugger::dumpQCharHelper(QChar &c)
+ QByteArray("',numchild='0'"), &c, NS"QChar", false); + QByteArray("',numchild='0'"), &c, NS"QChar", false);
} }
void tst_Debugger::dumpQChar() void tst_Debugger::dumpQChar()
{ {
// Case 1: Printable ASCII character. // Case 1: Printable ASCII character.
@@ -977,7 +980,6 @@ void tst_Debugger::dumpQFileHelper(const QString &name, bool exists)
QByteArray("',type='"NS"QString',numchild='0',valueencoded='2'},{name='exists',value=") + QByteArray("',type='"NS"QString',numchild='0',valueencoded='2'},{name='exists',value=") +
QByteArray(boolToVal(exists)) + QByteArray(",type='bool',numchild='0'}]"), QByteArray(boolToVal(exists)) + QByteArray(",type='bool',numchild='0'}]"),
&file, NS"QFile", true); &file, NS"QFile", true);
} }
void tst_Debugger::dumpQFile() void tst_Debugger::dumpQFile()
@@ -1058,9 +1060,10 @@ template <typename K, typename V>
{ {
typename QHash<K, V>::iterator it = hash.begin(); typename QHash<K, V>::iterator it = hash.begin();
typedef QHashNode<K, V> HashNode; typedef QHashNode<K, V> HashNode;
HashNode *dummy = 0;
HashNode *node = HashNode *node =
reinterpret_cast<HashNode *>(reinterpret_cast<char *>(const_cast<K *>(&it.key())) - reinterpret_cast<HashNode *>(reinterpret_cast<char *>(const_cast<K *>(&it.key())) -
offsetof(HashNode, key)); size_t(&dummy->key));
const K &key = it.key(); const K &key = it.key();
const V &val = it.value(); const V &val = it.value();
QByteArray expected("value='"); QByteArray expected("value='");
@@ -1258,7 +1261,8 @@ void tst_Debugger::dumpQLocale()
dumpQLocaleHelper(swahili); dumpQLocaleHelper(swahili);
} }
template <typename K, typename V> const QByteArray getMapType(K keyDummy, V valDummy) template <typename K, typename V>
QByteArray getMapType(K keyDummy, V valDummy)
{ {
return QByteArray(typeToString(keyDummy)) + "@" + QByteArray(typeToString(valDummy)); return QByteArray(typeToString(keyDummy)) + "@" + QByteArray(typeToString(valDummy));
} }
@@ -1267,9 +1271,10 @@ template <typename K, typename V>
void getMapNodeParams(size_t &nodeSize, size_t &valOffset) void getMapNodeParams(size_t &nodeSize, size_t &valOffset)
{ {
#if QT_VERSION >= 0x040500 #if QT_VERSION >= 0x040500
typedef QMapNode<K, V> node_t; typedef QMapNode<K, V> NodeType;
nodeSize = sizeof(node_t); NodeType *node = 0;
valOffset = offsetof(node_t, value); nodeSize = sizeof(NodeType);
valOffset = size_t(&node->value);
#else #else
nodeSize = sizeof(K) + sizeof(V) + 2*sizeof(void *); nodeSize = sizeof(K) + sizeof(V) + 2*sizeof(void *);
valOffset = sizeof(K); valOffset = sizeof(K);
@@ -1395,7 +1400,7 @@ template <typename K, typename V>
typename QMap<K, V>::iterator it = m.begin(); typename QMap<K, V>::iterator it = m.begin();
const K &key = it.key(); const K &key = it.key();
const V &val = it.value(); const V &val = it.value();
const char * const keyType = typeToString(key); //const char * const keyType = typeToString(key);
QByteArray expected = QByteArray("value='',numchild='2'," QByteArray expected = QByteArray("value='',numchild='2',"
"children=[{name='key',addr='").append(ptrToBa(&key)). "children=[{name='key',addr='").append(ptrToBa(&key)).
append("',type='").append(typeToString(key)).append("',value='"). append("',type='").append(typeToString(key)).append("',value='").
@@ -2195,7 +2200,9 @@ void tst_Debugger::dumpQTextCodec()
#define VERIFY_OFFSETOF(member) \ #define VERIFY_OFFSETOF(member) \
do { \ do { \
QVERIFY(offsetof(QObjectPrivate, member) == offsetof(ObjectPrivate, member)); \ QObjectPrivate *qob = 0; \
ObjectPrivate *ob = 0; \
QVERIFY(size_t(&qob->member) == size_t(&ob->member)); \
} while (0) } while (0)