github-migration
/
examples
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more colorizing and additional logging feature

This commit is contained in:
John Bintz 2011-04-10 15:57:48 -04:00
parent db466ca198
commit 967926b4bd
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
specrunner/specrunner.cpp
View File

@ -35,7 +35,8 @@ public:
HeadlessSpecRunner(); HeadlessSpecRunner();
void load(const QString &spec); void load(const QString &spec);
public slots: public slots:
void log(int indent, const QString &msg, const QString &clazz); void log(const QString &msg);
void specLog(int indent, const QString &msg, const QString &clazz);
private slots: private slots:
void watch(bool ok); void watch(bool ok);
protected: protected:
@ -58,6 +59,7 @@ HeadlessSpecRunner::HeadlessSpecRunner()
void HeadlessSpecRunner::load(const QString &spec) void HeadlessSpecRunner::load(const QString &spec)
{ {
m_ticker.stop(); m_ticker.stop();
m_page.mainFrame()->addToJavaScriptWindowObject("debug", this);
m_page.mainFrame()->load(spec); m_page.mainFrame()->load(spec);
m_page.setPreferredContentsSize(QSize(1024, 600)); m_page.setPreferredContentsSize(QSize(1024, 600));
} }
@ -78,14 +80,21 @@ bool HeadlessSpecRunner::hasElement(const char *select)
return !m_page.mainFrame()->findFirstElement(select).isNull(); return !m_page.mainFrame()->findFirstElement(select).isNull();
} }
void HeadlessSpecRunner::log(int indent, const QString &msg, const QString &clazz) void HeadlessSpecRunner::log(const QString &msg)
{
std::cout << "\033[0;32m" << "[console] " << "\033[m";
std::cout << qPrintable(msg);
std::cout << std::endl;
}
void HeadlessSpecRunner::specLog(int indent, const QString &msg, const QString &clazz)
{ {
for (int i = 0; i < indent; ++i) for (int i = 0; i < indent; ++i)
std::cout << " "; std::cout << " ";
if ( clazz.endsWith("fail") ) { if ( clazz.endsWith("fail") ) {
std::cout << "\033[0;31m" << qPrintable(msg) << "\033[m"; std::cout << "\033[0;31m" << qPrintable(msg) << "\033[m";
} else { } else {
std::cout << qPrintable(msg); std::cout << "\033[0;33m" << qPrintable(msg) << "\033[m";
} }
std::cout << std::endl; std::cout << std::endl;
} }
@ -95,7 +104,7 @@ void HeadlessSpecRunner::log(int indent, const QString &msg, const QString &claz
for (var c = 0; c < n.length; ++c) arguments.callee(n[c], i); return \ for (var c = 0; c < n.length; ++c) arguments.callee(n[c], i); return \
}\ }\
if (n.className === 'description' || n.className == 'resultMessage fail') {\ if (n.className === 'description' || n.className == 'resultMessage fail') {\
debug.log(i, n.textContent, n.className);\ debug.specLog(i, n.textContent, n.className);\
}\ }\
var e = n.firstElementChild;\ var e = n.firstElementChild;\
while (e) {\ while (e) {\
@ -114,15 +123,14 @@ void HeadlessSpecRunner::timerEvent(QTimerEvent *event)
if (hasElement(".runner.passed")) { if (hasElement(".runner.passed")) {
QWebElement desc = m_page.mainFrame()->findFirstElement(".description"); QWebElement desc = m_page.mainFrame()->findFirstElement(".description");
std::cout << qPrintable(desc.toPlainText()) << std::endl; std::cout << "\033[0;32m" << qPrintable(desc.toPlainText()) << "\033[m" << std::endl;
QApplication::instance()->exit(0); QApplication::instance()->exit(0);
return; return;
} }
if (hasElement(".runner.failed")) { if (hasElement(".runner.failed")) {
QWebElement desc = m_page.mainFrame()->findFirstElement(".description"); QWebElement desc = m_page.mainFrame()->findFirstElement(".description");
std::cout << "FAIL: " << qPrintable(desc.toPlainText()) << std::endl; std::cout << "\033[0;31m" << "FAIL: " << qPrintable(desc.toPlainText()) << "\033[m" << std::endl;
m_page.mainFrame()->addToJavaScriptWindowObject("debug", this);
m_page.mainFrame()->evaluateJavaScript(DUMP_MSG); m_page.mainFrame()->evaluateJavaScript(DUMP_MSG);
//QDesktopServices::openUrl(m_page.mainFrame()->url()); //QDesktopServices::openUrl(m_page.mainFrame()->url());
QApplication::instance()->exit(1); QApplication::instance()->exit(1);