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

2010-09-06 14:19:32 +10:00
parent 979998f4cf
commit eb498ee428
10 changed files with 38 additions and 42 deletions
@@ -1,17 +1,17 @@
 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
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += specificrules highlighterengine
+SUBDIRS += highlighterengine specificrules
@@ -1,3 +1,5 @@
+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
@@ -1,5 +1,5 @@
 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>
@@ -1,11 +1,12 @@
+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
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyeditor

-TARGET = tst_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
@@ -1,5 +1,5 @@
 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