feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: test the data that ends up displayed, not the raw data

Browse Source 
Change-Id: I9453abd43299416e8d8535f9567fe96ff976e413
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-11-25 18:50:54 +01:00
committed by hjk
parent 20cb2fe5a3
commit add5c8cb7a
3 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/debugger/debuggerengine.cpp
View File

@@ -299,7 +299,6 @@ public:
void reportTestError(const QString &msg, int line);
bool m_testsPossible;
QStringList m_testContents;
QString m_testErrors;
TaskHub *m_taskHub;
QString m_testFileName;
};
@@ -1117,9 +1116,6 @@ void DebuggerEngine::setState(DebuggerState state, bool forced)
BreakHandler *handler = breakHandler();
foreach (BreakpointModelId id, handler->engineBreakpointIds(this))
handler->notifyBreakpointReleased(id);
if (!d->m_testErrors.isEmpty())
showMessage(_("\nTest Errors\n\n") + d->m_testErrors);
}
const bool running = d->m_state == InferiorRunOk;
@@ -1736,10 +1732,12 @@ void DebuggerEnginePrivate::handleAutoTestLine(int line)
reportTestError(_("'Check' needs arguments."), line);
} else {
QByteArray iname = "local." + name.toLatin1();
const WatchData *data = m_engine->watchHandler()->findItem(iname);
if (data) {
QString found = m_engine->watchHandler()->displayForAutoTest(iname);
if (found.isEmpty()) {
reportTestError(_("Check referes to unknown variable %1.")
.arg(name), line);
} else {
QString needle = s.section(QLatin1Char(' '), 2, -1);
QString found = data->value + QString::fromLatin1(" " + data->type);
if (needle == found) {
m_engine->showMessage(_("Check in line %1 for %2 was successful")
.arg(line).arg(needle));
@@ -1747,9 +1745,6 @@ void DebuggerEnginePrivate::handleAutoTestLine(int line)
reportTestError(_("Check for %1 failed. Got %2.")
.arg(needle).arg(found), line);
}
} else {
reportTestError(_("Check referes to unknown variable %1.")
.arg(name), line);
}
}
handleAutoTestLine(line + 1);
@@ -1762,8 +1757,6 @@ void DebuggerEnginePrivate::handleAutoTestLine(int line)
void DebuggerEnginePrivate::reportTestError(const QString &msg, int line)
{
m_engine->showMessage(_("### Line %1: %2").arg(line).arg(msg));
m_testErrors.append(msg);
m_testErrors.append(QLatin1Char('\n'));
if (!m_taskHub) {
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();