Commit eb498ee4 authored by Bill King's avatar Bill King

Tests: some cleanup of pro files, marking of tested components.

parent 979998f4
TEMPLATE = subdirs
SUBDIRS += \
aggregation \
changeset \
cplusplus \
debugger \
fakevim \
generichighlighter \
# icheckbuild \
# profilereader \
# profilewriter \
aggregation \
changeset \
# icheckbuild \
generichighlighter \
utils_stringutils \
qml
qml \
utils_stringutils
contains (QT_CONFIG, declarative) {
SUBDIRS += qml
......
......@@ -3,10 +3,10 @@ CONFIG += ordered
SUBDIRS = \
ast \
semantic \
codeformatter \
codegen \
findusages \
lookup \
preprocessor \
findusages \
typeprettyprinter \
codeformatter \
codegen
semantic \
typeprettyprinter
TEMPLATE = subdirs
SUBDIRS += specificrules highlighterengine
SUBDIRS += highlighterengine specificrules
CONFIG += qtestlib testcase
include(../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
......@@ -10,8 +12,6 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins
LIBS += $$IDE_SOURCE_TREE/lib/qtcreator/plugins
TARGET=tst_$$TARGET
HEADERS += ichecklib.h \
ichecklib_global.h \
parsemanager.h
......
TEMPLATE = subdirs
SUBDIRS += qmldesigner qmlprojectmanager
# SUBDIRS += qmleditor
SUBDIRS += qmldesigner \
# qmleditor \
qmlprojectmanager
......@@ -65,6 +65,7 @@
#include <private/qdeclarativestate_p.h>
#include <private/qdeclarativemetatype_p.h>
//TESTED_COMPONENT=src/plugins/qmldesigner/designercore
using namespace QmlDesigner;
#include <cstdio>
......
TEMPLATE = app
QT += script declarative
CONFIG += qtestlib testcase
CONFIG += console
CONFIG -= app_bundle
include(../../../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
# include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri)
QT += testlib \
script \
declarative
# DESTDIR = $$DESIGNER_BINARY_DIRECTORY
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h
......@@ -13,21 +14,11 @@ SOURCES+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.cpp
INCLUDEPATH+=$$IDE_SOURCE_TREE/src/libs
#DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
DEPENDPATH += ..
DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
TARGET = tst_propertyeditor
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyeditor
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += testpropertyeditor.cpp
SOURCES += ../testview.cpp
HEADERS += testpropertyeditor.h
HEADERS += ../testview.h
RESOURCES += ../data/testfiles.qrc
HEADERS -= allpropertiesbox.h
SOURCES -= allpropertiesbox.cpp
TEMPLATE = subdirs
#SUBDIRS += bauhaustests
SUBDIRS += coretests
# SUBDIRS += propertyeditortests
# SUBDIRS += bauhaustests
#SUBDIRS += propertyeditortests
......@@ -6,13 +6,15 @@
#include <QDeclarativeEngine>
#include <QtTest>
//TESTED_COMPONENT=src/plugins/qmlprojectmanager/fileformat
using namespace QmlProjectManager;
class TestProject : public QObject
class tst_FileFormat : public QObject
{
Q_OBJECT
public:
TestProject();
tst_FileFormat();
private slots:
void testFileFilter();
......@@ -20,14 +22,14 @@ private slots:
void testLibraryPaths();
};
TestProject::TestProject()
tst_FileFormat::tst_FileFormat()
{
QmlProjectFileFormat::registerDeclarativeTypes();
}
QString testDataDir = QLatin1String(SRCDIR "/data");
void TestProject::testFileFilter()
void tst_FileFormat::testFileFilter()
{
//
// Search for qml files in directory + subdirectories
......@@ -208,7 +210,7 @@ void TestProject::testFileFilter()
}
}
void TestProject::testMatchesFile()
void tst_FileFormat::testMatchesFile()
{
//
// search for qml files in local directory
......@@ -243,7 +245,7 @@ void TestProject::testMatchesFile()
QVERIFY(!project->matchesFile(testDataDir + "/script.css"));
}
void TestProject::testLibraryPaths()
void tst_FileFormat::testLibraryPaths()
{
//
// search for qml files in local directory
......@@ -274,5 +276,5 @@ void TestProject::testLibraryPaths()
}
QTEST_MAIN(TestProject);
QTEST_MAIN(tst_FileFormat);
#include "tst_fileformat.moc"
......@@ -31,6 +31,8 @@
#include <QtTest/QtTest>
//TESTED_COMPONENT=src/libs/utils
class tst_StringUtils : public QObject
{
Q_OBJECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment