Adapt test to fixed behavior of splitString*() to preserve last empty part

This commit is contained in:
Martchus 2021-05-16 19:43:16 +02:00
parent 9359004a10
commit 3a797bc8b6
2 changed files with 7 additions and 5 deletions

View File

@ -80,7 +80,7 @@ set(LINK_TESTS_AGAINST_APP_TARGET ON)
set(CONFIGURATION_PACKAGE_SUFFIX
""
CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.8.0 REQUIRED)
find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.10.3 REQUIRED)
use_cpp_utilities(VISIBILITY PUBLIC)
# find boost libraries

View File

@ -261,10 +261,12 @@ void BuildActionsTests::testBuildActionProcess()
session.reset();
ioc.run();
auto logLines = splitString(readFile(logFilePath), "\r\n");
CPPUNIT_ASSERT_EQUAL(5001_st, logLines.size());
CPPUNIT_ASSERT_EQUAL("printing some numbers"s, logLines.front());
CPPUNIT_ASSERT_EQUAL("line 5000"s, logLines.back());
const auto logFile = readFile(logFilePath);
const auto logLines = splitStringSimple<std::vector<std::string_view>>(logFile, "\r\n");
CPPUNIT_ASSERT_EQUAL(5002_st, logLines.size());
CPPUNIT_ASSERT_EQUAL("printing some numbers"sv, logLines.front());
CPPUNIT_ASSERT_EQUAL_MESSAGE("trailing line break", ""sv, logLines.back());
CPPUNIT_ASSERT_EQUAL_MESSAGE("last line", "line 5000"sv, logLines[logLines.size() - 2u]);
TESTUTILS_ASSERT_LIKE_FLAGS("PID logged", ".*Launched \"test\", PID\\: [0-9]+.*\n.*"s, std::regex::extended, m_buildAction->output);
}