From e839160947b8860da1cbe12953b2ccd6497103df Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 31 Jul 2014 05:37:10 -0700
Subject: [PATCH] Better output for signal failures

---
 src/qgcunittest/MultiSignalSpy.cc | 13 +++++++++++++
 src/qgcunittest/MultiSignalSpy.h  |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/src/qgcunittest/MultiSignalSpy.cc b/src/qgcunittest/MultiSignalSpy.cc
index 5d8d87c01..d9f786f4f 100644
--- a/src/qgcunittest/MultiSignalSpy.cc
+++ b/src/qgcunittest/MultiSignalSpy.cc
@@ -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)
 
         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)
             Q_ASSERT(spy != NULL);
 
             if (spy->count() != 0) {
+                _printSignalState();
                 return false;
             }
         }
@@ -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();
+    }
+}
diff --git a/src/qgcunittest/MultiSignalSpy.h b/src/qgcunittest/MultiSignalSpy.h
index 92fb905c1..1ac5f4478 100644
--- a/src/qgcunittest/MultiSignalSpy.h
+++ b/src/qgcunittest/MultiSignalSpy.h
@@ -59,6 +59,8 @@ public:
 private:
     // QObject overrides
     void timerEvent(QTimerEvent * event);
+    
+    void _printSignalState(void);
 
     QObject*        _signalEmitter;
     const char**    _rgSignals;
-- 
2.22.0