From c516ec5c28d603aea0df6165f66a3a5d0a0191c4 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>

Date: Fri, 19 Sep 2014 10:50:23 +0200

Subject: [PATCH 7/9] Don't call insert() from Q_ASSERT - breaks unit-tests in

 Release mode

---

 server/tests/unittest/collectionreferencetest.cpp | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/tests/unittest/collectionreferencetest.cpp b/server/tests/unittest/collectionreferencetest.cpp

index 1700c75..1b10c55 100644

--- a/server/tests/unittest/collectionreferencetest.cpp

+++ b/server/tests/unittest/collectionreferencetest.cpp

@@ -45,7 +45,8 @@ public:

         Resource res;

         res.setId(1);

         res.setName(QLatin1String(name));

-        Q_ASSERT(res.insert());

+        const bool success = res.insert();

+        Q_ASSERT(success);

         mResource = res;

         return res;

     }

@@ -57,7 +58,8 @@ public:

         col.setName(QLatin1String(name));

         col.setRemoteId(QLatin1String(name));

         col.setResource(mResource);

-        Q_ASSERT(col.insert());

+        const bool success = col.insert();

+        Q_ASSERT(success);

         return col;

     }

-- 

1.9.3