From 211a7f57be1913a32239b9868c85f18cd6b28683 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Mon, 13 Jan 2020 09:16:43 -0500 Subject: QUtil::read_lines_from_file: optional EOL preservation --- libtests/qutil.cc | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'libtests/qutil.cc') diff --git a/libtests/qutil.cc b/libtests/qutil.cc index 0331d715..935cdfc2 100644 --- a/libtests/qutil.cc +++ b/libtests/qutil.cc @@ -418,6 +418,31 @@ void read_from_file_test() fclose(fp); } + // Test with EOL preservation + std::list lines2 = + QUtil::read_lines_from_file("other-file", true); + auto line = lines2.begin(); + assert(37 == (*line).length()); + assert('.' == (*line).at(35)); + assert('\n' == (*line).at(36)); + ++line; + assert(24 == (*line).length()); + assert('.' == (*line).at(21)); + assert('\r' == (*line).at(22)); + assert('\n' == (*line).at(23)); + ++line; + assert(24591 == (*line).length()); + assert('.' == (*line).at(24589)); + assert('\n' == (*line).at(24590)); + // Test the other versions and make sure we get the same results + { + std::ifstream infs("other-file", std::ios_base::binary); + assert(QUtil::read_lines_from_file(infs, true) == lines2); + FILE* fp = QUtil::safe_fopen("other-file", "rb"); + assert(QUtil::read_lines_from_file(fp, true) == lines2); + fclose(fp); + } + PointerHolder buf; size_t size = 0; QUtil::read_file_into_memory("other-file", buf, size); -- cgit v1.2.3-54-g00ecf