From 49a2def6e7e166f30706f32361a937b839fbfa98 Mon Sep 17 00:00:00 2001 From: LucioDonda Date: Mon, 6 Jan 2025 11:55:19 +0000 Subject: [PATCH] fix: rebased and windows compile errors --- .../tests/unit/file_reader_test.cpp | 22 +++++++++---------- .../tests/unit/logcollector_mock.hpp | 4 ++-- .../tests/unit/logcollector_test.cpp | 2 ++ .../tests/unit/wec_reader_test.cpp | 1 - 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/modules/logcollector/tests/unit/file_reader_test.cpp b/src/modules/logcollector/tests/unit/file_reader_test.cpp index 026a65c9bc..de78ab72cb 100644 --- a/src/modules/logcollector/tests/unit/file_reader_test.cpp +++ b/src/modules/logcollector/tests/unit/file_reader_test.cpp @@ -16,7 +16,7 @@ static constexpr auto TMP_FILE_DIR = "C:\\Temp\\"; static constexpr auto TMP_FILE_DIR = "/tmp/"; #endif -inline std::string getFullFileName(const std::string& filename) { +inline std::string GetFullFileName(const std::string& filename) { //TODO: move to setup stage of test only for windows std::filesystem::create_directories(TMP_FILE_DIR); return TMP_FILE_DIR + filename; @@ -63,8 +63,8 @@ TEST(Localfile, OpenError) TEST(Localfile, Rotated) { - auto fileA = TempFile(getFullFileName("A.log"), "Hello World"); - auto lf = Localfile(getFullFileName("A.log")); + auto fileA = TempFile(GetFullFileName("A.log"), "Hello World"); + auto lf = Localfile(GetFullFileName("A.log")); lf.SeekEnd(); ASSERT_FALSE(lf.Rotated()); @@ -96,19 +96,19 @@ TEST(FileReader, Reload) { spdlog::default_logger()->sinks().clear(); MockCallback mockCallback; - EXPECT_CALL(mockCallback, Call(getFullFileName("A.log"))).Times(1); - EXPECT_CALL(mockCallback, Call(getFullFileName("B.log"))).Times(1); - EXPECT_CALL(mockCallback, Call(getFullFileName("C.log"))).Times(1); - EXPECT_CALL(mockCallback, Call(getFullFileName("D.log"))).Times(1); + EXPECT_CALL(mockCallback, Call(GetFullFileName("A.log"))).Times(1); + EXPECT_CALL(mockCallback, Call(GetFullFileName("B.log"))).Times(1); + EXPECT_CALL(mockCallback, Call(GetFullFileName("C.log"))).Times(1); + EXPECT_CALL(mockCallback, Call(GetFullFileName("D.log"))).Times(1); - auto a = TempFile(getFullFileName("A.log")); - auto b = TempFile(getFullFileName("B.log")); - auto c = TempFile(getFullFileName("C.log")); + auto a = TempFile(GetFullFileName("A.log")); + auto b = TempFile(GetFullFileName("B.log")); + auto c = TempFile(GetFullFileName("C.log")); auto regex = TMP_FILE_DIR + std::string("*.log"); FileReader reader(Logcollector::Instance(), regex, 500, 60000); //NOLINT reader.Reload([&](Localfile& lf) { mockCallback.Call(lf.Filename()); }); - auto d = TempFile(getFullFileName("D.log")); + auto d = TempFile(GetFullFileName("D.log")); reader.Reload([&](Localfile& lf) { mockCallback.Call(lf.Filename()); }); } diff --git a/src/modules/logcollector/tests/unit/logcollector_mock.hpp b/src/modules/logcollector/tests/unit/logcollector_mock.hpp index d3690fd19c..c4d0a4df7c 100644 --- a/src/modules/logcollector/tests/unit/logcollector_mock.hpp +++ b/src/modules/logcollector/tests/unit/logcollector_mock.hpp @@ -20,12 +20,12 @@ class LogcollectorMock : public Logcollector { { Logcollector::SetupFileReader(configurationParser); } - +#ifdef _WIN32 void SetupWEReader(const std::shared_ptr configurationParser) { Logcollector::SetupWEReader(configurationParser); } - +#endif MOCK_METHOD(void, AddReader, (std::shared_ptr reader), (override)); MOCK_METHOD(void, EnqueueTask, (Awaitable task), (override)); }; diff --git a/src/modules/logcollector/tests/unit/logcollector_test.cpp b/src/modules/logcollector/tests/unit/logcollector_test.cpp index 29ec391d26..2a1f7f6c97 100644 --- a/src/modules/logcollector/tests/unit/logcollector_test.cpp +++ b/src/modules/logcollector/tests/unit/logcollector_test.cpp @@ -83,6 +83,7 @@ TEST(Logcollector, SendMessage) ASSERT_EQ(capturedMessage.metaData, METADATA); } +#ifdef _WIN32 TEST(Logcollector, SetupWECReader) { auto constexpr CONFIG_RAW = R"( @@ -105,6 +106,7 @@ TEST(Logcollector, SetupWECReader) ASSERT_NE(capturedReader1, nullptr); } +#endif int main(int argc, char** argv) { diff --git a/src/modules/logcollector/tests/unit/wec_reader_test.cpp b/src/modules/logcollector/tests/unit/wec_reader_test.cpp index ae66a48cbb..567b8b8f14 100644 --- a/src/modules/logcollector/tests/unit/wec_reader_test.cpp +++ b/src/modules/logcollector/tests/unit/wec_reader_test.cpp @@ -4,7 +4,6 @@ #include #include -#include "queue_mock.hpp" #include "logcollector_mock.hpp" using namespace logcollector;