Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove line reading interface from FileReader

Browse Source
This commit is contained in:
Patrick Niklaus 2018-03-19 17:09:52 +00:00
parent 990e411361
commit d4300e73f3
2 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/storage/io.hpp
View File

@ -27,16 +27,6 @@ namespace io
class FileReader class FileReader
{ {
public: public:
class LineWrapper : public std::string
{
friend std::istream &operator>>(std::istream &is, LineWrapper &line)
{
return std::getline(is, line);
}
};
auto GetLineIteratorBegin() { return std::istream_iterator<LineWrapper>(input_stream); }
auto GetLineIteratorEnd() { return std::istream_iterator<LineWrapper>(); }
enum FingerprintFlag enum FingerprintFlag
{ {
VerifyFingerprint, VerifyFingerprint,

26
unit_tests/util/io.cpp
View File

@ -159,30 +159,4 @@ BOOST_AUTO_TEST_CASE(io_incompatible_fingerprint)
} }
} }
BOOST_AUTO_TEST_CASE(io_read_lines)
{
{
std::ofstream f(IO_TEXT_FILE, std::ios::binary);
char str[] = "A\nB\nC\nD";
f.write(str, strlen(str));
}
{
osrm::storage::io::FileReader infile(IO_TEXT_FILE,
osrm::storage::io::FileReader::HasNoFingerprint);
auto startiter = infile.GetLineIteratorBegin();
auto enditer = infile.GetLineIteratorEnd();
std::vector<std::string> resultlines;
while (startiter != enditer)
{
resultlines.push_back(*startiter);
++startiter;
}
BOOST_REQUIRE_MESSAGE(resultlines.size() == 4, "Expected 4 lines of text");
BOOST_REQUIRE_MESSAGE(resultlines[0] == "A", "Expected the first line to be A");
BOOST_REQUIRE_MESSAGE(resultlines[1] == "B", "Expected the first line to be B");
BOOST_REQUIRE_MESSAGE(resultlines[2] == "C", "Expected the first line to be C");
BOOST_REQUIRE_MESSAGE(resultlines[3] == "D", "Expected the first line to be D");
}
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()