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

Autotests: More cleanup of tests, and initial marking of components belonged to.

Browse Source
This commit is contained in:
Bill King
2010-09-02 15:32:04 +10:00
parent f91ba77cee
commit 1f0b600b82
33 changed files with 250 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/aggregation/tst_aggregate.cpp
View File

@@ -31,6 +31,8 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
//TESTED_COMPONENT=src/libs/aggregation
class tst_Aggregate : public QObject class tst_Aggregate : public QObject
{ {
Q_OBJECT Q_OBJECT

4
tests/auto/auto.pro
View File

@@ -5,11 +5,13 @@ SUBDIRS += \
debugger \ debugger \
fakevim \ fakevim \
# profilereader \ # profilereader \
# profilewriter \
aggregation \ aggregation \
changeset \ changeset \
# icheckbuild \ # icheckbuild \
generichighlighter \ generichighlighter \
utils_stringutils utils_stringutils \
qml
contains (QT_CONFIG, declarative) { contains (QT_CONFIG, declarative) {
SUBDIRS += qml SUBDIRS += qml

2
tests/auto/changeset/tst_changeset.cpp
View File

@@ -31,6 +31,8 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
//TESTED_COMPONENT=src/utils/changeset
class tst_ChangeSet : public QObject class tst_ChangeSet : public QObject
{ {
Q_OBJECT Q_OBJECT

1
tests/auto/cplusplus/ast/tst_ast.cpp
View File

@@ -7,6 +7,7 @@
#include <Parser.h> #include <Parser.h>
#include <AST.h> #include <AST.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus; using namespace CPlusPlus;
class tst_AST: public QObject class tst_AST: public QObject

2
tests/auto/cplusplus/codegen/tst_codegen.cpp
View File

@@ -13,6 +13,8 @@
#include <QtDebug> #include <QtDebug>
#include <QTextDocument> #include <QTextDocument>
//TESTED_COMPONENT=src/libs/cplusplus
/*! /*!
Tests for various parts of the code generation. Well, okay, currently it only Tests for various parts of the code generation. Well, okay, currently it only
tests the InsertionPointLocator. tests the InsertionPointLocator.

1
tests/auto/cplusplus/findusages/tst_findusages.cpp
View File

@@ -15,6 +15,7 @@
#include <Symbols.h> #include <Symbols.h>
#include <Overview.h> #include <Overview.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus; using namespace CPlusPlus;
class CollectNames: public ASTVisitor class CollectNames: public ASTVisitor

1
tests/auto/cplusplus/lookup/tst_lookup.cpp
View File

@@ -13,6 +13,7 @@
#include <Symbols.h> #include <Symbols.h>
#include <Overview.h> #include <Overview.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus; using namespace CPlusPlus;
template <template <typename, typename> class _Map, typename _T1, typename _T2> template <template <typename, typename> class _Map, typename _T1, typename _T2>

1
tests/auto/cplusplus/preprocessor/preprocessor.pro
View File

@@ -1,6 +1,5 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on console depend_includepath CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase CONFIG += qtestlib testcase
TARGET = tst_$$TARGET
include(../shared/shared.pri) include(../shared/shared.pri)
SOURCES += tst_preprocessor.cpp SOURCES += tst_preprocessor.cpp

1
tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
View File

@@ -1,6 +1,7 @@
#include <QtTest> #include <QtTest>
#include <pp.h> #include <pp.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus; using namespace CPlusPlus;
class tst_Preprocessor: public QObject class tst_Preprocessor: public QObject

1
tests/auto/cplusplus/semantic/tst_semantic.cpp
View File

@@ -20,6 +20,7 @@
#include <ExpressionUnderCursor.h> #include <ExpressionUnderCursor.h>
#include <Names.h> #include <Names.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus; using namespace CPlusPlus;
class tst_Semantic: public QObject class tst_Semantic: public QObject

1
tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
View File

@@ -15,6 +15,7 @@
#include <Scope.h> #include <Scope.h>
#include <TypePrettyPrinter.h> #include <TypePrettyPrinter.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus; using namespace CPlusPlus;
class tst_TypePrettyPrinter: public QObject class tst_TypePrettyPrinter: public QObject

126
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -15,6 +15,8 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
//#include <QtTest/qtest_gui.h> //#include <QtTest/qtest_gui.h>
//TESTED_COMPONENT=src/plugins/debugger/gdb
static const char *pointerPrintFormat() static const char *pointerPrintFormat()
{ {
return sizeof(quintptr) == sizeof(long) ? "0x%lx" : "0x%llx"; return sizeof(quintptr) == sizeof(long) ? "0x%lx" : "0x%llx";
@@ -110,12 +112,12 @@ struct QString3 {
QString s1, s2, s3; QString s1, s2, s3;
}; };
class tst_Debugger : public QObject class tst_Dumpers : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
tst_Debugger() {} tst_Dumpers() {}
void testMi(const char* input) void testMi(const char* input)
{ {
@@ -213,7 +215,7 @@ private:
void dumpQTextCodecHelper(QTextCodec *codec); void dumpQTextCodecHelper(QTextCodec *codec);
}; };
void tst_Debugger::infoBreak() void tst_Dumpers::infoBreak()
{ {
// This tests the regular expression used in GdbEngine::extractDataFromInfoBreak // This tests the regular expression used in GdbEngine::extractDataFromInfoBreak
// to discover breakpoints in constructors. // to discover breakpoints in constructors.
@@ -358,7 +360,7 @@ QString niceType(QString type)
return type; return type;
} }
void tst_Debugger::niceType() void tst_Dumpers::niceType()
{ {
// cf. watchutils.cpp // cf. watchutils.cpp
QFETCH(QString, input); QFETCH(QString, input);
@@ -366,7 +368,7 @@ void tst_Debugger::niceType()
QCOMPARE(::niceType(input), simplified); QCOMPARE(::niceType(input), simplified);
} }
void tst_Debugger::niceType_data() void tst_Dumpers::niceType_data()
{ {
QTest::addColumn<QString>("input"); QTest::addColumn<QString>("input");
QTest::addColumn<QString>("simplified"); QTest::addColumn<QString>("simplified");
@@ -450,7 +452,7 @@ static const void *deref(const void *p)
return *reinterpret_cast<const char* const*>(p); return *reinterpret_cast<const char* const*>(p);
} }
void tst_Debugger::dumperCompatibility() void tst_Dumpers::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;
@@ -618,7 +620,7 @@ void getMapNodeParams(size_t &nodeSize, size_t &valOffset)
#endif #endif
} }
void tst_Debugger::dumpQAbstractItemHelper(QModelIndex &index) void tst_Dumpers::dumpQAbstractItemHelper(QModelIndex &index)
{ {
const QAbstractItemModel *model = index.model(); const QAbstractItemModel *model = index.model();
const QString &rowStr = N(index.row()); const QString &rowStr = N(index.row());
@@ -657,7 +659,7 @@ void tst_Debugger::dumpQAbstractItemHelper(QModelIndex &index)
testDumper(expected, &index, NS"QAbstractItem", true, indexSpecValue); testDumper(expected, &index, NS"QAbstractItem", true, indexSpecValue);
} }
void tst_Debugger::dumpQAbstractItemAndModelIndex() void tst_Dumpers::dumpQAbstractItemAndModelIndex()
{ {
class PseudoTreeItemModel : public QAbstractItemModel class PseudoTreeItemModel : public QAbstractItemModel
{ {
@@ -805,7 +807,7 @@ void tst_Debugger::dumpQAbstractItemAndModelIndex()
&index4, NS"QModelIndex", true); &index4, NS"QModelIndex", true);
} }
void tst_Debugger::dumpQAbstractItemModelHelper(QAbstractItemModel &m) void tst_Dumpers::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
{ {
QByteArray address = ptrToBa(&m); QByteArray address = ptrToBa(&m);
QByteArray expected = QByteArray("tiname='iname',addr='%'," QByteArray expected = QByteArray("tiname='iname',addr='%',"
@@ -839,7 +841,7 @@ void tst_Debugger::dumpQAbstractItemModelHelper(QAbstractItemModel &m)
testDumper(expected, &m, NS"QAbstractItemModel", true); testDumper(expected, &m, NS"QAbstractItemModel", true);
} }
void tst_Debugger::dumpQAbstractItemModel() void tst_Dumpers::dumpQAbstractItemModel()
{ {
// Case 1: No rows, one column. // Case 1: No rows, one column.
QStringList strList; QStringList strList;
@@ -873,7 +875,7 @@ void tst_Debugger::dumpQAbstractItemModel()
dumpQAbstractItemModelHelper(model); dumpQAbstractItemModelHelper(model);
} }
void tst_Debugger::dumpQByteArray() void tst_Dumpers::dumpQByteArray()
{ {
// Case 1: Empty object. // Case 1: Empty object.
QByteArray ba; QByteArray ba;
@@ -919,7 +921,7 @@ void tst_Debugger::dumpQByteArray()
&ba, NS"QByteArray", true); &ba, NS"QByteArray", true);
} }
void tst_Debugger::dumpQChar() void tst_Dumpers::dumpQChar()
{ {
// Case 1: Printable ASCII character. // Case 1: Printable ASCII character.
QChar c('X'); QChar c('X');
@@ -947,7 +949,7 @@ void tst_Debugger::dumpQChar()
&c, NS"QChar", false); &c, NS"QChar", false);
} }
void tst_Debugger::dumpQDateTimeHelper(const QDateTime &d, bool isNull) void tst_Dumpers::dumpQDateTimeHelper(const QDateTime &d, bool isNull)
{ {
QByteArray value; QByteArray value;
if (d.isNull()) if (d.isNull())
@@ -973,7 +975,7 @@ void tst_Debugger::dumpQDateTimeHelper(const QDateTime &d, bool isNull)
testDumper(expected, &d, NS"QDateTime", true); testDumper(expected, &d, NS"QDateTime", true);
} }
void tst_Debugger::dumpQDateTime() void tst_Dumpers::dumpQDateTime()
{ {
// Case 1: Null object. // Case 1: Null object.
QDateTime d; QDateTime d;
@@ -984,7 +986,7 @@ void tst_Debugger::dumpQDateTime()
dumpQDateTimeHelper(d, false); dumpQDateTimeHelper(d, false);
} }
void tst_Debugger::dumpQDir() void tst_Dumpers::dumpQDir()
{ {
// Case 1: Current working directory. // Case 1: Current working directory.
QDir dir = QDir::current(); QDir dir = QDir::current();
@@ -1006,7 +1008,7 @@ void tst_Debugger::dumpQDir()
} }
void tst_Debugger::dumpQFile() void tst_Dumpers::dumpQFile()
{ {
// Case 1: Empty file name => Does not exist. // Case 1: Empty file name => Does not exist.
QFile file1(""); QFile file1("");
@@ -1036,7 +1038,7 @@ void tst_Debugger::dumpQFile()
&file3, NS"QFile", true); &file3, NS"QFile", true);
} }
void tst_Debugger::dumpQFileInfo() void tst_Dumpers::dumpQFileInfo()
{ {
QFileInfo fi("."); QFileInfo fi(".");
QByteArray expected("value='%',valueencoded='2',type='$T',numchild='3'," QByteArray expected("value='%',valueencoded='2',type='$T',numchild='3',"
@@ -1138,7 +1140,7 @@ void tst_Debugger::dumpQFileInfo()
testDumper(expected, &fi, NS"QFileInfo", true); testDumper(expected, &fi, NS"QFileInfo", true);
} }
void tst_Debugger::dumpQHash() void tst_Dumpers::dumpQHash()
{ {
QHash<QString, QList<int> > hash; QHash<QString, QList<int> > hash;
hash.insert("Hallo", QList<int>()); hash.insert("Hallo", QList<int>());
@@ -1148,7 +1150,7 @@ void tst_Debugger::dumpQHash()
} }
template <typename K, typename V> template <typename K, typename V>
void tst_Debugger::dumpQHashNodeHelper(QHash<K, V> &hash) void tst_Dumpers::dumpQHashNodeHelper(QHash<K, V> &hash)
{ {
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;
@@ -1169,7 +1171,7 @@ void tst_Debugger::dumpQHashNodeHelper(QHash<K, V> &hash)
getMapType<K, V>(), "", sizeof(it.key()), sizeof(it.value())); getMapType<K, V>(), "", sizeof(it.key()), sizeof(it.value()));
} }
void tst_Debugger::dumpQHashNode() void tst_Dumpers::dumpQHashNode()
{ {
// Case 1: simple type -> simple type. // Case 1: simple type -> simple type.
QHash<int, int> hash1; QHash<int, int> hash1;
@@ -1192,7 +1194,7 @@ void tst_Debugger::dumpQHashNode()
dumpQHashNodeHelper(hash4); dumpQHashNodeHelper(hash4);
} }
void tst_Debugger::dumpQImageHelper(const QImage &img) void tst_Dumpers::dumpQImageHelper(const QImage &img)
{ {
QByteArray expected = "value='(%x%)',type='"NS"QImage',numchild='1'," QByteArray expected = "value='(%x%)',type='"NS"QImage',numchild='1',"
"children=[{name='data',type='"NS"QImageData',addr='%'}]" "children=[{name='data',type='"NS"QImageData',addr='%'}]"
@@ -1202,7 +1204,7 @@ void tst_Debugger::dumpQImageHelper(const QImage &img)
testDumper(expected, &img, NS"QImage", true); testDumper(expected, &img, NS"QImage", true);
} }
void tst_Debugger::dumpQImage() void tst_Dumpers::dumpQImage()
{ {
// Case 1: Null image. // Case 1: Null image.
QImage img; QImage img;
@@ -1217,7 +1219,7 @@ void tst_Debugger::dumpQImage()
dumpQImageHelper(img); dumpQImageHelper(img);
} }
void tst_Debugger::dumpQImageDataHelper(QImage &img) void tst_Dumpers::dumpQImageDataHelper(QImage &img)
{ {
const QByteArray ba(QByteArray::fromRawData((const char*) img.bits(), img.numBytes())); const QByteArray ba(QByteArray::fromRawData((const char*) img.bits(), img.numBytes()));
QByteArray expected = QByteArray("tiname='$I',addr='$A',type='"NS"QImageData',"). QByteArray expected = QByteArray("tiname='$I',addr='$A',type='"NS"QImageData',").
@@ -1227,7 +1229,7 @@ void tst_Debugger::dumpQImageDataHelper(QImage &img)
testDumper(expected, &img, NS"QImageData", false); testDumper(expected, &img, NS"QImageData", false);
} }
void tst_Debugger::dumpQImageData() void tst_Dumpers::dumpQImageData()
{ {
// Case 1: Null image. // Case 1: Null image.
QImage img; QImage img;
@@ -1243,7 +1245,7 @@ void tst_Debugger::dumpQImageData()
} }
template <typename T> template <typename T>
void tst_Debugger::dumpQLinkedListHelper(QLinkedList<T> &l) void tst_Dumpers::dumpQLinkedListHelper(QLinkedList<T> &l)
{ {
const int size = qMin(l.size(), 1000); const int size = qMin(l.size(), 1000);
const QString &sizeStr = N(size); const QString &sizeStr = N(size);
@@ -1281,7 +1283,7 @@ template <typename T>
testDumper(expected, &l, NS"QLinkedList", true, elemTypeStr); testDumper(expected, &l, NS"QLinkedList", true, elemTypeStr);
} }
void tst_Debugger::dumpQLinkedList() void tst_Dumpers::dumpQLinkedList()
{ {
// Case 1: Simple element type. // Case 1: Simple element type.
QLinkedList<int> l; QLinkedList<int> l;
@@ -1404,7 +1406,7 @@ void tst_Debugger::dumpQLinkedList()
} }
# endif # endif
void tst_Debugger::dumpQList_int() void tst_Dumpers::dumpQList_int()
{ {
QList<int> ilist; QList<int> ilist;
testDumper("value='<0 items>',valueeditable='false',numchild='0'," testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1419,7 +1421,7 @@ void tst_Debugger::dumpQList_int()
&ilist, NS"QList", true, "int"); &ilist, NS"QList", true, "int");
} }
void tst_Debugger::dumpQList_int_star() void tst_Dumpers::dumpQList_int_star()
{ {
QList<int *> ilist; QList<int *> ilist;
testDumper("value='<0 items>',valueeditable='false',numchild='0'," testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1435,7 +1437,7 @@ void tst_Debugger::dumpQList_int_star()
&ilist, NS"QList", true, "int*"); &ilist, NS"QList", true, "int*");
} }
void tst_Debugger::dumpQList_char() void tst_Dumpers::dumpQList_char()
{ {
QList<char> clist; QList<char> clist;
testDumper("value='<0 items>',valueeditable='false',numchild='0'," testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1450,7 +1452,7 @@ void tst_Debugger::dumpQList_char()
&clist, NS"QList", true, "char"); &clist, NS"QList", true, "char");
} }
void tst_Debugger::dumpQList_QString() void tst_Dumpers::dumpQList_QString()
{ {
QList<QString> slist; QList<QString> slist;
testDumper("value='<0 items>',valueeditable='false',numchild='0'," testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1465,7 +1467,7 @@ void tst_Debugger::dumpQList_QString()
&slist, NS"QList", true, NS"QString"); &slist, NS"QList", true, NS"QString");
} }
void tst_Debugger::dumpQList_Int3() void tst_Dumpers::dumpQList_Int3()
{ {
QList<Int3> i3list; QList<Int3> i3list;
testDumper("value='<0 items>',valueeditable='false',numchild='0'," testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1480,7 +1482,7 @@ void tst_Debugger::dumpQList_Int3()
&i3list, NS"QList", true, "Int3"); &i3list, NS"QList", true, "Int3");
} }
void tst_Debugger::dumpQList_QString3() void tst_Dumpers::dumpQList_QString3()
{ {
QList<QString3> s3list; QList<QString3> s3list;
testDumper("value='<0 items>',valueeditable='false',numchild='0'," testDumper("value='<0 items>',valueeditable='false',numchild='0',"
@@ -1495,7 +1497,7 @@ void tst_Debugger::dumpQList_QString3()
&s3list, NS"QList", true, "QString3"); &s3list, NS"QList", true, "QString3");
} }
void tst_Debugger::dumpQLocaleHelper(QLocale &loc) void tst_Dumpers::dumpQLocaleHelper(QLocale &loc)
{ {
QByteArray expected = QByteArray("value='%',type='$T',numchild='8'," QByteArray expected = QByteArray("value='%',type='$T',numchild='8',"
"children=[{name='country',%}," "children=[{name='country',%},"
@@ -1526,7 +1528,7 @@ void tst_Debugger::dumpQLocaleHelper(QLocale &loc)
testDumper(expected, &loc, NS"QLocale", true); testDumper(expected, &loc, NS"QLocale", true);
} }
void tst_Debugger::dumpQLocale() void tst_Dumpers::dumpQLocale()
{ {
QLocale english(QLocale::English); QLocale english(QLocale::English);
dumpQLocaleHelper(english); dumpQLocaleHelper(english);
@@ -1542,7 +1544,7 @@ void tst_Debugger::dumpQLocale()
} }
template <typename K, typename V> template <typename K, typename V>
void tst_Debugger::dumpQMapHelper(QMap<K, V> &map) void tst_Dumpers::dumpQMapHelper(QMap<K, V> &map)
{ {
QByteArray sizeStr(valToString(map.size())); QByteArray sizeStr(valToString(map.size()));
size_t nodeSize; size_t nodeSize;
@@ -1595,7 +1597,7 @@ template <typename K, typename V>
true, getMapType<K,V>(), "", 0, 0, nodeSize, valOff); true, getMapType<K,V>(), "", 0, 0, nodeSize, valOff);
} }
void tst_Debugger::dumpQMap() void tst_Dumpers::dumpQMap()
{ {
qDebug() << "QMap<int, int>"; qDebug() << "QMap<int, int>";
// Case 1: Simple type -> simple type. // Case 1: Simple type -> simple type.
@@ -1662,7 +1664,7 @@ void tst_Debugger::dumpQMap()
} }
template <typename K, typename V> template <typename K, typename V>
void tst_Debugger::dumpQMapNodeHelper(QMap<K, V> &m) void tst_Dumpers::dumpQMapNodeHelper(QMap<K, V> &m)
{ {
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();
@@ -1682,7 +1684,7 @@ template <typename K, typename V>
true, getMapType<K,V>(), "", 0, 0, nodeSize, valOffset); true, getMapType<K,V>(), "", 0, 0, nodeSize, valOffset);
} }
void tst_Debugger::dumpQMapNode() void tst_Dumpers::dumpQMapNode()
{ {
// Case 1: simple type -> simple type. // Case 1: simple type -> simple type.
QMap<int, int> map; QMap<int, int> map;
@@ -1705,7 +1707,7 @@ void tst_Debugger::dumpQMapNode()
dumpQMapNodeHelper(map4); dumpQMapNodeHelper(map4);
} }
void tst_Debugger::dumpQObject() void tst_Dumpers::dumpQObject()
{ {
QObject parent; QObject parent;
testDumper("value='',valueencoded='2',type='$T',displayedtype='QObject'," testDumper("value='',valueencoded='2',type='$T',displayedtype='QObject',"
@@ -1764,7 +1766,7 @@ void tst_Debugger::dumpQObject()
&child, NS"QObject", false); &child, NS"QObject", false);
} }
void tst_Debugger::dumpQObjectChildListHelper(QObject &o) void tst_Dumpers::dumpQObjectChildListHelper(QObject &o)
{ {
const QObjectList children = o.children(); const QObjectList children = o.children();
const int size = children.size(); const int size = children.size();
@@ -1784,7 +1786,7 @@ void tst_Debugger::dumpQObjectChildListHelper(QObject &o)
testDumper(expected, &o, NS"QObjectChildList", true); testDumper(expected, &o, NS"QObjectChildList", true);
} }
void tst_Debugger::dumpQObjectChildList() void tst_Dumpers::dumpQObjectChildList()
{ {
// Case 1: Object with no children. // Case 1: Object with no children.
QObject o; QObject o;
@@ -1799,7 +1801,7 @@ void tst_Debugger::dumpQObjectChildList()
dumpQObjectChildListHelper(o); dumpQObjectChildListHelper(o);
} }
void tst_Debugger::dumpQObjectMethodList() void tst_Dumpers::dumpQObjectMethodList()
{ {
QStringListModel m; QStringListModel m;
testDumper("addr='<synthetic>',type='$T',numchild='24'," testDumper("addr='<synthetic>',type='$T',numchild='24',"
@@ -1831,7 +1833,7 @@ void tst_Debugger::dumpQObjectMethodList()
&m, NS"QObjectMethodList", true); &m, NS"QObjectMethodList", true);
} }
void tst_Debugger::dumpQObjectPropertyList() void tst_Dumpers::dumpQObjectPropertyList()
{ {
// Case 1: Model without a parent. // Case 1: Model without a parent.
QStringListModel m(QStringList() << "Test1" << "Test2"); QStringListModel m(QStringList() << "Test1" << "Test2");
@@ -1884,7 +1886,7 @@ public:
typedef QVector<QObjectPrivate::ConnectionList> ConnLists; typedef QVector<QObjectPrivate::ConnectionList> ConnLists;
void tst_Debugger::dumpQObjectSignalHelper(QObject &o, int sigNum) void tst_Dumpers::dumpQObjectSignalHelper(QObject &o, int sigNum)
{ {
//qDebug() << o.objectName() << sigNum; //qDebug() << o.objectName() << sigNum;
QByteArray expected("addr='<synthetic>',numchild='1',type='"NS"QObjectSignal'"); QByteArray expected("addr='<synthetic>',numchild='1',type='"NS"QObjectSignal'");
@@ -1929,7 +1931,7 @@ void tst_Debugger::dumpQObjectSignalHelper(QObject &o, int sigNum)
testDumper(expected, &o, NS"QObjectSignal", true, "", "", sigNum); testDumper(expected, &o, NS"QObjectSignal", true, "", "", sigNum);
} }
void tst_Debugger::dumpQObjectSignal() void tst_Dumpers::dumpQObjectSignal()
{ {
// Case 1: Simple QObject. // Case 1: Simple QObject.
QObject o; QObject o;
@@ -1964,7 +1966,7 @@ void tst_Debugger::dumpQObjectSignal()
dumpQObjectSignalHelper(m, signalIndex); dumpQObjectSignalHelper(m, signalIndex);
} }
void tst_Debugger::dumpQObjectSignalList() void tst_Dumpers::dumpQObjectSignalList()
{ {
// Case 1: Simple QObject. // Case 1: Simple QObject.
QObject o; QObject o;
@@ -2063,7 +2065,7 @@ QByteArray slotIndexList(const QObject *ob)
return slotIndices; return slotIndices;
} }
void tst_Debugger::dumpQObjectSlot() void tst_Dumpers::dumpQObjectSlot()
{ {
// Case 1: Simple QObject. // Case 1: Simple QObject.
QObject o; QObject o;
@@ -2119,7 +2121,7 @@ void tst_Debugger::dumpQObjectSlot()
} }
void tst_Debugger::dumpQObjectSlotList() void tst_Dumpers::dumpQObjectSlotList()
{ {
// Case 1: Simple QObject. // Case 1: Simple QObject.
QObject o; QObject o;
@@ -2170,7 +2172,7 @@ void tst_Debugger::dumpQObjectSlotList()
&m, NS"QObjectSlotList", true); &m, NS"QObjectSlotList", true);
} }
void tst_Debugger::dumpQPixmap() void tst_Dumpers::dumpQPixmap()
{ {
// Case 1: Null Pixmap. // Case 1: Null Pixmap.
QPixmap p; QPixmap p;
@@ -2198,7 +2200,7 @@ void tst_Debugger::dumpQPixmap()
#if QT_VERSION >= 0x040500 #if QT_VERSION >= 0x040500
template<typename T> template<typename T>
void tst_Debugger::dumpQSharedPointerHelper(QSharedPointer<T> &ptr) void tst_Dumpers::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
{ {
struct Cheater : public QSharedPointer<T> struct Cheater : public QSharedPointer<T>
{ {
@@ -2237,7 +2239,7 @@ void tst_Debugger::dumpQSharedPointerHelper(QSharedPointer<T> &ptr)
} }
#endif #endif
void tst_Debugger::dumpQSharedPointer() void tst_Dumpers::dumpQSharedPointer()
{ {
#if QT_VERSION >= 0x040500 #if QT_VERSION >= 0x040500
// Case 1: Simple type. // Case 1: Simple type.
@@ -2277,7 +2279,7 @@ void tst_Debugger::dumpQSharedPointer()
#endif #endif
} }
void tst_Debugger::dumpQString() void tst_Dumpers::dumpQString()
{ {
QString s; QString s;
testDumper("value='IiIgKG51bGwp',valueencoded='5',type='$T',numchild='0'", testDumper("value='IiIgKG51bGwp',valueencoded='5',type='$T',numchild='0'",
@@ -2287,14 +2289,14 @@ void tst_Debugger::dumpQString()
&s, NS"QString", false); &s, NS"QString", false);
} }
void tst_Debugger::dumpQVariant_invalid() void tst_Dumpers::dumpQVariant_invalid()
{ {
QVariant v; QVariant v;
testDumper("value='(invalid)',type='$T',numchild='0'", testDumper("value='(invalid)',type='$T',numchild='0'",
&v, NS"QVariant", false); &v, NS"QVariant", false);
} }
void tst_Debugger::dumpQVariant_QString() void tst_Dumpers::dumpQVariant_QString()
{ {
QVariant v = "abc"; QVariant v = "abc";
testDumper("value='KFFTdHJpbmcpICJhYmMi',valueencoded='5',type='$T'," testDumper("value='KFFTdHJpbmcpICJhYmMi',valueencoded='5',type='$T',"
@@ -2309,7 +2311,7 @@ void tst_Debugger::dumpQVariant_QString()
*/ */
} }
void tst_Debugger::dumpQVariant_QStringList() void tst_Dumpers::dumpQVariant_QStringList()
{ {
QVariant v = QStringList() << "Hi"; QVariant v = QStringList() << "Hi";
testDumper("value='(QStringList) ',type='$T',numchild='1'," testDumper("value='(QStringList) ',type='$T',numchild='1',"
@@ -2319,7 +2321,7 @@ void tst_Debugger::dumpQVariant_QStringList()
&v, NS"QVariant", true); &v, NS"QVariant", true);
} }
void tst_Debugger::dumpStdVector() void tst_Dumpers::dumpStdVector()
{ {
std::vector<std::list<int> *> vector; std::vector<std::list<int> *> vector;
QByteArray inner = "std::list<int> *"; QByteArray inner = "std::list<int> *";
@@ -2344,7 +2346,7 @@ void tst_Debugger::dumpStdVector()
vector.push_back(0); vector.push_back(0);
} }
void tst_Debugger::dumpQTextCodecHelper(QTextCodec *codec) void tst_Dumpers::dumpQTextCodecHelper(QTextCodec *codec)
{ {
const QByteArray name = codec->name().toBase64(); const QByteArray name = codec->name().toBase64();
QByteArray expected = QByteArray("value='%',valueencoded='1',type='$T'," QByteArray expected = QByteArray("value='%',valueencoded='1',type='$T',"
@@ -2354,7 +2356,7 @@ void tst_Debugger::dumpQTextCodecHelper(QTextCodec *codec)
testDumper(expected, codec, NS"QTextCodec", true); testDumper(expected, codec, NS"QTextCodec", true);
} }
void tst_Debugger::dumpQTextCodec() void tst_Dumpers::dumpQTextCodec()
{ {
const QList<QByteArray> &codecNames = QTextCodec::availableCodecs(); const QList<QByteArray> &codecNames = QTextCodec::availableCodecs();
foreach (const QByteArray &codecName, codecNames) foreach (const QByteArray &codecName, codecNames)
@@ -2370,7 +2372,7 @@ template <typename T1, typename T2>
} }
template <typename T> template <typename T>
void tst_Debugger::dumpQWeakPointerHelper(QWeakPointer<T> &ptr) void tst_Dumpers::dumpQWeakPointerHelper(QWeakPointer<T> &ptr)
{ {
typedef QtSharedPointer::ExternalRefCountData Data; typedef QtSharedPointer::ExternalRefCountData Data;
const size_t dataOffset = 0; const size_t dataOffset = 0;
@@ -2394,7 +2396,7 @@ void tst_Debugger::dumpQWeakPointerHelper(QWeakPointer<T> &ptr)
} }
#endif #endif
void tst_Debugger::dumpQWeakPointer() void tst_Dumpers::dumpQWeakPointer()
{ {
#if QT_VERSION >= 0x040500 #if QT_VERSION >= 0x040500
// Case 1: Simple type. // Case 1: Simple type.
@@ -2433,7 +2435,7 @@ do { \
} while (0) } while (0)
void tst_Debugger::initTestCase() void tst_Dumpers::initTestCase()
{ {
QVERIFY(sizeof(QWeakPointer<int>) == 2*sizeof(void *)); QVERIFY(sizeof(QWeakPointer<int>) == 2*sizeof(void *));
QVERIFY(sizeof(QSharedPointer<int>) == 2*sizeof(void *)); QVERIFY(sizeof(QSharedPointer<int>) == 2*sizeof(void *));
@@ -2468,7 +2470,7 @@ void tst_Debugger::initTestCase()
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QApplication app(argc, argv); QApplication app(argc, argv);
tst_Debugger test; tst_Dumpers test;
return QTest::qExec(&test, argc, argv); return QTest::qExec(&test, argc, argv);
} }

1
tests/auto/debugger/tst_gdb.cpp
View File

@@ -6,6 +6,7 @@
//bool checkUninitialized = true; //bool checkUninitialized = true;
bool checkUninitialized = false; bool checkUninitialized = false;
//#define DO_DEBUG 1 //#define DO_DEBUG 1
//TESTED_COMPONENT=src/plugins/debugger/gdb
#include "gdb/gdbmi.h" #include "gdb/gdbmi.h"

1
tests/auto/debugger/tst_version.cpp
View File

@@ -3,6 +3,7 @@
#include <QtTest> #include <QtTest>
//TESTED_COMPONENT=src/plugins/debugger/gdb
class tst_Version : public QObject class tst_Version : public QObject
{ {

4
tests/auto/fakevim/fakevim.pro
View File

@@ -7,13 +7,13 @@ FAKEVIMDIR = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs UTILSDIR = ../../../src/libs
SOURCES += \ SOURCES += \
main.cpp \
$$FAKEVIMDIR/fakevimhandler.cpp \ $$FAKEVIMDIR/fakevimhandler.cpp \
$$FAKEVIMDIR/fakevimactions.cpp \ $$FAKEVIMDIR/fakevimactions.cpp \
$$FAKEVIMDIR/fakevimsyntax.cpp \ $$FAKEVIMDIR/fakevimsyntax.cpp \
$$UTILSDIR/utils/savedaction.cpp \ $$UTILSDIR/utils/savedaction.cpp \
$$UTILSDIR/utils/pathchooser.cpp \ $$UTILSDIR/utils/pathchooser.cpp \
$$UTILSDIR/utils/basevalidatinglineedit.cpp \ $$UTILSDIR/utils/basevalidatinglineedit.cpp \
tst_fakevim.cpp
HEADERS += \ HEADERS += \
$$FAKEVIMDIR/fakevimhandler.h \ $$FAKEVIMDIR/fakevimhandler.h \
@@ -24,5 +24,3 @@ HEADERS += \
$$UTILSDIR/utils/basevalidatinglineedit.h \ $$UTILSDIR/utils/basevalidatinglineedit.h \
INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
TARGET=tst_$$TARGET

8
tests/auto/fakevim/main.cpp → tests/auto/fakevim/tst_fakevim.cpp
View File

@@ -36,6 +36,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
//TESTED_COMPONENT=src/plugins/fakevim
using namespace FakeVim; using namespace FakeVim;
using namespace FakeVim::Internal; using namespace FakeVim::Internal;
@@ -863,10 +864,10 @@ int main(int argc, char *argv[])
// //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
int main(int argc, char *argv[]) \ int main(int argc, char *argv[])
{ {
int res = 0; int res = 0;
QApplication app(argc, argv); \ QApplication app(argc, argv);
// Test with QPlainTextEdit. // Test with QPlainTextEdit.
tst_FakeVim plaintextedit(true); tst_FakeVim plaintextedit(true);
@@ -881,5 +882,4 @@ int main(int argc, char *argv[]) \
return res; return res;
} }
#include "tst_fakevim.moc"
#include "main.moc"

18
tests/auto/generichighlighter/highlighterengine/highlighterengine.pro
View File

@@ -5,9 +5,9 @@ PLUGINSDIR = ../../../../src/plugins
GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter
SOURCES += \ SOURCES += \
$$PWD/tst_highlighterengine.cpp \ tst_highlighterengine.cpp \
$$PWD/highlightermock.cpp \ highlightermock.cpp \
$$PWD/formats.cpp \ formats.cpp \
$$GENERICHIGHLIGHTERDIR/highlighter.cpp \ $$GENERICHIGHLIGHTERDIR/highlighter.cpp \
$$GENERICHIGHLIGHTERDIR/context.cpp \ $$GENERICHIGHLIGHTERDIR/context.cpp \
$$GENERICHIGHLIGHTERDIR/dynamicrule.cpp \ $$GENERICHIGHLIGHTERDIR/dynamicrule.cpp \
@@ -19,11 +19,11 @@ SOURCES += \
$$GENERICHIGHLIGHTERDIR/itemdata.cpp $$GENERICHIGHLIGHTERDIR/itemdata.cpp
HEADERS += \ HEADERS += \
$$PWD/highlightermock.h \ highlightermock.h \
$$PWD/basetextdocumentlayout.h \ basetextdocumentlayout.h \
$$PWD/formats.h \ formats.h \
$$PWD/tabsettings.h \ tabsettings.h \
$$PWD/syntaxhighlighter.h \ syntaxhighlighter.h \
$$GENERICHIGHLIGHTERDIR/highlighter.h \ $$GENERICHIGHLIGHTERDIR/highlighter.h \
$$GENERICHIGHLIGHTERDIR/context.h \ $$GENERICHIGHLIGHTERDIR/context.h \
$$GENERICHIGHLIGHTERDIR/dynamicrule.h \ $$GENERICHIGHLIGHTERDIR/dynamicrule.h \
@@ -35,5 +35,3 @@ HEADERS += \
$$GENERICHIGHLIGHTERDIR/itemdata.h $$GENERICHIGHLIGHTERDIR/itemdata.h
INCLUDEPATH += $$GENERICHIGHLIGHTERDIR $$PWD INCLUDEPATH += $$GENERICHIGHLIGHTERDIR $$PWD
TARGET=tst_$$TARGET

2
tests/auto/generichighlighter/highlighterengine/tst_highlighterengine.cpp
View File

@@ -49,6 +49,8 @@ Q_DECLARE_METATYPE(HighlightSequence)
Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QList<HighlightSequence>) Q_DECLARE_METATYPE(QList<HighlightSequence>)
//TESTED_COMPONENT=src/plugins/texteditor/generichighlighter
class tst_HighlighterEngine : public QObject class tst_HighlighterEngine : public QObject
{ {
Q_OBJECT Q_OBJECT

1
tests/auto/generichighlighter/specificrules/tst_specificrules.cpp
View File

@@ -34,6 +34,7 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
//TESTED_COMPONENT=src/plugins/texteditor/generichighlighter
using namespace TextEditor; using namespace TextEditor;
using namespace Internal; using namespace Internal;

2
tests/auto/profilereader/profilecache.h
View File

@@ -30,7 +30,7 @@
#ifndef PROFILECACHE_H #ifndef PROFILECACHE_H
#define PROFILECACHE_H #define PROFILECACHE_H
#include "proitems.h" #include <proitems.h>
#include <QString> #include <QString>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {

15
tests/auto/profilereader/profilereader.pro
View File

@@ -1,17 +1,12 @@
load(qttest_p4) TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase
SOURCES += \ SOURCES += \
proitems.cpp \ tst_profilereader.cpp
profileevaluator.cpp \
profilereader.cpp \
main.cpp
HEADERS += \ HEADERS += \
profileevaluator.h \
proparserutils.h \
proitems.h \
abstractproitemvisitor.h \
profilereader.h \
profilecache.h \ profilecache.h \
qtversionmanager.h qtversionmanager.h
TARGET=tst_$$TARGET TARGET=tst_$$TARGET

4
tests/auto/profilereader/main.cpp → tests/auto/profilereader/tst_profilereader.cpp
View File

@@ -27,9 +27,7 @@
** **
**************************************************************************/ **************************************************************************/
#include "profilereader.h"
#include "profilecache.h" #include "profilecache.h"
#include "proitems.h"
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtCore/QSet> #include <QtCore/QSet>
@@ -73,4 +71,4 @@ void tst_ProFileReader::conditionalScopes()
} }
QTEST_MAIN(tst_ProFileReader) QTEST_MAIN(tst_ProFileReader)
#include "main.moc" #include "tst_profilereader.moc"

5
tests/auto/profilewriter/profilewriter.pro
View File

@@ -1,6 +1,5 @@
load(qttest_p4)
include(../../../src/shared/proparser/proparser.pri) include(../../../src/shared/proparser/proparser.pri)
SOURCES += main.cpp SOURCES += \
tst_profilewriter.cpp
QT -= gui QT -= gui

2
tests/auto/profilewriter/main.cpp → tests/auto/profilewriter/tst_profilewriter.cpp
View File

@@ -296,4 +296,4 @@ void tst_ProFileWriter::multiVar()
} }
QTEST_MAIN(tst_ProFileWriter) QTEST_MAIN(tst_ProFileWriter)
#include "main.moc" #include "tst_profilewriter.moc"

10
tests/auto/qml/qmldesigner/coretests/coretests.pro
View File

@@ -24,10 +24,12 @@ TARGET = tst_qmldesigner_core
CONFIG += console CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
TEMPLATE = app TEMPLATE = app
SOURCES += testcore.cpp \ SOURCES += \
../testview.cpp \ ../testview.cpp \
testrewriterview.cpp testrewriterview.cpp \
HEADERS += testcore.h \ tst_testcore.cpp
HEADERS += \
../testview.h \ ../testview.h \
testrewriterview.h testrewriterview.h \
tst_testcore.h
RESOURCES += ../data/testfiles.qrc RESOURCES += ../data/testfiles.qrc

250
tests/auto/qml/qmldesigner/coretests/testcore.cpp → tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
View File

@@ -27,7 +27,7 @@
** **
**************************************************************************/ **************************************************************************/
#include "testcore.h" #include "tst_testcore.h"
#include <QScopedPointer> #include <QScopedPointer>
#include <QLatin1String> #include <QLatin1String>
@@ -83,12 +83,12 @@ static void initializeMetaTypeSystem(const QString &resourcePath)
qWarning() << qPrintable(error); qWarning() << qPrintable(error);
} }
TestCore::TestCore() tst_TestCore::tst_TestCore()
: QObject() : QObject()
{ {
} }
void TestCore::initTestCase() void tst_TestCore::initTestCase()
{ {
#ifndef QDEBUG_IN_TESTS #ifndef QDEBUG_IN_TESTS
qInstallMsgHandler(testMessageOutput); qInstallMsgHandler(testMessageOutput);
@@ -111,12 +111,12 @@ void TestCore::initTestCase()
MetaInfo::setPluginPaths(QStringList() << pluginPath); MetaInfo::setPluginPaths(QStringList() << pluginPath);
} }
void TestCore::cleanupTestCase() void tst_TestCore::cleanupTestCase()
{ {
MetaInfo::clearGlobal(); MetaInfo::clearGlobal();
} }
void TestCore::testModelCreateCoreModel() void tst_TestCore::testModelCreateCoreModel()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -132,7 +132,7 @@ void TestCore::testModelCreateCoreModel()
} }
// TODO: this need to e updated for states // TODO: this need to e updated for states
void TestCore::loadEmptyCoreModel() void tst_TestCore::loadEmptyCoreModel()
{ {
QFile file(":/fx/empty.qml"); QFile file(":/fx/empty.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
@@ -160,7 +160,7 @@ void TestCore::loadEmptyCoreModel()
QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode())); QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
} }
void TestCore::testRewriterView() void tst_TestCore::testRewriterView()
{ {
try { try {
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
@@ -231,7 +231,7 @@ void TestCore::testRewriterView()
} }
} }
void TestCore::testRewriterErrors() void tst_TestCore::testRewriterErrors()
{ {
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n"); textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
@@ -258,7 +258,7 @@ void TestCore::testRewriterErrors()
QVERIFY(testRewriterView->errors().isEmpty()); QVERIFY(testRewriterView->errors().isEmpty());
} }
void TestCore::saveEmptyCoreModel() void tst_TestCore::saveEmptyCoreModel()
{ {
QList<QDeclarativeError> errors; QList<QDeclarativeError> errors;
QFile file(":/fx/empty.qml"); QFile file(":/fx/empty.qml");
@@ -293,7 +293,7 @@ void TestCore::saveEmptyCoreModel()
} }
void TestCore::loadAttributesInCoreModel() void tst_TestCore::loadAttributesInCoreModel()
{ {
QList<QDeclarativeError> errors; QList<QDeclarativeError> errors;
QFile file(":/fx/attributes.qml"); QFile file(":/fx/attributes.qml");
@@ -329,7 +329,7 @@ void TestCore::loadAttributesInCoreModel()
QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode())); QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
} }
void TestCore::saveAttributesInCoreModel() void tst_TestCore::saveAttributesInCoreModel()
{ {
QFile file(":/fx/attributes.qml"); QFile file(":/fx/attributes.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
@@ -365,7 +365,7 @@ void TestCore::saveAttributesInCoreModel()
QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode())); QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
} }
void TestCore::testModelCreateRect() void tst_TestCore::testModelCreateRect()
{ {
try { try {
@@ -402,7 +402,7 @@ void TestCore::testModelCreateRect()
} }
void TestCore::testRewriterDynamicProperties() void tst_TestCore::testRewriterDynamicProperties()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -536,7 +536,7 @@ void TestCore::testRewriterDynamicProperties()
// QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode())); // QVERIFY(compareTree(testRewriterView1->rootModelNode(), testRewriterView2->rootModelNode()));
} }
void TestCore::testRewriterGroupedProperties() void tst_TestCore::testRewriterGroupedProperties()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -584,7 +584,7 @@ void TestCore::testRewriterGroupedProperties()
QCOMPARE(textEdit.toPlainText(), expected); QCOMPARE(textEdit.toPlainText(), expected);
} }
void TestCore::testRewriterPreserveOrder() void tst_TestCore::testRewriterPreserveOrder()
{ {
const QLatin1String qmlString1("\n" const QLatin1String qmlString1("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -700,7 +700,7 @@ void TestCore::testRewriterPreserveOrder()
} }
} }
void TestCore::testRewriterActionCompression() void tst_TestCore::testRewriterActionCompression()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -767,7 +767,7 @@ void TestCore::testRewriterActionCompression()
QCOMPARE(textEdit.toPlainText(), expected); QCOMPARE(textEdit.toPlainText(), expected);
} }
void TestCore::testRewriterImports() void tst_TestCore::testRewriterImports()
{ {
QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/imports.qml"; QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/imports.qml";
QFile file(fileName); QFile file(fileName);
@@ -813,7 +813,7 @@ void TestCore::testRewriterImports()
QCOMPARE(import.alias(), QString("Web")); QCOMPARE(import.alias(), QString("Web"));
} }
void TestCore::testRewriterChangeImports() void tst_TestCore::testRewriterChangeImports()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -892,7 +892,7 @@ void TestCore::testRewriterChangeImports()
QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7")); QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
} }
void TestCore::testRewriterForGradientMagic() void tst_TestCore::testRewriterForGradientMagic()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -974,7 +974,7 @@ void TestCore::testRewriterForGradientMagic()
transaction.commit(); transaction.commit();
} }
void TestCore::loadSubItems() void tst_TestCore::loadSubItems()
{ {
QFile file(QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/topitem.qml"); QFile file(QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/topitem.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
@@ -990,7 +990,7 @@ void TestCore::loadSubItems()
model1->attachView(testRewriterView1.data()); model1->attachView(testRewriterView1.data());
} }
void TestCore::createInvalidCoreModel() void tst_TestCore::createInvalidCoreModel()
{ {
QScopedPointer<Model> invalidModel(Model::create("ItemSUX")); QScopedPointer<Model> invalidModel(Model::create("ItemSUX"));
//QVERIFY(!invalidModel.data()); //#no direct ype checking in model atm //QVERIFY(!invalidModel.data()); //#no direct ype checking in model atm
@@ -999,7 +999,7 @@ void TestCore::createInvalidCoreModel()
//QVERIFY(!invalidModel2.data()); //QVERIFY(!invalidModel2.data());
} }
void TestCore::testModelCreateSubNode() void tst_TestCore::testModelCreateSubNode()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1045,7 +1045,7 @@ void TestCore::testModelCreateSubNode()
} }
void TestCore::testTypicalRewriterOperations() void tst_TestCore::testTypicalRewriterOperations()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1094,7 +1094,7 @@ void TestCore::testTypicalRewriterOperations()
} }
void TestCore::testBasicStates() void tst_TestCore::testBasicStates()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -1245,7 +1245,7 @@ void TestCore::testBasicStates()
QCOMPARE(rect2Instance.property("x").toInt(), 0); QCOMPARE(rect2Instance.property("x").toInt(), 0);
} }
void TestCore::testModelBasicOperations() void tst_TestCore::testModelBasicOperations()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1305,7 +1305,7 @@ void TestCore::testModelBasicOperations()
QVERIFY(!childNode1.isValid()); QVERIFY(!childNode1.isValid());
} }
void TestCore::testModelResolveIds() void tst_TestCore::testModelResolveIds()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1360,7 +1360,7 @@ void TestCore::testModelResolveIds()
QCOMPARE(childNode2.bindingProperty("test").resolveToProperty().toBindingProperty().expression(), QString("childNode3.parent.test")); QCOMPARE(childNode2.bindingProperty("test").resolveToProperty().toBindingProperty().expression(), QString("childNode3.parent.test"));
} }
void TestCore::testModelNodeListProperty() void tst_TestCore::testModelNodeListProperty()
{ {
// //
// Test NodeListProperty API // Test NodeListProperty API
@@ -1420,7 +1420,7 @@ void TestCore::testModelNodeListProperty()
QVERIFY(!rectChildren.isValid()); QVERIFY(!rectChildren.isValid());
} }
void TestCore::testBasicOperationsWithView() void tst_TestCore::testBasicOperationsWithView()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1530,7 +1530,7 @@ void TestCore::testBasicOperationsWithView()
model->detachView(nodeInstanceView); model->detachView(nodeInstanceView);
} }
void TestCore::testQmlModelView() void tst_TestCore::testQmlModelView()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1652,7 +1652,7 @@ void TestCore::testQmlModelView()
} }
void TestCore::testModelRemoveNode() void tst_TestCore::testModelRemoveNode()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1716,7 +1716,7 @@ void TestCore::testModelRemoveNode()
model->detachView(nodeInstanceView); model->detachView(nodeInstanceView);
} }
void TestCore::reparentingNode() void tst_TestCore::reparentingNode()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
@@ -1783,7 +1783,7 @@ void TestCore::reparentingNode()
model->detachView(nodeInstanceView); model->detachView(nodeInstanceView);
} }
void TestCore::reparentingNodeLikeDragAndDrop() void tst_TestCore::reparentingNodeLikeDragAndDrop()
{ {
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n"); textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
@@ -1900,7 +1900,7 @@ void TestCore::reparentingNodeLikeDragAndDrop()
model->detachView(nodeInstanceView); model->detachView(nodeInstanceView);
} }
void TestCore::testModelReorderSiblings() void tst_TestCore::testModelReorderSiblings()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1951,7 +1951,7 @@ void TestCore::testModelReorderSiblings()
model->detachView(nodeInstanceView); model->detachView(nodeInstanceView);
} }
void TestCore::testModelRootNode() void tst_TestCore::testModelRootNode()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -1982,7 +1982,7 @@ void TestCore::testModelRootNode()
} }
} }
void TestCore::reparentingNodeInModificationGroup() void tst_TestCore::reparentingNodeInModificationGroup()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -2032,7 +2032,7 @@ void TestCore::reparentingNodeInModificationGroup()
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode2)); QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode2));
} }
void TestCore::testModelAddAndRemoveProperty() void tst_TestCore::testModelAddAndRemoveProperty()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -2073,7 +2073,7 @@ void TestCore::testModelAddAndRemoveProperty()
model->detachView(nodeInstanceView); model->detachView(nodeInstanceView);
} }
void TestCore::testModelViewNotification() void tst_TestCore::testModelViewNotification()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -2145,7 +2145,7 @@ void TestCore::testModelViewNotification()
} }
void TestCore::testRewriterTransaction() void tst_TestCore::testRewriterTransaction()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -2192,7 +2192,7 @@ void TestCore::testRewriterTransaction()
QVERIFY(!transaction.isValid()); QVERIFY(!transaction.isValid());
} }
void TestCore::testRewriterId() void tst_TestCore::testRewriterId()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2236,7 +2236,7 @@ void TestCore::testRewriterId()
QCOMPARE(textEdit.toPlainText(), expected); QCOMPARE(textEdit.toPlainText(), expected);
} }
void TestCore::testRewriterNodeReparentingTransaction1() void tst_TestCore::testRewriterNodeReparentingTransaction1()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2281,7 +2281,7 @@ void TestCore::testRewriterNodeReparentingTransaction1()
rewriterTransaction.commit(); rewriterTransaction.commit();
} }
void TestCore::testRewriterNodeReparentingTransaction2() void tst_TestCore::testRewriterNodeReparentingTransaction2()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2347,7 +2347,7 @@ void TestCore::testRewriterNodeReparentingTransaction2()
rewriterTransaction.commit(); rewriterTransaction.commit();
} }
void TestCore::testRewriterNodeReparentingTransaction3() void tst_TestCore::testRewriterNodeReparentingTransaction3()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2397,7 +2397,7 @@ void TestCore::testRewriterNodeReparentingTransaction3()
rewriterTransaction.commit(); rewriterTransaction.commit();
} }
void TestCore::testRewriterNodeReparentingTransaction4() void tst_TestCore::testRewriterNodeReparentingTransaction4()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2448,7 +2448,7 @@ void TestCore::testRewriterNodeReparentingTransaction4()
rewriterTransaction.commit(); rewriterTransaction.commit();
} }
void TestCore::testRewriterAddNodeTransaction() void tst_TestCore::testRewriterAddNodeTransaction()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2490,7 +2490,7 @@ void TestCore::testRewriterAddNodeTransaction()
rewriterTransaction.commit(); rewriterTransaction.commit();
} }
void TestCore::testRewriterComponentId() void tst_TestCore::testRewriterComponentId()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2526,7 +2526,7 @@ void TestCore::testRewriterComponentId()
QCOMPARE(component.id(), QString("testComponent")); QCOMPARE(component.id(), QString("testComponent"));
} }
void TestCore::testRewriterTransactionRewriter() void tst_TestCore::testRewriterTransactionRewriter()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2578,7 +2578,7 @@ void TestCore::testRewriterTransactionRewriter()
QVERIFY(childNode1.isValid()); QVERIFY(childNode1.isValid());
} }
void TestCore::testRewriterPropertyDeclarations() void tst_TestCore::testRewriterPropertyDeclarations()
{ {
// Work in progress. See task https://qtrequirements.europe.nokia.com/browse/BAUHAUS-170" // Work in progress. See task https://qtrequirements.europe.nokia.com/browse/BAUHAUS-170"
@@ -2649,7 +2649,7 @@ void TestCore::testRewriterPropertyDeclarations()
QCOMPARE(urlProperty.value(), QVariant(QUrl())); QCOMPARE(urlProperty.value(), QVariant(QUrl()));
} }
void TestCore::testRewriterPropertyAliases() void tst_TestCore::testRewriterPropertyAliases()
{ {
// //
// test property aliases defined in qml, i.e. // test property aliases defined in qml, i.e.
@@ -2689,7 +2689,7 @@ void TestCore::testRewriterPropertyAliases()
QCOMPARE(properties.size(), 0); // TODO: How to represent alias properties? As Bindings? QCOMPARE(properties.size(), 0); // TODO: How to represent alias properties? As Bindings?
} }
void TestCore::testRewriterPositionAndOffset() void tst_TestCore::testRewriterPositionAndOffset()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -2807,7 +2807,7 @@ void TestCore::testRewriterPositionAndOffset()
QCOMPARE(string, qmlExpected2); QCOMPARE(string, qmlExpected2);
} }
void TestCore::testRewriterComponentTextModifier() void tst_TestCore::testRewriterComponentTextModifier()
{ {
const QString qmlString("import Qt 4.7\n" const QString qmlString("import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2887,7 +2887,7 @@ void TestCore::testRewriterComponentTextModifier()
QCOMPARE(componentrootNode.type(), QLatin1String("Qt/Component")); QCOMPARE(componentrootNode.type(), QLatin1String("Qt/Component"));
} }
void TestCore::testRewriterPreserveType() void tst_TestCore::testRewriterPreserveType()
{ {
const QString qmlString("import Qt 4.7\n" const QString qmlString("import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -2933,7 +2933,7 @@ void TestCore::testRewriterPreserveType()
QCOMPARE(QVariant::Double, newTextNode.variantProperty("font.pointSize").value().type()); QCOMPARE(QVariant::Double, newTextNode.variantProperty("font.pointSize").value().type());
} }
void TestCore::testRewriterForArrayMagic() void tst_TestCore::testRewriterForArrayMagic()
{ {
try { try {
const QLatin1String qmlString("import Qt 4.7\n" const QLatin1String qmlString("import Qt 4.7\n"
@@ -2988,7 +2988,7 @@ void TestCore::testRewriterForArrayMagic()
} }
} }
void TestCore::testRewriterWithSignals() void tst_TestCore::testRewriterWithSignals()
{ {
const QLatin1String qmlString("import Qt 4.7\n" const QLatin1String qmlString("import Qt 4.7\n"
"\n" "\n"
@@ -3020,7 +3020,7 @@ void TestCore::testRewriterWithSignals()
QCOMPARE(rootNode.properties().count(), 0); QCOMPARE(rootNode.properties().count(), 0);
} }
void TestCore::testRewriterNodeSliding() void tst_TestCore::testRewriterNodeSliding()
{ {
const QLatin1String qmlString("import Qt 4.7\n" const QLatin1String qmlString("import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -3072,7 +3072,7 @@ void TestCore::testRewriterNodeSliding()
QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(1).id(), QLatin1String("rectangle2")); QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(1).id(), QLatin1String("rectangle2"));
} }
void TestCore::testRewriterExceptionHandling() void tst_TestCore::testRewriterExceptionHandling()
{ {
const QLatin1String qmlString("import Qt 4.7\n" const QLatin1String qmlString("import Qt 4.7\n"
"Text {\n" "Text {\n"
@@ -3112,7 +3112,7 @@ void TestCore::testRewriterExceptionHandling()
} }
} }
void TestCore::testRewriterFirstDefinitionInside() void tst_TestCore::testRewriterFirstDefinitionInside()
{ {
const QString qmlString("import Qt 4.7\n" const QString qmlString("import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -3167,7 +3167,7 @@ void TestCore::testRewriterFirstDefinitionInside()
} }
void TestCore::testCopyModelRewriter1() void tst_TestCore::testCopyModelRewriter1()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -3337,7 +3337,7 @@ void TestCore::testCopyModelRewriter1()
QCOMPARE(textEdit1.toPlainText(), expected); QCOMPARE(textEdit1.toPlainText(), expected);
} }
void TestCore::testCopyModelRewriter2() void tst_TestCore::testCopyModelRewriter2()
{ {
const QLatin1String qmlString1("\n" const QLatin1String qmlString1("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -3437,7 +3437,7 @@ void TestCore::testCopyModelRewriter2()
QCOMPARE(textEdit2.toPlainText(), qmlString1); QCOMPARE(textEdit2.toPlainText(), qmlString1);
} }
void TestCore::testSubComponentManager() void tst_TestCore::testSubComponentManager()
{ {
QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/usingmybutton.qml"; QString fileName = QString(QTCREATORDIR) + "/tests/auto/qml/qmldesigner/data/fx/usingmybutton.qml";
QFile file(fileName); QFile file(fileName);
@@ -3470,7 +3470,7 @@ void TestCore::testSubComponentManager()
QVERIFY(myButtonMetaInfo.property("border.width", true).isValid()); QVERIFY(myButtonMetaInfo.property("border.width", true).isValid());
} }
void TestCore::testAnchorsAndRewriting() void tst_TestCore::testAnchorsAndRewriting()
{ {
const QString qmlString("import Qt 4.7\n" const QString qmlString("import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -3531,7 +3531,7 @@ void TestCore::testAnchorsAndRewriting()
} }
} }
void TestCore::testAnchorsAndRewritingCenter() void tst_TestCore::testAnchorsAndRewritingCenter()
{ {
const QString qmlString("import Qt 4.7\n" const QString qmlString("import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -3581,7 +3581,7 @@ void TestCore::testAnchorsAndRewritingCenter()
childNode.anchors().setAnchor(AnchorLine::HorizontalCenter, rootItemNode, AnchorLine::HorizontalCenter); childNode.anchors().setAnchor(AnchorLine::HorizontalCenter, rootItemNode, AnchorLine::HorizontalCenter);
} }
void TestCore::loadQml() void tst_TestCore::loadQml()
{ {
char qmlString[] = "import Qt 4.7\n" char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n" "Rectangle {\n"
@@ -3700,7 +3700,7 @@ char qmlString[] = "import Qt 4.7\n"
QCOMPARE(textNode2.variantProperty("text").value().toString(), QString("text")); QCOMPARE(textNode2.variantProperty("text").value().toString(), QString("text"));
} }
void TestCore::testMetaInfo() void tst_TestCore::testMetaInfo()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -3716,7 +3716,7 @@ void TestCore::testMetaInfo()
QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // webkit 1.0 namespace QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // webkit 1.0 namespace
} }
void TestCore::testMetaInfoSimpleType() void tst_TestCore::testMetaInfoSimpleType()
{ {
// //
// Test type registered with qmlRegisterType: // Test type registered with qmlRegisterType:
@@ -3759,7 +3759,7 @@ void TestCore::testMetaInfoSimpleType()
QVERIFY(!itemMetaInfo.availableInVersion(3, 7)); QVERIFY(!itemMetaInfo.availableInVersion(3, 7));
} }
void TestCore::testMetaInfoUncreatableType() void tst_TestCore::testMetaInfoUncreatableType()
{ {
// Test type registered with qmlRegisterUncreatableType or qmlRegisterTypeNotAvailable: // Test type registered with qmlRegisterUncreatableType or qmlRegisterTypeNotAvailable:
// //
@@ -3786,7 +3786,7 @@ void TestCore::testMetaInfoUncreatableType()
QCOMPARE(animationTypeInfo.superClasses().size(), 1); QCOMPARE(animationTypeInfo.superClasses().size(), 1);
} }
void TestCore::testMetaInfoExtendedType() void tst_TestCore::testMetaInfoExtendedType()
{ {
// Test type registered with qmlRegisterExtendedType // Test type registered with qmlRegisterExtendedType
// //
@@ -3811,7 +3811,7 @@ void TestCore::testMetaInfoExtendedType()
QCOMPARE(graphicsWidgetTypeInfo.superClasses().size(), 2); QCOMPARE(graphicsWidgetTypeInfo.superClasses().size(), 2);
} }
void TestCore::testMetaInfoInterface() void tst_TestCore::testMetaInfoInterface()
{ {
// Test type registered with qmlRegisterInterface // Test type registered with qmlRegisterInterface
// //
@@ -3819,7 +3819,7 @@ void TestCore::testMetaInfoInterface()
QSKIP("TODO: Test not implemented yet", SkipAll); QSKIP("TODO: Test not implemented yet", SkipAll);
} }
void TestCore::testMetaInfoCustomType() void tst_TestCore::testMetaInfoCustomType()
{ {
// Test type registered with qmlRegisterCustomType: // Test type registered with qmlRegisterCustomType:
// //
@@ -3846,7 +3846,7 @@ void TestCore::testMetaInfoCustomType()
QCOMPARE(propertyChangesInfo.properties().size() - stateOperationInfo.properties().size(), 3); QCOMPARE(propertyChangesInfo.properties().size() - stateOperationInfo.properties().size(), 3);
} }
void TestCore::testMetaInfoEnums() void tst_TestCore::testMetaInfoEnums()
{ {
QScopedPointer<Model> model(Model::create("Qt/Text")); QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -3870,7 +3870,7 @@ void TestCore::testMetaInfoEnums()
QVERIFY(view->rootModelNode().metaInfo().property("horizontalAlignment").enumerator().elementNames().contains(QLatin1String("AlignRight"))); QVERIFY(view->rootModelNode().metaInfo().property("horizontalAlignment").enumerator().elementNames().contains(QLatin1String("AlignRight")));
} }
void TestCore::testMetaInfoProperties() void tst_TestCore::testMetaInfoProperties()
{ {
QScopedPointer<Model> model(Model::create("Qt/Text")); QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -3890,7 +3890,7 @@ void TestCore::testMetaInfoProperties()
QVERIFY(textNodeMetaInfo.property("x").isWriteable()); QVERIFY(textNodeMetaInfo.property("x").isWriteable());
} }
void TestCore::testMetaInfoDotProperties() void tst_TestCore::testMetaInfoDotProperties()
{ {
QScopedPointer<Model> model(Model::create("Qt/Text")); QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -3932,7 +3932,7 @@ void TestCore::testMetaInfoDotProperties()
QVERIFY(rectNode.metaInfo().property("anchors.topMargin", true).isValid()); QVERIFY(rectNode.metaInfo().property("anchors.topMargin", true).isValid());
} }
void TestCore::testMetaInfoListProperties() void tst_TestCore::testMetaInfoListProperties()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -3963,7 +3963,7 @@ void TestCore::testMetaInfoListProperties()
QVERIFY(!view->rootModelNode().metaInfo().property("parent").isListProperty()); QVERIFY(!view->rootModelNode().metaInfo().property("parent").isListProperty());
} }
void TestCore::testStatesRewriter() void tst_TestCore::testStatesRewriter()
{ {
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
textEdit.setPlainText("import Qt 4.7; Item {}\n"); textEdit.setPlainText("import Qt 4.7; Item {}\n");
@@ -4010,7 +4010,7 @@ void TestCore::testStatesRewriter()
} }
void TestCore::testGradientsRewriter() void tst_TestCore::testGradientsRewriter()
{ {
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
textEdit.setPlainText("\nimport Qt 4.7\n\nItem {\n}\n"); textEdit.setPlainText("\nimport Qt 4.7\n\nItem {\n}\n");
@@ -4168,7 +4168,7 @@ void TestCore::testGradientsRewriter()
stops.reparentHere(gradientStop1); stops.reparentHere(gradientStop1);
} }
void TestCore::testQmlModelStates() void tst_TestCore::testQmlModelStates()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -4200,7 +4200,7 @@ void TestCore::testQmlModelStates()
} }
void TestCore::testInstancesStates() void tst_TestCore::testInstancesStates()
{ {
// //
// import Qt 4.7 // import Qt 4.7
@@ -4440,7 +4440,7 @@ void TestCore::testInstancesStates()
} }
void TestCore::testStates() void tst_TestCore::testStates()
{ {
// //
// import Qt 4.7 // import Qt 4.7
@@ -4536,7 +4536,7 @@ void TestCore::testStates()
QCOMPARE(textNode.variantProperty("text").value(), QVariant("base state")); QCOMPARE(textNode.variantProperty("text").value(), QVariant("base state"));
} }
void TestCore::testStatesBaseState() void tst_TestCore::testStatesBaseState()
{ {
// //
// import Qt 4.7 // import Qt 4.7
@@ -4613,7 +4613,7 @@ void TestCore::testStatesBaseState()
} }
void TestCore::testInstancesIdResolution() void tst_TestCore::testInstancesIdResolution()
{ {
QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7)); QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -4696,7 +4696,7 @@ void TestCore::testInstancesIdResolution()
} }
void TestCore::testInstancesNotInScene() void tst_TestCore::testInstancesNotInScene()
{ {
// //
// test whether deleting an instance which is not in the scene crashes // test whether deleting an instance which is not in the scene crashes
@@ -4719,7 +4719,7 @@ void TestCore::testInstancesNotInScene()
node1.destroy(); node1.destroy();
} }
void TestCore::testQmlModelStatesInvalidForRemovedNodes() void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes()
{ {
QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7)); QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -4756,7 +4756,7 @@ void TestCore::testQmlModelStatesInvalidForRemovedNodes()
QVERIFY(!changeSet.isValid()); QVERIFY(!changeSet.isValid());
} }
void TestCore::testInstancesAttachToExistingModel() void tst_TestCore::testInstancesAttachToExistingModel()
{ {
// //
// Test attaching nodeinstanceview to an existing model // Test attaching nodeinstanceview to an existing model
@@ -4793,7 +4793,7 @@ void TestCore::testInstancesAttachToExistingModel()
QCOMPARE(rootInstance.testHandle(), qobject_cast<QGraphicsObject*>(rectangleInstance.testHandle())->parentItem()->toGraphicsObject()); QCOMPARE(rootInstance.testHandle(), qobject_cast<QGraphicsObject*>(rectangleInstance.testHandle())->parentItem()->toGraphicsObject());
} }
void TestCore::testQmlModelAddMultipleStates() void tst_TestCore::testQmlModelAddMultipleStates()
{ {
QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7)); QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -4824,7 +4824,7 @@ void TestCore::testQmlModelAddMultipleStates()
QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 3); QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 3);
} }
void TestCore::testQmlModelRemoveStates() void tst_TestCore::testQmlModelRemoveStates()
{ {
QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7)); QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
@@ -4853,7 +4853,7 @@ void TestCore::testQmlModelRemoveStates()
QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 0); QCOMPARE(QmlItemNode(rootModelNode).states().allStates().count(), 0);
} }
void TestCore::testQmlModelStateWithName() void tst_TestCore::testQmlModelStateWithName()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 200; } } ] }\n"); textEdit1.setPlainText("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 200; } } ] }\n");
@@ -4898,7 +4898,7 @@ void TestCore::testQmlModelStateWithName()
QCOMPARE(rootNode.states().allStates().size(), 0); QCOMPARE(rootNode.states().allStates().size(), 0);
} }
void TestCore::testRewriterAutomaticSemicolonAfterChangedProperty() void tst_TestCore::testRewriterAutomaticSemicolonAfterChangedProperty()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Rectangle {\n width: 640\n height: 480\n}\n"); textEdit1.setPlainText("import Qt 4.7; Rectangle {\n width: 640\n height: 480\n}\n");
@@ -4919,7 +4919,7 @@ void TestCore::testRewriterAutomaticSemicolonAfterChangedProperty()
QVERIFY(testRewriterView1->errors().isEmpty()); QVERIFY(testRewriterView1->errors().isEmpty());
} }
void TestCore::defaultPropertyValues() void tst_TestCore::defaultPropertyValues()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -4942,7 +4942,7 @@ void TestCore::defaultPropertyValues()
QCOMPARE(imageNode.variantProperty("width").value().toDouble(), 0.0); QCOMPARE(imageNode.variantProperty("width").value().toDouble(), 0.0);
} }
void TestCore::testModelPropertyValueTypes() void tst_TestCore::testModelPropertyValueTypes()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Rectangle { width: 100; radius: 1.5; color: \"red\"; }"); textEdit1.setPlainText("import Qt 4.7; Rectangle { width: 100; radius: 1.5; color: \"red\"; }");
@@ -4964,7 +4964,7 @@ void TestCore::testModelPropertyValueTypes()
QCOMPARE(rootModelNode.variantProperty("color").value().type(), QVariant::Color); QCOMPARE(rootModelNode.variantProperty("color").value().type(), QVariant::Color);
} }
void TestCore::testModelNodeInHierarchy() void tst_TestCore::testModelNodeInHierarchy()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -4985,7 +4985,7 @@ void TestCore::testModelNodeInHierarchy()
QVERIFY(node2.isInHierarchy()); QVERIFY(node2.isInHierarchy());
} }
void TestCore::testModelNodeIsAncestorOf() void tst_TestCore::testModelNodeIsAncestorOf()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -5024,7 +5024,7 @@ void TestCore::testModelNodeIsAncestorOf()
QVERIFY(item3.isAncestorOf(item4)); QVERIFY(item3.isAncestorOf(item4));
} }
void TestCore::testModelDefaultProperties() void tst_TestCore::testModelDefaultProperties()
{ {
QScopedPointer<Model> model(Model::create("Qt/Rectangle")); QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -5039,7 +5039,7 @@ void TestCore::testModelDefaultProperties()
QCOMPARE(rootModelNode.metaInfo().defaultProperty(), QString("data")); QCOMPARE(rootModelNode.metaInfo().defaultProperty(), QString("data"));
} }
void TestCore::loadAnchors() void tst_TestCore::loadAnchors()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}"); textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
@@ -5078,7 +5078,7 @@ void TestCore::loadAnchors()
model->detachView(testView); model->detachView(testView);
} }
void TestCore::changeAnchors() void tst_TestCore::changeAnchors()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}"); textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
@@ -5139,7 +5139,7 @@ void TestCore::changeAnchors()
model->detachView(testView); model->detachView(testView);
} }
void TestCore::anchorToSibling() void tst_TestCore::anchorToSibling()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Item { Rectangle {} Rectangle { id: secondChild } }"); textEdit1.setPlainText("import Qt 4.7; Item { Rectangle {} Rectangle { id: secondChild } }");
@@ -5183,7 +5183,7 @@ void TestCore::anchorToSibling()
QVERIFY(secondChild.anchors().possibleAnchorLines(AnchorLine::Left, firstChild) == AnchorLine::HorizontalMask); QVERIFY(secondChild.anchors().possibleAnchorLines(AnchorLine::Left, firstChild) == AnchorLine::HorizontalMask);
} }
void TestCore::removeFillAnchorByDetaching() void tst_TestCore::removeFillAnchorByDetaching()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }"); textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
@@ -5263,7 +5263,7 @@ void TestCore::removeFillAnchorByDetaching()
model->detachView(testView); model->detachView(testView);
} }
void TestCore::removeFillAnchorByChanging() void tst_TestCore::removeFillAnchorByChanging()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }"); textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
@@ -5344,7 +5344,7 @@ void TestCore::removeFillAnchorByChanging()
model->detachView(testView); model->detachView(testView);
} }
void TestCore::testModelBindings() void tst_TestCore::testModelBindings()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7)); QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -5402,7 +5402,7 @@ void TestCore::testModelBindings()
QCOMPARE(childInstance.size().width(), 200.0); QCOMPARE(childInstance.size().width(), 200.0);
} }
void TestCore::testModelDynamicProperties() void tst_TestCore::testModelDynamicProperties()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7)); QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -5446,7 +5446,7 @@ void TestCore::testModelDynamicProperties()
QCOMPARE(rootModelNode.bindingProperty("myBindingColor").expression(), QString("myColor")); QCOMPARE(rootModelNode.bindingProperty("myBindingColor").expression(), QString("myColor"));
} }
void TestCore::testModelSliding() void tst_TestCore::testModelSliding()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data()); QVERIFY(model.data());
@@ -5514,7 +5514,7 @@ void TestCore::testModelSliding()
QCOMPARE(rect00, nodeList.at(3)); QCOMPARE(rect00, nodeList.at(3));
} }
void TestCore::testRewriterChangeId() void tst_TestCore::testRewriterChangeId()
{ {
const char* qmlString = "import Qt 4.7\nRectangle { }"; const char* qmlString = "import Qt 4.7\nRectangle { }";
@@ -5551,7 +5551,7 @@ void TestCore::testRewriterChangeId()
node.setId("myId"); node.setId("myId");
} }
void TestCore::testRewriterRemoveId() void tst_TestCore::testRewriterRemoveId()
{ {
const char* qmlString = "import Qt 4.7\nRectangle { id: rect }"; const char* qmlString = "import Qt 4.7\nRectangle { id: rect }";
@@ -5583,7 +5583,7 @@ void TestCore::testRewriterRemoveId()
QCOMPARE(rootModelNode.id(), QString()); QCOMPARE(rootModelNode.id(), QString());
} }
void TestCore::testRewriterChangeValueProperty() void tst_TestCore::testRewriterChangeValueProperty()
{ {
const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }"; const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
@@ -5618,7 +5618,7 @@ void TestCore::testRewriterChangeValueProperty()
node.variantProperty("x").setValue(20); node.variantProperty("x").setValue(20);
} }
void TestCore::testRewriterRemoveValueProperty() void tst_TestCore::testRewriterRemoveValueProperty()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -5665,7 +5665,7 @@ void TestCore::testRewriterRemoveValueProperty()
node.removeProperty("x"); node.removeProperty("x");
} }
void TestCore::testRewriterSignalProperty() void tst_TestCore::testRewriterSignalProperty()
{ {
const char* qmlString = "import Qt 4.7\nRectangle { onColorChanged: {} }"; const char* qmlString = "import Qt 4.7\nRectangle { onColorChanged: {} }";
@@ -5691,7 +5691,7 @@ void TestCore::testRewriterSignalProperty()
QCOMPARE(rootModelNode.properties().size(), 0); QCOMPARE(rootModelNode.properties().size(), 0);
} }
void TestCore::testRewriterObjectTypeProperty() void tst_TestCore::testRewriterObjectTypeProperty()
{ {
const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }"; const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
@@ -5720,7 +5720,7 @@ void TestCore::testRewriterObjectTypeProperty()
QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Text")); QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Text"));
} }
void TestCore::testRewriterPropertyChanges() void tst_TestCore::testRewriterPropertyChanges()
{ {
try { try {
// PropertyChanges uses a custom parser // PropertyChanges uses a custom parser
@@ -5792,7 +5792,7 @@ void TestCore::testRewriterPropertyChanges()
} }
} }
void TestCore::testRewriterListModel() void tst_TestCore::testRewriterListModel()
{ {
QSKIP("See BAUHAUS-157", SkipAll); QSKIP("See BAUHAUS-157", SkipAll);
@@ -5830,7 +5830,7 @@ void TestCore::testRewriterListModel()
} }
} }
void TestCore::testRewriterAddProperty() void tst_TestCore::testRewriterAddProperty()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -5871,7 +5871,7 @@ void TestCore::testRewriterAddProperty()
QCOMPARE(textEdit.toPlainText(), expected); QCOMPARE(textEdit.toPlainText(), expected);
} }
void TestCore::testRewriterAddPropertyInNestedObject() void tst_TestCore::testRewriterAddPropertyInNestedObject()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -5921,7 +5921,7 @@ void TestCore::testRewriterAddPropertyInNestedObject()
QCOMPARE(textEdit.toPlainText(), expected); QCOMPARE(textEdit.toPlainText(), expected);
} }
void TestCore::testRewriterAddObjectDefinition() void tst_TestCore::testRewriterAddObjectDefinition()
{ {
const QLatin1String qmlString("import Qt 4.7\n" const QLatin1String qmlString("import Qt 4.7\n"
"\n" "\n"
@@ -5954,7 +5954,7 @@ void TestCore::testRewriterAddObjectDefinition()
QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea"))); QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
} }
void TestCore::testRewriterAddStatesArray() void tst_TestCore::testRewriterAddStatesArray()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6010,7 +6010,7 @@ void TestCore::testRewriterAddStatesArray()
QCOMPARE(textEdit.toPlainText(), expected2); QCOMPARE(textEdit.toPlainText(), expected2);
} }
void TestCore::testRewriterRemoveStates() void tst_TestCore::testRewriterRemoveStates()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6070,7 +6070,7 @@ void TestCore::testRewriterRemoveStates()
QCOMPARE(textEdit.toPlainText(), expected2); QCOMPARE(textEdit.toPlainText(), expected2);
} }
void TestCore::testRewriterRemoveObjectDefinition() void tst_TestCore::testRewriterRemoveObjectDefinition()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6131,7 +6131,7 @@ void TestCore::testRewriterRemoveObjectDefinition()
node1.destroy(); node1.destroy();
} }
void TestCore::testRewriterRemoveScriptBinding() void tst_TestCore::testRewriterRemoveScriptBinding()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6182,7 +6182,7 @@ void TestCore::testRewriterRemoveScriptBinding()
QCOMPARE(textEdit.toPlainText(), expected); QCOMPARE(textEdit.toPlainText(), expected);
} }
void TestCore::testRewriterNodeReparenting() void tst_TestCore::testRewriterNodeReparenting()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6285,7 +6285,7 @@ void TestCore::testRewriterNodeReparenting()
QCOMPARE(textEdit.toPlainText(), expected); QCOMPARE(textEdit.toPlainText(), expected);
} }
void TestCore::testRewriterNodeReparentingWithTransaction() void tst_TestCore::testRewriterNodeReparentingWithTransaction()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6355,7 +6355,7 @@ void TestCore::testRewriterNodeReparentingWithTransaction()
"}"); "}");
QCOMPARE(textEdit.toPlainText(), expected); QCOMPARE(textEdit.toPlainText(), expected);
} }
void TestCore::testRewriterMovingInOut() void tst_TestCore::testRewriterMovingInOut()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6411,7 +6411,7 @@ void TestCore::testRewriterMovingInOut()
QCOMPARE(textEdit.toPlainText(), expected2); QCOMPARE(textEdit.toPlainText(), expected2);
} }
void TestCore::testRewriterMovingInOutWithTransaction() void tst_TestCore::testRewriterMovingInOutWithTransaction()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6462,7 +6462,7 @@ void TestCore::testRewriterMovingInOutWithTransaction()
QCOMPARE(textEdit.toPlainText(), expected2); QCOMPARE(textEdit.toPlainText(), expected2);
} }
void TestCore::testRewriterComplexMovingInOut() void tst_TestCore::testRewriterComplexMovingInOut()
{ {
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.7\n" "import Qt 4.7\n"
@@ -6560,7 +6560,7 @@ void TestCore::testRewriterComplexMovingInOut()
QCOMPARE(textEdit.toPlainText(), expected4); QCOMPARE(textEdit.toPlainText(), expected4);
} }
void TestCore::removeCenteredInAnchorByDetaching() void tst_TestCore::removeCenteredInAnchorByDetaching()
{ {
QPlainTextEdit textEdit1; QPlainTextEdit textEdit1;
textEdit1.setPlainText("import Qt 4.7; Item { Rectangle { id: child; anchors.centerIn: parent } }"); textEdit1.setPlainText("import Qt 4.7; Item { Rectangle { id: child; anchors.centerIn: parent } }");
@@ -6614,7 +6614,7 @@ void TestCore::removeCenteredInAnchorByDetaching()
} }
void TestCore::changePropertyBinding() void tst_TestCore::changePropertyBinding()
{ {
QScopedPointer<Model> model(Model::create("Qt/Item")); QScopedPointer<Model> model(Model::create("Qt/Item"));
@@ -6656,7 +6656,7 @@ void TestCore::changePropertyBinding()
} }
void TestCore::loadTestFiles() void tst_TestCore::loadTestFiles()
{ {
{ //empty.qml { //empty.qml
QFile file(":/fx/empty.qml"); QFile file(":/fx/empty.qml");
@@ -6799,7 +6799,7 @@ static QString rectWithGradient = "import Qt 4.7\n"
" }\n" " }\n"
"}"; "}";
void TestCore::loadGradient() void tst_TestCore::loadGradient()
{ {
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
textEdit.setPlainText(rectWithGradient); textEdit.setPlainText(rectWithGradient);
@@ -6894,7 +6894,7 @@ void TestCore::loadGradient()
} }
} }
void TestCore::changeGradientId() void tst_TestCore::changeGradientId()
{ {
try { try {
QPlainTextEdit textEdit; QPlainTextEdit textEdit;
@@ -6953,4 +6953,4 @@ void TestCore::changeGradientId()
} }
QTEST_MAIN(TestCore); QTEST_MAIN(tst_TestCore);

4
tests/auto/qml/qmldesigner/coretests/testcore.h → tests/auto/qml/qmldesigner/coretests/tst_testcore.h
View File

@@ -35,11 +35,11 @@
#include <QtTest> #include <QtTest>
class TestCore : public QObject class tst_TestCore : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
TestCore(); tst_TestCore();
private slots: private slots:
void initTestCase(); void initTestCase();

6
tests/manual/gdbdebugger/gui/gui.pro
View File

@@ -5,7 +5,9 @@
TARGET = gui TARGET = gui
CONFIG+=console CONFIG+=console
TEMPLATE = app TEMPLATE = app
SOURCES += main.cpp \ SOURCES += \
mainwindow.cpp mainwindow.cpp \
tst_gui.cpp
HEADERS += mainwindow.h HEADERS += mainwindow.h
FORMS += mainwindow.ui FORMS += mainwindow.ui

0
tests/manual/gdbdebugger/gui/main.cpp → tests/manual/gdbdebugger/gui/tst_gui.cpp
View File

0
tests/manual/gdbdebugger/simple/app.cpp → tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
View File

5
tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro
View File

@@ -1,11 +1,12 @@
TEMPLATE = app TEMPLATE = app
TARGET = debuggertest TARGET = simple_gdbtest_app
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
DESTDIR = . DESTDIR = .
# Input # Input
SOURCES += app.cpp SOURCES += \
simple_gdbtest_app.cpp
# SOURCES += ../../../share/qtcreator/gdbmacros/gdbmacros.cpp # SOURCES += ../../../share/qtcreator/gdbmacros/gdbmacros.cpp
QT += network QT += network

0
tests/manual/gdbdebugger/simple/plugin.cpp → tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp
View File

8
tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro
View File

@@ -1,9 +1,9 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = plugin TARGET = simple_gdbtest_plugin
DESTDIR = .
CONFIG += shared CONFIG += shared
SOURCES += plugin.cpp SOURCES += \
simple_gdbtest_plugin.cpp
macx { macx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/ QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/
@@ -14,5 +14,3 @@ macx {
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
QMAKE_RPATHDIR = QMAKE_RPATHDIR =
} }