[skip ci] Update coverage.yml, add unit test for files and buffers without new line at the end of the file

This commit is contained in:
ado 2024-02-21 02:19:14 +01:00
parent 59f6591da3
commit 5e32d722e8
4 changed files with 38 additions and 5 deletions

View File

@ -60,7 +60,9 @@ jobs:
- name: Generate coverage report - name: Generate coverage report
run: | run: |
lcov -d . -c -o out.info --rc lcov_branch_coverage=1 --no-external --filter branch --filter line lcov --version
lcov --help
lcov -d . -c -o out.info --rc lcov_branch_coverage=1 --no-external
lcov -e out.info '*include/ss*hpp' -o filtered.info lcov -e out.info '*include/ss*hpp' -o filtered.info
- name: Invoke coveralls - name: Invoke coveralls

View File

@ -920,7 +920,6 @@ private:
} }
size_t remove_eol(char*& buffer, size_t ssize) { size_t remove_eol(char*& buffer, size_t ssize) {
// TODO write unit tests
if (buffer[ssize - 1] != '\n') { if (buffer[ssize - 1] != '\n') {
return ssize; return ssize;
} }
@ -943,7 +942,6 @@ private:
buffer_size = first_size + second_size + 3; buffer_size = first_size + second_size + 3;
auto new_first = static_cast<char*>( auto new_first = static_cast<char*>(
realloc(static_cast<void*>(first), buffer_size)); realloc(static_cast<void*>(first), buffer_size));
// TODO check
if (!new_first) { if (!new_first) {
throw std::bad_alloc{}; throw std::bad_alloc{};
} }

View File

@ -80,7 +80,8 @@ std::enable_if_t<ss::has_m_tied_t<T>, bool> operator==(const T& lhs,
template <typename T> template <typename T>
static void make_and_write(const std::string& file_name, static void make_and_write(const std::string& file_name,
const std::vector<T>& data, const std::vector<T>& data,
const std::vector<std::string>& header = {}) { const std::vector<std::string>& header = {},
bool new_line_eof = true) {
std::ofstream out{file_name}; std::ofstream out{file_name};
#ifdef _WIN32 #ifdef _WIN32
@ -101,7 +102,10 @@ static void make_and_write(const std::string& file_name,
} }
for (size_t i = 0; i < data.size(); ++i) { for (size_t i = 0; i < data.size(); ++i) {
out << data[i].to_string() << new_lines[i % new_lines.size()]; out << data[i].to_string();
if (new_line_eof || i + 1 < data.size()) {
out << new_lines[i % new_lines.size()];
}
} }
} }

View File

@ -551,3 +551,32 @@ TEST_CASE("parser test composite conversion") {
test_composite_conversion<false, ss::string_error>(); test_composite_conversion<false, ss::string_error>();
test_composite_conversion<true, ss::string_error>(); test_composite_conversion<true, ss::string_error>();
} }
template <bool buffer_mode>
void test_no_new_line_at_eof_impl(const std::vector<X>& data) {
unique_file_name f{"test_parser"};
make_and_write(f.name, data, {}, false);
auto [p, _] = make_parser<buffer_mode>(f.name);
std::vector<X> parsed_data;
for (const auto& el : p.template iterate<X>()) {
parsed_data.push_back(el);
}
CHECK_EQ(data, parsed_data);
}
template <bool buffer_mode>
void test_no_new_line_at_eof() {
test_no_new_line_at_eof_impl<buffer_mode>({});
test_no_new_line_at_eof_impl<buffer_mode>({{1, 2, "X"}});
test_no_new_line_at_eof_impl<buffer_mode>({{1, 2, "X"}, {3, 4, "YY"}});
test_no_new_line_at_eof_impl<buffer_mode>(
{{1, 2, "X"}, {3, 4, "YY"}, {5, 6, "ZZZ"}, {7, 8, "UUU"}});
}
TEST_CASE("test no new line at end of data") {
test_no_new_line_at_eof<false>();
test_no_new_line_at_eof<true>();
}