From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Thu, 17 May 2012 15:26:59 +0000 (+0200)
Subject: [1914] Fix tests
X-Git-Tag: trac2351_base~226^2~89^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2be2f5cfe81a85df13a0ea977af6a9bddf3040b;p=thirdparty%2Fkea.git

[1914] Fix tests

The fake session didn't want to support hasQueuedMessages properly.
Also, we need to be subscribed to the correct group to actually get the
messages through the session.
---

diff --git a/src/lib/config/tests/ccsession_unittests.cc b/src/lib/config/tests/ccsession_unittests.cc
index 423873120b..2cc6a37751 100644
--- a/src/lib/config/tests/ccsession_unittests.cc
+++ b/src/lib/config/tests/ccsession_unittests.cc
@@ -722,7 +722,12 @@ protected:
     AsyncReceiveCCSessionTest() :
         mccs_(ccspecfile("spec29.spec"), session, NULL, NULL, false, false),
         next_flag_(0)
-    {}
+    {
+        // This is just to make sure the messages get through the fake
+        // session.
+        session.subscribe("test group");
+        session.subscribe("<ignored>");
+    }
     /// \brief Convenience function to queue a request to get a command
     ///     message.
     ModuleCCSession::AsyncRecvRequestID
diff --git a/src/lib/config/tests/fake_session.cc b/src/lib/config/tests/fake_session.cc
index bf4471dade..65e12cdbe7 100644
--- a/src/lib/config/tests/fake_session.cc
+++ b/src/lib/config/tests/fake_session.cc
@@ -207,7 +207,7 @@ FakeSession::reply(ConstElementPtr envelope, ConstElementPtr newmsg) {
 
 bool
 FakeSession::hasQueuedMsgs() const {
-    return (false);
+    return (messages_ && messages_->size() > 0);
 }
 
 ConstElementPtr