Commit 1f0b600b authored by Bill King's avatar Bill King

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

parent f91ba77c
......@@ -31,6 +31,8 @@
#include <QtTest/QtTest>
//TESTED_COMPONENT=src/libs/aggregation
class tst_Aggregate : public QObject
{
Q_OBJECT
......
......@@ -5,11 +5,13 @@ SUBDIRS += \
debugger \
fakevim \
# profilereader \
# profilewriter \
aggregation \
changeset \
# icheckbuild \
generichighlighter \
utils_stringutils
utils_stringutils \
qml
contains (QT_CONFIG, declarative) {
SUBDIRS += qml
......
......@@ -31,6 +31,8 @@
#include <QtTest/QtTest>
//TESTED_COMPONENT=src/utils/changeset
class tst_ChangeSet : public QObject
{
Q_OBJECT
......
......@@ -7,6 +7,7 @@
#include <Parser.h>
#include <AST.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus;
class tst_AST: public QObject
......
......@@ -13,6 +13,8 @@
#include <QtDebug>
#include <QTextDocument>
//TESTED_COMPONENT=src/libs/cplusplus
/*!
Tests for various parts of the code generation. Well, okay, currently it only
tests the InsertionPointLocator.
......
......@@ -15,6 +15,7 @@
#include <Symbols.h>
#include <Overview.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus;
class CollectNames: public ASTVisitor
......
......@@ -13,6 +13,7 @@
#include <Symbols.h>
#include <Overview.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus;
template <template <typename, typename> class _Map, typename _T1, typename _T2>
......
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase
TARGET = tst_$$TARGET
include(../shared/shared.pri)
SOURCES += tst_preprocessor.cpp
#include <QtTest>
#include <pp.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus;
class tst_Preprocessor: public QObject
......
......@@ -20,6 +20,7 @@
#include <ExpressionUnderCursor.h>
#include <Names.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus;
class tst_Semantic: public QObject
......
......@@ -15,6 +15,7 @@
#include <Scope.h>
#include <TypePrettyPrinter.h>
//TESTED_COMPONENT=src/libs/cplusplus
using namespace CPlusPlus;
class tst_TypePrettyPrinter: public QObject
......
This diff is collapsed.
......@@ -6,6 +6,7 @@
//bool checkUninitialized = true;
bool checkUninitialized = false;
//#define DO_DEBUG 1
//TESTED_COMPONENT=src/plugins/debugger/gdb
#include "gdb/gdbmi.h"
......
......@@ -3,6 +3,7 @@
#include <QtTest>
//TESTED_COMPONENT=src/plugins/debugger/gdb
class tst_Version : public QObject
{
......
......@@ -7,13 +7,13 @@ FAKEVIMDIR = ../../../src/plugins/fakevim
UTILSDIR = ../../../src/libs
SOURCES += \
main.cpp \
$$FAKEVIMDIR/fakevimhandler.cpp \
$$FAKEVIMDIR/fakevimactions.cpp \
$$FAKEVIMDIR/fakevimsyntax.cpp \
$$UTILSDIR/utils/savedaction.cpp \
$$UTILSDIR/utils/pathchooser.cpp \
$$UTILSDIR/utils/basevalidatinglineedit.cpp \
tst_fakevim.cpp
HEADERS += \
$$FAKEVIMDIR/fakevimhandler.h \
......@@ -24,5 +24,3 @@ HEADERS += \
$$UTILSDIR/utils/basevalidatinglineedit.h \
INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
TARGET=tst_$$TARGET
......@@ -36,6 +36,7 @@
#include <QtTest/QtTest>
//TESTED_COMPONENT=src/plugins/fakevim
using namespace FakeVim;
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;
QApplication app(argc, argv); \
QApplication app(argc, argv);
// Test with QPlainTextEdit.
tst_FakeVim plaintextedit(true);
......@@ -881,5 +882,4 @@ int main(int argc, char *argv[]) \
return res;
}
#include "main.moc"
#include "tst_fakevim.moc"
......@@ -5,9 +5,9 @@ PLUGINSDIR = ../../../../src/plugins
GENERICHIGHLIGHTERDIR = $$PLUGINSDIR/texteditor/generichighlighter
SOURCES += \
$$PWD/tst_highlighterengine.cpp \
$$PWD/highlightermock.cpp \
$$PWD/formats.cpp \
tst_highlighterengine.cpp \
highlightermock.cpp \
formats.cpp \
$$GENERICHIGHLIGHTERDIR/highlighter.cpp \
$$GENERICHIGHLIGHTERDIR/context.cpp \
$$GENERICHIGHLIGHTERDIR/dynamicrule.cpp \
......@@ -19,11 +19,11 @@ SOURCES += \
$$GENERICHIGHLIGHTERDIR/itemdata.cpp
HEADERS += \
$$PWD/highlightermock.h \
$$PWD/basetextdocumentlayout.h \
$$PWD/formats.h \
$$PWD/tabsettings.h \
$$PWD/syntaxhighlighter.h \
highlightermock.h \
basetextdocumentlayout.h \
formats.h \
tabsettings.h \
syntaxhighlighter.h \
$$GENERICHIGHLIGHTERDIR/highlighter.h \
$$GENERICHIGHLIGHTERDIR/context.h \
$$GENERICHIGHLIGHTERDIR/dynamicrule.h \
......@@ -35,5 +35,3 @@ HEADERS += \
$$GENERICHIGHLIGHTERDIR/itemdata.h
INCLUDEPATH += $$GENERICHIGHLIGHTERDIR $$PWD
TARGET=tst_$$TARGET
......@@ -49,6 +49,8 @@ Q_DECLARE_METATYPE(HighlightSequence)
Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QList<HighlightSequence>)
//TESTED_COMPONENT=src/plugins/texteditor/generichighlighter
class tst_HighlighterEngine : public QObject
{
Q_OBJECT
......
......@@ -34,6 +34,7 @@
#include <QtTest/QtTest>
//TESTED_COMPONENT=src/plugins/texteditor/generichighlighter
using namespace TextEditor;
using namespace Internal;
......
......@@ -30,7 +30,7 @@
#ifndef PROFILECACHE_H
#define PROFILECACHE_H
#include "proitems.h"
#include <proitems.h>
#include <QString>
namespace Qt4ProjectManager {
......
load(qttest_p4)
TEMPLATE = app
CONFIG += qt warn_on console depend_includepath
CONFIG += qtestlib testcase
SOURCES += \
proitems.cpp \
profileevaluator.cpp \
profilereader.cpp \
main.cpp
tst_profilereader.cpp
HEADERS += \
profileevaluator.h \
proparserutils.h \
proitems.h \
abstractproitemvisitor.h \
profilereader.h \
profilecache.h \
qtversionmanager.h
TARGET=tst_$$TARGET
......@@ -27,9 +27,7 @@
**
**************************************************************************/
#include "profilereader.h"
#include "profilecache.h"
#include "proitems.h"
#include <QtTest/QtTest>
#include <QtCore/QSet>
......@@ -73,4 +71,4 @@ void tst_ProFileReader::conditionalScopes()
}
QTEST_MAIN(tst_ProFileReader)
#include "main.moc"
#include "tst_profilereader.moc"
load(qttest_p4)
include(../../../src/shared/proparser/proparser.pri)
SOURCES += main.cpp
SOURCES += \
tst_profilewriter.cpp
QT -= gui
......@@ -296,4 +296,4 @@ void tst_ProFileWriter::multiVar()
}
QTEST_MAIN(tst_ProFileWriter)
#include "main.moc"
#include "tst_profilewriter.moc"
......@@ -24,10 +24,12 @@ TARGET = tst_qmldesigner_core
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += testcore.cpp \
SOURCES += \
../testview.cpp \
testrewriterview.cpp
HEADERS += testcore.h \
testrewriterview.cpp \
tst_testcore.cpp
HEADERS += \
../testview.h \
testrewriterview.h
testrewriterview.h \
tst_testcore.h
RESOURCES += ../data/testfiles.qrc
......@@ -35,11 +35,11 @@
#include <QtTest>
class TestCore : public QObject
class tst_TestCore : public QObject
{
Q_OBJECT
public:
TestCore();
tst_TestCore();
private slots:
void initTestCase();
......
......@@ -5,7 +5,9 @@
TARGET = gui
CONFIG+=console
TEMPLATE = app
SOURCES += main.cpp \
mainwindow.cpp
SOURCES += \
mainwindow.cpp \
tst_gui.cpp
HEADERS += mainwindow.h
FORMS += mainwindow.ui
TEMPLATE = app
TARGET = debuggertest
TARGET = simple_gdbtest_app
DEPENDPATH += .
INCLUDEPATH += .
DESTDIR = .
# Input
SOURCES += app.cpp
SOURCES += \
simple_gdbtest_app.cpp
# SOURCES += ../../../share/qtcreator/gdbmacros/gdbmacros.cpp
QT += network
......
TEMPLATE = lib
TARGET = plugin
DESTDIR = .
TARGET = simple_gdbtest_plugin
CONFIG += shared
SOURCES += plugin.cpp
SOURCES += \
simple_gdbtest_plugin.cpp
macx {
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_RPATHDIR =
}
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