Browse Source

Better output for signal failures

QGC4.4
Don Gagne 11 years ago
parent
commit
e839160947
  1. 13
      src/qgcunittest/MultiSignalSpy.cc
  2. 2
      src/qgcunittest/MultiSignalSpy.h

13
src/qgcunittest/MultiSignalSpy.cc

@ -96,6 +96,7 @@ bool MultiSignalSpy::checkSignalByMask(quint16 mask) @@ -96,6 +96,7 @@ bool MultiSignalSpy::checkSignalByMask(quint16 mask)
Q_ASSERT(spy != NULL);
if (spy->count() != 1) {
_printSignalState();
return false;
}
}
@ -114,10 +115,12 @@ bool MultiSignalSpy::checkOnlySignalByMask(quint16 mask) @@ -114,10 +115,12 @@ bool MultiSignalSpy::checkOnlySignalByMask(quint16 mask)
if ((1 << i) & mask) {
if (spy->count() != 1) {
_printSignalState();
return false;
}
} else {
if (spy->count() != 0) {
_printSignalState();
return false;
}
}
@ -135,6 +138,7 @@ bool MultiSignalSpy::checkNoSignalByMask(quint16 mask) @@ -135,6 +138,7 @@ bool MultiSignalSpy::checkNoSignalByMask(quint16 mask)
Q_ASSERT(spy != NULL);
if (spy->count() != 0) {
_printSignalState();
return false;
}
}
@ -232,3 +236,12 @@ bool MultiSignalSpy::waitForSignalByIndex( @@ -232,3 +236,12 @@ bool MultiSignalSpy::waitForSignalByIndex(
return spy->count() != 0;
}
void MultiSignalSpy::_printSignalState(void)
{
for (size_t i=0; i<_cSignals; i++) {
QSignalSpy* spy = _rgSpys[i];
Q_ASSERT(spy != NULL);
qDebug() << "Signal index:" << i << "count:" << spy->count();
}
}

2
src/qgcunittest/MultiSignalSpy.h

@ -59,6 +59,8 @@ public: @@ -59,6 +59,8 @@ public:
private:
// QObject overrides
void timerEvent(QTimerEvent * event);
void _printSignalState(void);
QObject* _signalEmitter;
const char** _rgSignals;

Loading…
Cancel
Save