Skip to content

Commit a68462a

Browse files
BaryonicsBaryonics
committed
Adjusted unit tests to match the new API where necessary
1 parent 639b1dc commit a68462a

1 file changed

Lines changed: 67 additions & 50 deletions

File tree

‎test/unit_tests/test_binary_reader.cpp‎

Lines changed: 67 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -153,21 +153,22 @@ namespace centipede::test
153153
auto reader = Binary{ Config{ .in_filename = file_name } };
154154
auto init_err = reader.init();
155155
EXPECT_TRUE(init_err);
156-
auto read_err = reader.read_one_entry();
157-
EXPECT_TRUE(read_err);
158-
auto read_result = reader.get_current_entry();
159-
ASSERT_FALSE(read_result.empty());
160-
for (const auto& entrypoint : read_result)
156+
for (const auto& entry : reader)
161157
{
162-
EXPECT_EQ(valid_locals_data.second, entrypoint.get_locals());
163-
auto expected_globals = std::views::zip_transform([](const auto& index, const auto& value) -> auto
164-
{ return std::pair{ index, value }; },
165-
valid_globals_data.first,
166-
valid_globals_data.second) |
167-
std::ranges::to<std::vector>();
168-
EXPECT_EQ(expected_globals, entrypoint.get_globals());
169-
EXPECT_EQ(entrypoint.get_measurement(), valid_measurement);
170-
EXPECT_EQ(entrypoint.get_sigma(), valid_sigma);
158+
ASSERT_TRUE(entry.has_value());
159+
ASSERT_FALSE(entry->empty());
160+
for (const auto& entrypoint : *entry)
161+
{
162+
EXPECT_EQ(valid_locals_data.second, entrypoint.get_locals());
163+
auto expected_globals = std::views::zip_transform([](const auto& index, const auto& value) -> auto
164+
{ return std::pair{ index, value }; },
165+
valid_globals_data.first,
166+
valid_globals_data.second) |
167+
std::ranges::to<std::vector>();
168+
EXPECT_EQ(expected_globals, entrypoint.get_globals());
169+
EXPECT_EQ(entrypoint.get_measurement(), valid_measurement);
170+
EXPECT_EQ(entrypoint.get_sigma(), valid_sigma);
171+
}
171172
}
172173
reader.close();
173174
// NOLINTEND(readability-function-cognitive-complexity)
@@ -188,15 +189,17 @@ namespace centipede::test
188189
EXPECT_TRUE(init_err);
189190
auto read_err = reader.read_one_entry();
190191
EXPECT_TRUE(read_err);
191-
auto re_read_err = reader.read_one_entry();
192-
EXPECT_TRUE(re_read_err);
193-
auto read_result = reader.get_current_entry();
194-
for (const auto& entrypoint : read_result)
192+
193+
for (const auto& entry : reader)
195194
{
196-
EXPECT_TRUE(entrypoint.get_globals().empty());
197-
EXPECT_TRUE(entrypoint.get_locals().empty());
198-
EXPECT_EQ(entrypoint.get_measurement(), 0U);
199-
EXPECT_EQ(entrypoint.get_sigma(), 0U);
195+
ASSERT_TRUE(entry.has_value());
196+
for (const auto& entrypoint : *entry)
197+
{
198+
EXPECT_TRUE(entrypoint.get_globals().empty());
199+
EXPECT_TRUE(entrypoint.get_locals().empty());
200+
EXPECT_EQ(entrypoint.get_measurement(), 0U);
201+
EXPECT_EQ(entrypoint.get_sigma(), 0U);
202+
}
200203
}
201204
reader.close();
202205
// NOLINTEND(readability-function-cognitive-complexity)
@@ -213,9 +216,11 @@ namespace centipede::test
213216
auto reader = Binary{ Config{ .in_filename = file_name } };
214217
auto init_err = reader.init();
215218
EXPECT_TRUE(init_err);
216-
auto read_err = reader.read_one_entry();
217-
ASSERT_FALSE(read_err);
218-
EXPECT_EQ(read_err.error(), ErrorCode::reader_file_fail_to_read);
219+
for (const auto& entry : reader)
220+
{
221+
ASSERT_FALSE(entry.has_value());
222+
EXPECT_EQ(entry.error(), ErrorCode::reader_file_fail_to_read);
223+
}
219224
reader.close();
220225
}
221226

