Re: [PATCH 1/2] tests: Avoid takeFirst-caused segfaults on empty arrays.

[Adrien Béraud]

Thanks a lot Maxime. 
Would it be possible for you to publish these patches on Gerrit ? [ 
https://review.jami.net/ | https://review.jami.net ] 
That would help us a lot to organize and review them, 

Many thanks, 
Adrien 


De: "Maxim Cournoyer" <maxim.cournoyer@gmail.com> 
À: "jami" <jami@gnu.org> 
Cc: "Sébastien Blin" <sebastien.blin@savoirfairelinux.com>, "Maxim Cournoyer" 
<maxim.cournoyer@gmail.com> 
Envoyé: Mardi 9 Janvier 2024 11:19:43 
Objet: [PATCH 1/2] tests: Avoid takeFirst-caused segfaults on empty arrays. 

Related to 
<https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1507>. 

Replace EXPECT_EQ with ASSERT_EQ where a failure should be 
fatal (abort execution). 

--- 

tests/unittests/messageparser_unittest.cpp | 16 ++++++++-------- 
1 file changed, 8 insertions(+), 8 deletions(-) 

diff --git a/tests/unittests/messageparser_unittest.cpp 
b/tests/unittests/messageparser_unittest.cpp 
index f729c306..c10b0d0b 100644 
--- a/tests/unittests/messageparser_unittest.cpp 
+++ b/tests/unittests/messageparser_unittest.cpp 
@@ -49,7 +49,7 @@ TEST_F(MessageParserFixture, TextIsParsedCorrectly) 

// Wait for the messageParsed signal which should be emitted once. 
messageParsedSpy.wait(); 
- EXPECT_EQ(messageParsedSpy.count(), 1); 
+ ASSERT_EQ(messageParsedSpy.count(), 1); 

QList<QVariant> messageParserArguments = messageParsedSpy.takeFirst(); 
EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId<QString>()); 
@@ -60,7 +60,7 @@ TEST_F(MessageParserFixture, TextIsParsedCorrectly) 

// No link info should be returned. 
linkInfoReadySpy.wait(); 
- EXPECT_EQ(linkInfoReadySpy.count(), 0); 
+ ASSERT_EQ(linkInfoReadySpy.count(), 0); 
} 

/*! 
@@ -84,7 +84,7 @@ TEST_F(MessageParserFixture, ALinkIsParsedCorrectly) 

// Wait for the messageParsed signal which should be emitted once. 
messageParsedSpy.wait(); 
- EXPECT_EQ(messageParsedSpy.count(), 1); 
+ ASSERT_EQ(messageParsedSpy.count(), 1); 

QList<QVariant> messageParserArguments = messageParsedSpy.takeFirst(); 
EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId<QString>()); 
@@ -96,7 +96,7 @@ TEST_F(MessageParserFixture, ALinkIsParsedCorrectly) 

// Wait for the linkInfoReady signal which should be emitted once. 
linkInfoReadySpy.wait(); 
- EXPECT_EQ(linkInfoReadySpy.count(), 1); 
+ ASSERT_EQ(linkInfoReadySpy.count(), 1); 

QList<QVariant> linkInfoReadyArguments = linkInfoReadySpy.takeFirst(); 
EXPECT_TRUE(linkInfoReadyArguments.at(0).typeId() == qMetaTypeId<QString>()); 
@@ -127,7 +127,7 @@ TEST_F(MessageParserFixture, 
EndOfLineCharactersAreParsedCorrectly) 

// Wait for the messageParsed signal which should be emitted once. 
messageParsedSpy.wait(); 
- EXPECT_EQ(messageParsedSpy.count(), 1); 
+ ASSERT_EQ(messageParsedSpy.count(), 1); 

QList<QVariant> messageParserArguments = messageParsedSpy.takeFirst(); 
EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId<QString>()); 
@@ -157,7 +157,7 @@ TEST_F(MessageParserFixture, FencedCodeIsParsedCorrectly) 

// Wait for the messageParsed signal which should be emitted once. 
messageParsedSpy.wait(); 
- EXPECT_EQ(messageParsedSpy.count(), 1); 
+ ASSERT_EQ(messageParsedSpy.count(), 1); 

QList<QVariant> messageParserArguments = messageParsedSpy.takeFirst(); 
EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId<QString>()); 
@@ -189,14 +189,14 @@ TEST_F(MessageParserFixture, 
YoutubeLinkIsParsedCorrectly) 

// Wait for the messageParsed signal which should be emitted once. 
messageParsedSpy.wait(); 
- EXPECT_EQ(messageParsedSpy.count(), 1); 
+ ASSERT_EQ(messageParsedSpy.count(), 1); 

QList<QVariant> messageParserArguments = messageParsedSpy.takeFirst(); 
EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId<QString>()); 

// Wait for the linkInfoReady signal which should be emitted once. 
linkInfoReadySpy.wait(); 
- EXPECT_EQ(linkInfoReadySpy.count(), 1); 
+ ASSERT_EQ(linkInfoReadySpy.count(), 1); 

QList<QVariant> linkInfoReadyArguments = linkInfoReadySpy.takeFirst(); 
EXPECT_TRUE(linkInfoReadyArguments.at(0).typeId() == qMetaTypeId<QString>()); 

base-commit: a4300308dc8d03d59f620bb5fed753df5cf31ed9 
-- 
2.41.0