[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdevelop/plugins/xtest/qxqtest
From: Manuel Breugelmans <mbr.nxi () gmail ! com>
Date: 2008-05-31 22:18:22
Message-ID: 1212272302.604133.19933.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 815010 by mbreugel:
Pushed up a bit of common code from QTestCase and Suite to base
M +15 -0 qtestbase.cpp
M +8 -0 qtestbase.h
M +1 -11 qtestcase.cpp
M +0 -4 qtestcase.h
M +2 -5 qtestmodel.cpp
M +2 -2 qtestregister.cpp
M +1 -11 qtestsuite.cpp
M +0 -5 qtestsuite.h
M +6 -6 tests/qtestcasetest.cpp
M +7 -7 tests/qtestregistertest.cpp
M +3 -3 tests/qtestsuitetest.cpp
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestbase.cpp #815009:815010
@@ -54,4 +54,19 @@
m_parent = parent;
}
+void QTestBase::addTest(QTestBase* test)
+{
+ m_children.push_back(test);
+}
+
+QTestBase* QTestBase::childAt(unsigned i)
+{
+ return m_children.value(i);
+}
+
+unsigned QTestBase::childCount()
+{
+ return m_children.count();
+}
+
#include "qtestbase.moc"
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestbase.h #815009:815010
@@ -21,6 +21,7 @@
#ifndef QXQTEST_QTESTBASE_H
#define QXQTEST_QTESTBASE_H
+#include <QList>
#include <QString>
#include <QFileInfo>
@@ -44,9 +45,16 @@
void setName(const QString&);
void setParent(QTestBase* parent);
+ void addTest(QTestBase*);
+ unsigned childCount();
+
+protected:
+ QTestBase* childAt(unsigned i);
+
private:
QString m_name;
QTestBase* m_parent;
+ QList<QTestBase*> m_children;
};
} // end namespace QxQTest
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestcase.cpp #815009:815010
@@ -37,11 +37,6 @@
QTestCase::~QTestCase()
{}
-int QTestCase::testCommandCount()
-{
- return m_children.count();
-}
-
QFileInfo QTestCase::executable()
{
return m_exe;
@@ -52,14 +47,9 @@
m_exe = exe;
}
-void QTestCase::addTest(QTestCommand* test)
-{
- m_children.push_back(test);
-}
-
QTestCommand* QTestCase::testAt(unsigned i)
{
- return m_children.value(i);
+ return qobject_cast<QTestCommand*>(childAt(i));
}
#include "qtestcase.moc"
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestcase.h #815009:815010
@@ -23,7 +23,6 @@
#include <QString>
#include <QFileInfo>
-#include <QList>
#include "qtestbase.h"
#include "qtestcommand.h"
@@ -39,16 +38,13 @@
QTestCase(const QString&, const QFileInfo&, QTestBase* parent);
virtual ~QTestCase();
- void addTest(QTestCommand* test);
QTestCommand* testAt(unsigned i);
- int testCommandCount();
QFileInfo executable();
void setExe(const QFileInfo&);
private:
QFileInfo m_exe;
- QList<QTestCommand*> m_children;
};
} // end namespace QxQTest
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestmodel.cpp #815009:815010
@@ -77,20 +77,17 @@
}
}
-// TODO push-up the nrofChildren & getTestAt methods
-// so the follwing mtds can be merged
-
void QTestModel::addSuite(QTestSuite* suite)
{
RunnerItem* item = addTestItem(suite, rootItem());
- for (unsigned i=0; i<suite->testCaseCount(); i++)
+ for (unsigned i=0; i<suite->childCount(); i++)
addCase(suite->testAt(i), item);
}
void QTestModel::addCase(QTestCase* caze, RunnerItem* parent)
{
RunnerItem* item = addTestItem(caze, parent);
- for (unsigned i=0; i<caze->testCommandCount(); i++)
+ for (unsigned i=0; i<caze->childCount(); i++)
addTestItem(caze->testAt(i), item);
}
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestregister.cpp #815009:815010
@@ -37,7 +37,7 @@
void cleanup(QTestCase* caze)
{
if (!caze) return;
- unsigned nrof = caze->testCommandCount();
+ unsigned nrof = caze->childCount();
QTestCommand* cmd;
for (unsigned i = 0; i < nrof; i++)
{
@@ -52,7 +52,7 @@
{
if (!suite)
return;
- unsigned nrof = suite->testCaseCount();
+ unsigned nrof = suite->childCount();
QTestCase* caze;
for (unsigned i = 0; i < nrof; i++)
{
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestsuite.cpp #815009:815010
@@ -38,11 +38,6 @@
{
}
-unsigned QTestSuite::testCaseCount()
-{
- return m_children.count();
-}
-
QFileInfo QTestSuite::path()
{
return m_path;
@@ -53,14 +48,9 @@
m_path = path;
}
-void QTestSuite::addTest(QTestCase* test)
-{
- m_children.push_back(test);
-}
-
QTestCase* QTestSuite::testAt(unsigned i)
{
- return m_children.value(i);
+ return qobject_cast<QTestCase*>(childAt(i));
}
#include "qtestsuite.moc"
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestsuite.h #815009:815010
@@ -23,7 +23,6 @@
#include <QString>
#include <QFileInfo>
-#include <QList>
#include "qtestbase.h"
#include "qtestcase.h"
@@ -39,17 +38,13 @@
QTestSuite(const QString&, const QFileInfo&, QTestBase* parent);
virtual ~QTestSuite();
- void addTest(QTestCase* test);
QTestCase* testAt(unsigned i);
- unsigned testCaseCount();
QFileInfo path();
-
void setPath(const QFileInfo&);
private:
QFileInfo m_path;
- QList<QTestCase*> m_children;
};
} // end namespace QxQTest
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/tests/qtestcasetest.cpp #815009:815010
@@ -49,37 +49,37 @@
void QTestCaseTest::constructDefault()
{
QTestCase q;
- KOMPARE(q.testCommandCount(), 0);
+ KOMPARE(q.childCount(), 0);
KOMPARE(q.name(), "");
KOMPARE(q.executable(), QFileInfo(""));
}
void QTestCaseTest::construct()
{
- KOMPARE(m_case->testCommandCount(), 0);
+ KOMPARE(m_case->childCount(), 0);
KOMPARE(m_case->name(), m_name);
KOMPARE(m_case->executable(), m_exe);
}
void QTestCaseTest::addCommand()
{
- KOMPARE(m_case->testCommandCount(), 0);
+ KOMPARE(m_case->childCount(), 0);
QTestCommand c1(someCmd(), m_case);
m_case->addTest(&c1);
- KOMPARE(m_case->testCommandCount(), 1);
+ KOMPARE(m_case->childCount(), 1);
KOMPARE(m_case->testAt(0), &c1);
}
void QTestCaseTest::addCommands()
{
- KOMPARE(m_case->testCommandCount(), 0);
+ KOMPARE(m_case->childCount(), 0);
QTestCommand c1(someCmd(), m_case);
m_case->addTest(&c1);
QTestCommand c2(someCmd(), m_case);
m_case->addTest(&c2);
- KOMPARE(m_case->testCommandCount(), 2);
+ KOMPARE(m_case->childCount(), 2);
KOMPARE(m_case->testAt(0), &c1);
KOMPARE(m_case->testAt(1), &c2);
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/tests/qtestregistertest.cpp #815009:815010
@@ -99,7 +99,7 @@
KOMPARE(1, reg->testSuiteCount());
QTestSuite expected("suite1", QFileInfo("/a/b"), 0);
compareSuites(&expected, reg->takeSuite(0));
- KOMPARE(0, reg->takeSuite(0)->testCaseCount());
+ KOMPARE(0, reg->takeSuite(0)->childCount());
}
void QTestRegisterTest::parseMultiSuitesXml()
{
@@ -110,11 +110,11 @@
// suite1
QTestSuite exp1("suite1", QFileInfo("/a/b"), 0);
compareSuites(&exp1, reg->takeSuite(0));
- KOMPARE(0, reg->takeSuite(0)->testCaseCount());
+ KOMPARE(0, reg->takeSuite(0)->childCount());
// suite2
QTestSuite exp2("suite2", QFileInfo("/c/d"), 0);
compareSuites(&exp2, reg->takeSuite(1));
- KOMPARE(0, reg->takeSuite(1)->testCaseCount());
+ KOMPARE(0, reg->takeSuite(1)->childCount());
}
void QTestRegisterTest::compareCase(QTestCase* expected, QTestCase* actual)
@@ -129,7 +129,7 @@
QByteArray xml = headerXml + suiteStart + caze1 + suiteEnd + footerXml;
registerTests(xml);
- KOMPARE(1, reg->takeSuite(0)->testCaseCount());
+ KOMPARE(1, reg->takeSuite(0)->childCount());
QTestCase exp("test1", QFileInfo("t.sh"), reg->takeSuite(0));
compareCase(&exp, reg->takeSuite(0)->testAt(0));
}
@@ -139,7 +139,7 @@
QByteArray xml = headerXml + suiteStart + caze1 + caze2 + suiteEnd + footerXml;
registerTests(xml);
- KOMPARE(2, reg->takeSuite(0)->testCaseCount());
+ KOMPARE(2, reg->takeSuite(0)->childCount());
// caze1
QTestCase exp1("test1", QFileInfo("t.sh"), reg->takeSuite(0));
compareCase(&exp1, reg->takeSuite(0)->testAt(0));
@@ -166,9 +166,9 @@
KOMPARE(1, reg->testSuiteCount());
QTestSuite* suite = reg->takeSuite(0);
- KOMPARE(1, suite->testCaseCount());
+ KOMPARE(1, suite->childCount());
QTestCase* caze = suite->testAt(0);
- KOMPARE(2, caze->testCommandCount());
+ KOMPARE(2, caze->childCount());
// cmd1
QTestCommand* actual = caze->testAt(0);
KOMPARE("cmd11", actual->name());
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/tests/qtestsuitetest.cpp #815009:815010
@@ -55,12 +55,12 @@
void QTestSuiteTest::addChildCase()
{
- KOMPARE(m_suite->testCaseCount(), 0);
+ KOMPARE(m_suite->childCount(), 0);
QTestCase t("t1", someExe(), m_suite);
m_suite->addTest(&t);
- KOMPARE(m_suite->testCaseCount(), 1);
+ KOMPARE(m_suite->childCount(), 1);
KOMPARE(m_suite->testAt(0), &t);
}
@@ -71,7 +71,7 @@
m_suite->addTest(&t1);
m_suite->addTest(&t2);
- KOMPARE(m_suite->testCaseCount(), 2);
+ KOMPARE(m_suite->childCount(), 2);
KOMPARE(m_suite->testAt(0), &t1);
KOMPARE(m_suite->testAt(1), &t2);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic