From 52f2b5b11889bccbbda69df0c454f699fbe84def Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 23 Aug 2024 11:35:51 -0500 Subject: [PATCH] refactor --- repertory/librepertory/src/utils/cli_utils.cpp | 3 ++- .../file_manager_ring_buffer_open_file_test.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/repertory/librepertory/src/utils/cli_utils.cpp b/repertory/librepertory/src/utils/cli_utils.cpp index 9d9cf1a0..8538bf30 100644 --- a/repertory/librepertory/src/utils/cli_utils.cpp +++ b/repertory/librepertory/src/utils/cli_utils.cpp @@ -23,7 +23,8 @@ #include "app_config.hpp" #include "utils/collection.hpp" -#include "utils/file_utils.hpp" +#include "utils/common.hpp" +#include "utils/file.hpp" #include "utils/path.hpp" #include "utils/string.hpp" #include "utils/utils.hpp" diff --git a/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp index a1aa273b..2ad27551 100644 --- a/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp +++ b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp @@ -374,8 +374,8 @@ TEST(ring_buffer_open_file, read_full_file) { auto hash1 = utils::file::file(download_source_path).sha256(); auto hash2 = utils::file::file(dest_path).sha256(); - EXPERT_TRUE(hash1.has_value()); - EXPERT_TRUE(hash2.has_value()); + EXPECT_TRUE(hash1.has_value()); + EXPECT_TRUE(hash2.has_value()); if (hash1.has_value() && hash2.has_value()) { EXPECT_STREQ(hash1.value().c_str(), hash2.value().c_str()); } @@ -439,8 +439,8 @@ TEST(ring_buffer_open_file, read_full_file_in_reverse) { auto hash1 = utils::file::file(download_source_path).sha256(); auto hash2 = utils::file::file(dest_path).sha256(); - EXPERT_TRUE(hash1.has_value()); - EXPERT_TRUE(hash2.has_value()); + EXPECT_TRUE(hash1.has_value()); + EXPECT_TRUE(hash2.has_value()); if (hash1.has_value() && hash2.has_value()) { EXPECT_STREQ(hash1.value().c_str(), hash2.value().c_str()); } @@ -505,8 +505,8 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks) { auto hash1 = utils::file::file(download_source_path).sha256(); auto hash2 = utils::file::file(dest_path).sha256(); - EXPERT_TRUE(hash1.has_value()); - EXPERT_TRUE(hash2.has_value()); + EXPECT_TRUE(hash1.has_value()); + EXPECT_TRUE(hash2.has_value()); if (hash1.has_value() && hash2.has_value()) { EXPECT_STREQ(hash1.value().c_str(), hash2.value().c_str()); } @@ -576,8 +576,8 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks_in_reverse) { auto hash1 = utils::file::file(download_source_path).sha256(); auto hash2 = utils::file::file(dest_path).sha256(); - EXPERT_TRUE(hash1.has_value()); - EXPERT_TRUE(hash2.has_value()); + EXPECT_TRUE(hash1.has_value()); + EXPECT_TRUE(hash2.has_value()); if (hash1.has_value() && hash2.has_value()) { EXPECT_STREQ(hash1.value().c_str(), hash2.value().c_str()); }