@@ -232,9 +237,11 @@ namespace centipede::test
232237
auto reader = Binary{ Config{ .in_filename = file_name } };
233238
auto init_err = reader.init();
234239
EXPECT_TRUE(init_err);
235-
auto read_err = reader.read_one_entry();
236-
ASSERT_FALSE(read_err);
237-
EXPECT_EQ(read_err.error(), ErrorCode::reader_file_fail_to_read);
240+
for (const auto& entry : reader)
241+
{
242+
ASSERT_FALSE(entry);
243+
EXPECT_EQ(entry.error(), ErrorCode::reader_file_fail_to_read);
244+
}
238245
reader.close();
239246
}
240247

@@ -253,9 +260,11 @@ namespace centipede::test
253260
auto reader = Binary{ Config{ .in_filename = file_name } };
254261
auto init_err = reader.init();
255262
EXPECT_TRUE(init_err);
256-
auto read_err = reader.read_one_entry();
257-
ASSERT_FALSE(read_err);
258-
EXPECT_EQ(read_err.error(), ErrorCode::reader_file_fail_to_read);
263+
for (const auto& entry : reader)
264+
{
265+
ASSERT_FALSE(entry.has_value());
266+
EXPECT_EQ(entry.error(), ErrorCode::reader_file_fail_to_read);
267+
}
259268
reader.close();
260269
}
261270

@@ -276,9 +285,12 @@ namespace centipede::test
276285
auto reader = Binary{ Config{ .in_filename = file_name } };
277286
auto init_err = reader.init();
278287
EXPECT_TRUE(init_err);
279-
auto read_err = reader.read_one_entry();
280-
ASSERT_FALSE(read_err);
281-
EXPECT_EQ(read_err.error(), ErrorCode::reader_file_fail_to_read);
288+
for (const auto& entry : reader)
289+
{
290+
291+
ASSERT_FALSE(entry.has_value());
292+
EXPECT_EQ(entry.error(), ErrorCode::reader_file_fail_to_read);
293+
}
282294
reader.close();
283295
}
284296

@@ -293,9 +305,11 @@ namespace centipede::test
293305
auto reader = Binary{ Config{ .in_filename = file_name } };
294306
auto init_err = reader.init();
295307
EXPECT_TRUE(init_err);
296-
auto read_err = reader.read_one_entry();
297-
ASSERT_FALSE(read_err);
298-
EXPECT_EQ(read_err.error(), ErrorCode::reader_file_fail_to_read);
308+
for (const auto& entry : reader)
309+
{
310+
ASSERT_FALSE(entry.has_value());
311+
EXPECT_EQ(entry.error(), ErrorCode::reader_file_fail_to_read);
312+
}
299313
reader.close();
300314
}
301315

@@ -312,9 +326,11 @@ namespace centipede::test
312326
auto reader = Binary{ Config{ .in_filename = file_name } };
313327
auto init_err = reader.init();
314328
EXPECT_TRUE(init_err);
315-
auto read_err = reader.read_one_entry();
316-
EXPECT_FALSE(read_err);
317-
EXPECT_EQ(read_err.error(), ErrorCode::reader_file_fail_to_read);
329+
for (const auto& entry : reader)
330+
{
331+
EXPECT_FALSE(entry.has_value());
332+
EXPECT_EQ(entry.error(), ErrorCode::reader_file_fail_to_read);
333+
}
318334
reader.close();
319335
}
320336

@@ -346,9 +362,12 @@ namespace centipede::test
346362
auto reader = Binary{ Config{ .in_filename = file_name } };
347363
auto init_err = reader.init();
348364
EXPECT_TRUE(init_err);
349-
auto read_err = reader.read_one_entry();
350-
EXPECT_FALSE(read_err);
351-
EXPECT_EQ(read_err.error(), ErrorCode::reader_file_fail_to_read);
365+
for (const auto& entry : reader)
366+
{
367+
368+
EXPECT_FALSE(entry.has_value());
369+
EXPECT_EQ(entry.error(), ErrorCode::reader_file_fail_to_read);
370+
}
352371
reader.close();
353372
}
354373

@@ -396,16 +415,14 @@ namespace centipede::test
396415
constexpr auto invalid_header = char{ 42 };
397416
file.write(&invalid_header, 1);
398417
file.close();
399-
400418
auto reader = Binary{ Config{ .in_filename = file_name } };
401-
402419
auto init_err = reader.init();
403420
ASSERT_TRUE(init_err);
404-
405-
auto read_err = reader.read_one_entry();
406-
ASSERT_FALSE(read_err);
407-
EXPECT_EQ(read_err.error(), ErrorCode::reader_file_fail_to_read);
408-
421+
for (const auto& entry : reader)
422+
{
423+
ASSERT_FALSE(entry.has_value());
424+
EXPECT_EQ(entry.error(), ErrorCode::reader_file_fail_to_read);
425+
}
409426
reader.close();
410427
}
411428
} // namespace centipede::test

0 commit comments

Comments
 (0)