[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-06-05 21:43:17
Message-ID: 1212702197.417258.16943.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 817376 by mbreugel:
Renamed xmlparser to outputparser. Introduced some string constants.
M +1 -1 CMakeLists.txt
M +3 -3 qtestitem.cpp
A qtestoutputparser.cpp [License: GPL (v2+)]
A qtestoutputparser.h [License: GPL (v2+)]
M +19 -11 qtestregister.cpp
M +9 -3 qtestregister.h
D qtestxmlparser.cpp
D qtestxmlparser.h
M +6 -6 tests/CMakeLists.txt
A tests/qtestoutputparsertest.cpp [License: GPL (v2+)]
A tests/qtestoutputparsertest.h [License: GPL (v2+)]
D tests/qtestxmlparsertest.cpp
D tests/qtestxmlparsertest.h
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/CMakeLists.txt #817375:817376
@@ -15,7 +15,7 @@
set(qxqtest_SRCS
qtestresult.cpp
- qtestxmlparser.cpp
+ qtestoutputparser.cpp
qtestcase.cpp
qtestcommand.cpp
qtestbase.cpp
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestitem.cpp #817375:817376
@@ -19,13 +19,13 @@
*/
#include "qtestitem.h"
-#include "qtestxmlparser.h"
+#include "qtestoutputparser.h"
#include "qtestcommand.h"
#include "kdebug.h"
using QxQTest::QTestItem;
-using QxQTest::QTestXmlParser;
+using QxQTest::QTestOutputParser;
using QxQTest::QTestCommand;
using QxRunner::RunnerItem;
@@ -66,7 +66,7 @@
int QTestItem::parseOutput(KProcess* proc)
{
- QTestXmlParser parser(proc);
+ QTestOutputParser parser(proc);
QTestResult res = parser.go();
res.log();
setData(2, res.message());
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestregister.cpp #817375:817376
@@ -64,8 +64,16 @@
} // namespace
+const QString QTestRegister::c_suite("suite");
+const QString QTestRegister::c_case("case");
+const QString QTestRegister::c_cmd("command");
+const QString QTestRegister::c_root("root");
+const QString QTestRegister::c_name("name");
+const QString QTestRegister::c_dir("dir");
+const QString QTestRegister::c_exe("exe");
+
QTestRegister::QTestRegister()
- : suiteTag("suite"), caseTag("case"), cmdTag("command"), m_root("")
+ : m_root("")
{
}
@@ -99,9 +107,9 @@
while (!atEnd())
{
readNext();
- if (isStartElement_("root"))
- m_root = attributes().value("dir").toString();
- if (isStartElement_(suiteTag))
+ if (isStartElement_(c_root))
+ m_root = attributes().value(c_dir).toString();
+ if (isStartElement_(c_suite))
processSuite();
}
@@ -114,10 +122,10 @@
m_suites.push_back(suite);
kDebug(9504) << suite->name();
- while (!atEnd() && !isEndElement_(suiteTag))
+ while (!atEnd() && !isEndElement_(c_suite))
{
readNext();
- if (isStartElement_(caseTag))
+ if (isStartElement_(c_case))
processCase(suite);
}
}
@@ -127,10 +135,10 @@
QTestCase* caze = new QTestCase(fetchName(), fetchExe(), suite);
suite->addTest(caze);
kDebug(9504) << caze->name();
- while (!atEnd() && !isEndElement_(caseTag))
+ while (!atEnd() && !isEndElement_(c_case))
{
readNext();
- if (isStartElement_(cmdTag))
+ if (isStartElement_(c_cmd))
processCmd(caze);
}
}
@@ -145,12 +153,12 @@
QString QTestRegister::fetchName()
{
- return attributes().value("name").toString();
+ return attributes().value(c_name).toString();
}
QFileInfo QTestRegister::fetchDir()
{
- QString dir = attributes().value("dir").toString();
+ QString dir = attributes().value(c_dir).toString();
if (m_root != "")
dir = m_root + dir;
return QFileInfo(dir);
@@ -158,7 +166,7 @@
QFileInfo QTestRegister::fetchExe()
{
- return QFileInfo(attributes().value("exe").toString());
+ return QFileInfo(attributes().value(c_exe).toString());
}
unsigned QTestRegister::testSuiteCount()
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/qtestregister.h #817375:817376
@@ -57,9 +57,15 @@
private: // state
QList<QTestSuite*> m_suites;
QString m_root;
- const QString suiteTag;
- const QString caseTag;
- const QString cmdTag;
+
+ // some xml constants
+ static const QString c_suite;
+ static const QString c_case;
+ static const QString c_cmd;
+ static const QString c_root;
+ static const QString c_dir;
+ static const QString c_name;
+ static const QString c_exe;
};
} // end namespace QxQTest
--- trunk/KDE/kdevelop/plugins/xtest/qxqtest/tests/CMakeLists.txt #817375:817376
@@ -14,9 +14,9 @@
qxqtest)
endmacro(kdev_qx_add_test)
-kdev_qx_add_test(ut-qtestxmlparser "qtestxmlparsertest.cpp")
-kdev_qx_add_test(ut-testcase "qtestcasetest.cpp")
-kdev_qx_add_test(ut-testcommand "qtestcommandtest.cpp")
-kdev_qx_add_test(ut-testbase "qtestbasetest.cpp")
-kdev_qx_add_test(ut-testsuite "qtestsuitetest.cpp")
-kdev_qx_add_test(ut-testregister "qtestregistertest.cpp")
+kdev_qx_add_test(ut-qtestoutputparser "qtestoutputparsertest.cpp")
+kdev_qx_add_test(ut-qtestcase "qtestcasetest.cpp")
+kdev_qx_add_test(ut-qtestcommand "qtestcommandtest.cpp")
+kdev_qx_add_test(ut-qtestbase "qtestbasetest.cpp")
+kdev_qx_add_test(ut-qtestsuite "qtestsuitetest.cpp")
+kdev_qx_add_test(ut-qtestregister "qtestregistertest.cpp")
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic