Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 8b2d269a authored by Manuel Breugelmans's avatar Manuel Breugelmans

Adapt to changes in kdevplatform/veritas

parent f69eb420
......@@ -11,3 +11,4 @@ endif (CPPUNIT_FOUND)
if (CHECK_FOUND)
add_subdirectory(check)
endif (CHECK_FOUND)
......@@ -44,7 +44,6 @@ using KDevelop::IProject;
using KDevelop::IProjectController;
using Veritas::Test;
using Veritas::ITest;
using Veritas::Register;
using Veritas::TestRunnerToolView;
......@@ -87,7 +86,7 @@ CheckView::CheckView(QObject* parent, const QVariantList &)
CheckView::~CheckView()
{}
ITest* CheckView::registerTests()
Test* CheckView::registerTests()
{
Register<TestRoot, TestSuite> reg;
reg.addFromExe(QFileInfo(fetchExe()));
......
......@@ -25,7 +25,7 @@
#include <QVariantList>
class CheckViewFactory;
namespace Veritas { class ITest; }
namespace Veritas { class Test; }
class CheckView : public Veritas::TestRunnerToolView
{
......@@ -35,7 +35,7 @@ public:
virtual ~CheckView();
protected:
Veritas::ITest* registerTests();
Veritas::Test* registerTests();
private:
QString fetchExe();
......
......@@ -103,8 +103,9 @@ bool OutputParser::isEndElement_(const QString& elementName)
void OutputParser::go(TestRoot* root)
{
m_root = root;
if (!device()->isOpen())
if (!device()->isOpen()) {
device()->open(QIODevice::ReadOnly);
}
if (!device()->isReadable()) {
// do something
}
......@@ -153,8 +154,8 @@ void OutputParser::postResult(const QString& caze, const QString& cmd, const QSt
ENSURE_FOUND(m_cmd, m_case, cmd);
m_cmd->setResult(m_result);
m_cmd->started();
m_cmd->finished();
m_cmd->signalStarted();
m_cmd->signalFinished();
}
/*
......
......@@ -44,7 +44,6 @@ using KDevelop::Core;
using KDevelop::IProject;
using KDevelop::IProjectController;
using Veritas::Test;
using Veritas::ITest;
using Veritas::TestRunnerToolView;
using Veritas::Register;
using CppUnit::TestRoot;
......@@ -86,7 +85,7 @@ CppUnitView::CppUnitView(QObject* parent, const QVariantList &)
CppUnitView::~CppUnitView()
{}
ITest* CppUnitView::registerTests()
Test* CppUnitView::registerTests()
{
Register<TestRoot, TestSuite> reg;
reg.addFromExe(QFileInfo(fetchExe()));
......
......@@ -25,8 +25,7 @@
#include <QVariantList>
class CppUnitViewFactory;
namespace Veritas { class Test;
class ITest; }
namespace Veritas { class Test; }
class CppUnitView : public Veritas::TestRunnerToolView
{
......@@ -36,7 +35,7 @@ public:
virtual ~CppUnitView();
protected:
Veritas::ITest* registerTests();
Veritas::Test* registerTests();
private:
QString fetchExe();
......
......@@ -157,7 +157,7 @@ void OutputParser::processCmd()
m_currentCmd = fetchName();
m_cmd = m_case->childNamed(m_currentCmd);
ENSURE_FOUND(m_cmd, m_case, m_currentCmd);
m_cmd->started();
m_cmd->signalStarted();
m_result = new TestResult;
}
Q_ASSERT(m_cmd);
......@@ -175,7 +175,7 @@ void OutputParser::processCmd()
if (!gotFailureMsg)
setSuccess();
m_cmd->setResult(m_result);
m_cmd->finished();
m_cmd->signalFinished();
}
}
......
......@@ -128,7 +128,7 @@ void QTestOutputParser::processTestFunction()
Test* cmd = m_case->childNamed(cmdName);
m_result = new TestResult; // this probably leaks. TODO
if (cmd)
cmd->started();
cmd->signalStarted();
}
m_processingTestFunction = true;
while (!atEnd() && !isEndElement_(c_testfunction)) {
......@@ -142,12 +142,12 @@ void QTestOutputParser::processTestFunction()
Test* cmd = m_case->childNamed(cmdName);
if (cmd) {
cmd->setResult(m_result);
cmd->finished();
cmd->signalFinished();
} else if (fixtureFailed(cmdName)) {
kDebug() << "init/cleanup TestCase failed";
m_case->started();
m_case->signalStarted();
m_case->setResult(m_result);
m_case->finished();
m_case->signalFinished();
}
m_processingTestFunction = false;
}
......
......@@ -70,7 +70,6 @@ using KDevelop::IProjectFileManager;
using KDevelop::ContextMenuExtension;
using Veritas::Test;
using Veritas::ITest;
using Veritas::TestRunnerToolView;
using QTest::Settings;
......@@ -110,7 +109,7 @@ QTestView::QTestView(QObject* parent, const QVariantList&)
QTestView::~QTestView()
{}
ITest* QTestView::registerTests()
Test* QTestView::registerTests()
{
kDebug() << "Loading test registration XML: " << fetchRegXML();
QFile* testXML = new QFile(fetchRegXML());
......
......@@ -27,7 +27,6 @@
#include <kdevplatform/veritas/testrunnertoolview.h>
class QTestViewFactory;
namespace Veritas { class ITest; }
namespace KDevelop { class ContextMenuExtension;
class Context;
class ProjectFolderItem; }
......@@ -42,10 +41,10 @@ public:
KDevelop::ContextMenuExtension contextMenuExtension(KDevelop::Context* context);
protected:
Veritas::ITest* registerTests();
Veritas::Test* registerTests();
private slots:
void newQTest();
void newQTest();
private:
QString fetchBuildRoot();
......
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