sw/qa/extras/txtexport/txtexport.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 62503c3acde8eab0ca198f66519270761f64d56d
Author: tobias <tobias.sch...@hotmail.com>
AuthorDate: Fri Jun 11 05:48:17 2021 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Jun 14 11:23:32 2021 +0200
tdf#142669 Assert data alignment in unit test
The alignment of a pointer size was not checked in unit test
txtexport.cxx. This could have caused errors in future test cases.
Change-Id: If0af5c75a9fc5c757cab6ac900b685d3c70fca8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117026
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sw/qa/extras/txtexport/txtexport.cxx
b/sw/qa/extras/txtexport/txtexport.cxx
index 0e52f51a4e34..54f623700fb0 100644
--- a/sw/qa/extras/txtexport/txtexport.cxx
+++ b/sw/qa/extras/txtexport/txtexport.cxx
@@ -26,7 +26,9 @@ protected:
SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ);
aStream.ReadStream(aMemoryStream);
const T* pData = static_cast<const T*>(aMemoryStream.GetData());
- return std::vector<T>(pData, pData + aMemoryStream.GetSize());
+ sal_uInt64 size = aMemoryStream.GetSize();
+ CPPUNIT_ASSERT_EQUAL(sal_uInt64(0), size % sizeof(T));
+ return std::vector<T>(pData, pData + size / sizeof(T));
}
OString readExportedFile()
@@ -80,7 +82,7 @@ DECLARE_TXTEXPORT_TEST(testTdf120574_utf8bom,
"UTF8BOMCRLF.txt")
DECLARE_TXTEXPORT_TEST(testTdf120574_utf16lebom, "UTF16LEBOMCRLF.txt")
{
std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>();
- OUString aData(aMemStream.data(), aMemStream.size() / sizeof(sal_Unicode));
+ OUString aData(aMemStream.data(), aMemStream.size());
CPPUNIT_ASSERT_EQUAL(OUString(u"\uFEFFフー\r\nバー\r\n"), aData);
}
@@ -94,7 +96,7 @@ DECLARE_TXTEXPORT_TEST(testTdf142669_utf8, "UTF8CRLF.txt")
DECLARE_TXTEXPORT_TEST(testTdf142669_utf16le, "UTF16LECRLF.txt")
{
std::vector<sal_Unicode> aMemStream = readMemoryStream<sal_Unicode>();
- OUString aData(aMemStream.data(), aMemStream.size() / sizeof(sal_Unicode));
+ OUString aData(aMemStream.data(), aMemStream.size());
CPPUNIT_ASSERT_EQUAL(OUString(u"フー\r\nバー\r\n"), aData);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
