From c30e5ef9fd1167a47593b5e47de9935dbf37be07 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Mon, 12 Feb 2018 09:03:19 +0000
Subject: [PATCH] Fix tests for #1402

---
 test/ClientTest.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/test/ClientTest.cpp b/test/ClientTest.cpp
index 595c3240..b844a24c 100644
--- a/test/ClientTest.cpp
+++ b/test/ClientTest.cpp
@@ -250,7 +250,7 @@ TEST_F(ClientTest, OnUserActionMessage) {
     EXPECT_THAT(m_pTestModule->vsMessages, ElementsAre(msg.ToString()));
     EXPECT_THAT(m_pTestModule->vNetworks, ElementsAre(nullptr));
     EXPECT_THAT(m_pTestModule->vClients, ElementsAre(m_pTestClient));
-    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(nullptr));
+    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(m_pTestChan));
     EXPECT_THAT(m_pTestSock->vsLines, IsEmpty());  // halt
 
     m_pTestModule->eAction = CModule::CONTINUE;
@@ -267,7 +267,7 @@ TEST_F(ClientTest, OnUserTextMessage) {
     EXPECT_THAT(m_pTestModule->vsMessages, ElementsAre(msg.ToString()));
     EXPECT_THAT(m_pTestModule->vNetworks, ElementsAre(nullptr));
     EXPECT_THAT(m_pTestModule->vClients, ElementsAre(m_pTestClient));
-    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(nullptr));
+    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(m_pTestChan));
     EXPECT_THAT(m_pTestSock->vsLines, IsEmpty());  // halt
 
     m_pTestModule->eAction = CModule::CONTINUE;
@@ -284,7 +284,7 @@ TEST_F(ClientTest, OnUserNoticeMessage) {
     EXPECT_THAT(m_pTestModule->vsMessages, ElementsAre(msg.ToString()));
     EXPECT_THAT(m_pTestModule->vNetworks, ElementsAre(nullptr));
     EXPECT_THAT(m_pTestModule->vClients, ElementsAre(m_pTestClient));
-    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(nullptr));
+    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(m_pTestChan));
     EXPECT_THAT(m_pTestSock->vsLines, IsEmpty());  // halt
 
     m_pTestModule->eAction = CModule::CONTINUE;
@@ -301,7 +301,7 @@ TEST_F(ClientTest, OnUserJoinMessage) {
     EXPECT_THAT(m_pTestModule->vsMessages, ElementsAre(msg.ToString()));
     EXPECT_THAT(m_pTestModule->vNetworks, ElementsAre(nullptr));
     EXPECT_THAT(m_pTestModule->vClients, ElementsAre(m_pTestClient));
-    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(nullptr));
+    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(m_pTestChan));
     EXPECT_THAT(m_pTestSock->vsLines, IsEmpty());  // halt
 
     m_pTestModule->eAction = CModule::CONTINUE;
@@ -310,7 +310,8 @@ TEST_F(ClientTest, OnUserJoinMessage) {
 }
 
 TEST_F(ClientTest, OnUserPartMessage) {
-    CMessage msg("PART #znc");
+    m_pTestChan->SetIsOn(true);
+    CMessage msg("PART #chan");
     m_pTestModule->eAction = CModule::HALT;
     m_pTestClient->ReadLine(msg.ToString());
 
@@ -318,7 +319,7 @@ TEST_F(ClientTest, OnUserPartMessage) {
     EXPECT_THAT(m_pTestModule->vsMessages, ElementsAre(msg.ToString()));
     EXPECT_THAT(m_pTestModule->vNetworks, ElementsAre(nullptr));
     EXPECT_THAT(m_pTestModule->vClients, ElementsAre(m_pTestClient));
-    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(nullptr));
+    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(m_pTestChan));
     EXPECT_THAT(m_pTestSock->vsLines, IsEmpty());  // halt
 
     m_pTestModule->eAction = CModule::CONTINUE;
@@ -335,7 +336,7 @@ TEST_F(ClientTest, OnUserTopicMessage) {
     EXPECT_THAT(m_pTestModule->vsMessages, ElementsAre(msg.ToString()));
     EXPECT_THAT(m_pTestModule->vNetworks, ElementsAre(nullptr));
     EXPECT_THAT(m_pTestModule->vClients, ElementsAre(m_pTestClient));
-    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(nullptr));
+    EXPECT_THAT(m_pTestModule->vChannels, ElementsAre(m_pTestChan));
     EXPECT_THAT(m_pTestSock->vsLines, IsEmpty());  // halt
 
     m_pTestModule->eAction = CModule::CONTINUE;