LibreOffice/online
1
0
Fork 0
mirror of https://github.com/LibreOffice/online.git synced 2025-08-20 23:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

wsd: more Protocol unittests

Browse Source 
Change-Id: I72742f767d9dcfcf1edbfaed4fada628ebef156f
Reviewed-on: https://gerrit.libreoffice.org/32159
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian
2016-12-18 13:09:13 -05:00
committed by Ashod Nakashian
parent ea2c3eb15c
commit 2428a4e3a1
2 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
common/Protocol.hpp
View File

@ -120,16 +120,22 @@ namespace LOOLProtocol
return tokenize(s.data(), s.size());
}
inline size_t getDelimiterPosition(const char* message, const int length, const char delim)
{
if (message && length > 0)
{
const char *founddelim = static_cast<const char *>(std::memchr(message, delim, length));
const auto size = (founddelim == nullptr ? length : founddelim - message);
return size;
}
return 0;
}
inline
std::string getDelimitedInitialSubstring(const char *message, const int length, const char delim)
{
if (message == nullptr || length <= 0)
{
return "";
}
const char *founddelim = static_cast<const char *>(std::memchr(message, delim, length));
const auto size = (founddelim == nullptr ? length : founddelim - message);
const auto size = getDelimiterPosition(message, length, delim);
return std::string(message, size);
}
@ -221,7 +227,7 @@ namespace LOOLProtocol
{
if (message == nullptr || length <= 0)
{
return "";
return std::string();
}
const auto firstLine = getFirstLine(message, std::min(length, 120));
@ -235,6 +241,19 @@ namespace LOOLProtocol
return firstLine;
}
inline std::string getAbbreviatedMessage(const std::string& message)
{
const auto pos = getDelimiterPosition(message.data(), std::min(message.size(), 120UL), '\n');
// If first line is less than the length (minus newline), add ellipsis.
if (pos < static_cast<std::string::size_type>(message.size()) - 1)
{
return message.substr(0, pos) + "...";
}
return message;
}
template <typename T>
std::string getAbbreviatedMessage(const T& message)
{