From a51078c900cde717f4b20dae2b0ad60f966ef325 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 11 Jul 2025 17:04:31 +0900 Subject: [PATCH] tests: Avoid takeFirst-caused segfaults on empty arrays. Replace EXPECT_EQ with ASSERT_EQ where a failure should be fatal (abort execution). Relates-to: . Change-Id: I4b5e38cdc399c1d1a51f72abab23cce963578541 --- 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 3fffbfc50..af57f3e6b 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 messageParserArguments = messageParsedSpy.takeFirst(); EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId()); @@ -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 messageParserArguments = messageParsedSpy.takeFirst(); EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId()); @@ -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 linkInfoReadyArguments = linkInfoReadySpy.takeFirst(); EXPECT_TRUE(linkInfoReadyArguments.at(0).typeId() == qMetaTypeId()); @@ -180,7 +180,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 messageParserArguments = messageParsedSpy.takeFirst(); EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId()); @@ -210,7 +210,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 messageParserArguments = messageParsedSpy.takeFirst(); EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId()); @@ -242,14 +242,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 messageParserArguments = messageParsedSpy.takeFirst(); EXPECT_TRUE(messageParserArguments.at(0).typeId() == qMetaTypeId()); // Wait for the linkInfoReady signal which should be emitted once. linkInfoReadySpy.wait(); - EXPECT_EQ(linkInfoReadySpy.count(), 1); + ASSERT_EQ(linkInfoReadySpy.count(), 1); QList linkInfoReadyArguments = linkInfoReadySpy.takeFirst(); EXPECT_TRUE(linkInfoReadyArguments.at(0).typeId() == qMetaTypeId());