From 0b9a8d08b2ea7d245ffd00ce465e6c859905c547 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 22 Mar 2016 15:34:00 -0500
Subject: make wait_for_signals() a macro again so that the GTest log messages
 will give the test file and line number

---
 tests/utils/qt-fixture.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/utils/qt-fixture.h b/tests/utils/qt-fixture.h
index 0f5722b..95b9b14 100644
--- a/tests/utils/qt-fixture.h
+++ b/tests/utils/qt-fixture.h
@@ -31,6 +31,16 @@
 #include <QVariant>
 #include <QSignalSpy>
 
+#define wait_for_signals(signalSpy,signalsExpected) \
+{                                                   \
+    while (signalSpy.size() < signalsExpected)      \
+    {                                               \
+        ASSERT_TRUE(signalSpy.wait());              \
+    }                                               \
+                                                    \
+    ASSERT_EQ(signalsExpected, signalSpy.size());   \
+}
+
 class QtFixture: public GlibFixture
 {
     using super = GlibFixture;
@@ -46,16 +56,6 @@ public:
 
 protected:
 
-    void wait_for_signals(QSignalSpy& signalSpy, int signalsExpected)
-    {
-        while (signalSpy.size() < signalsExpected)
-        {
-            ASSERT_TRUE(signalSpy.wait());
-        }
-
-        ASSERT_EQ(signalsExpected, signalSpy.size());
-    }
-
     bool qDBusArgumentToMap(QVariant const& variant, QVariantMap& map)
     {
         if (variant.canConvert<QDBusArgument>())
-- 
cgit v1.2.3