Added gtest suite for the filesystem handling #17

Author: ValentiWorkLearning

Firmware/CMakeLists.txt

@@ -70,6 +70,7 @@ add_subdirectory(utils)
 add_subdirectory(logger)
 add_subdirectory(graphics)
 add_subdirectory(service_providers)
+add_subdirectory(filesystem)
 
 set (NORDIC_TARGET theOpenWatch)
 add_executable(${NORDIC_TARGET} ${PROJECT_SOURCES})

Firmware/firmware_tests/coroutine/wrapper/adaptor_block_device.hpp Firmware/filesystem/filesystem/block_device_wrapper/adaptor_block_device.hpp

@@ -1,9 +1,10 @@
 #pragma once
-#include "ih_block_device.hpp"
+#include "block_device_wrapper/ih_block_device.hpp"
 #include <lfs.h>
 #include <memory>
 #include <string>
-#include <utils/CoroUtils.hpp>
+#include <utils/coroutine/Task.hpp>
+#include <utils/coroutine/SyncWait.hpp>
 
 #include <cstdint>
 #include <span>

Firmware/firmware_tests/coroutine/wrapper/heap_block_device.hpp Firmware/filesystem/filesystem/block_device_wrapper/heap_block_device.hpp

@@ -34,7 +34,9 @@ add_executable(
     drivers/windond_flash/flash_fixture.hpp
     drivers/spi/mock_gpio.hpp
     drivers/spi/mock_spi.hpp
-)
+ 
+    filesystem/filesystem_fixture.hpp
+    filesystem/filesystem_in_memory_test.cpp)
 
 mark_as_advanced(
     BUILD_GMOCK BUILD_GTEST BUILD_SHARED_LIBS
@@ -62,7 +64,7 @@ target_link_libraries(
     watch_display
     lvgl_lib
     drivers_ih
-
+    filesystem
     buttons_driver
     windbond_spi_flash_driver
 )

Firmware/firmware_tests/coroutine/wrapper/ih_block_device.hpp Firmware/filesystem/filesystem/block_device_wrapper/ih_block_device.hpp

@@ -6,8 +6,6 @@ if( UNIX )
     find_package(Threads REQUIRED)
 endif()
 
-find_package(spdlog REQUIRED)
-
 add_executable(coroutine_experiments_app ${PROJECT_SOURCES})
 
 target_sources(
@@ -16,12 +14,7 @@ target_sources(
     coroutine_thoughts.cpp
     thoughts.hpp
     st7789_draft.hpp
-    fs_ideas/filesystem_holder.hpp
-    
-    fs_ideas/platform_filesystem.hpp
-    wrapper/ih_block_device.hpp
-    wrapper/heap_block_device.hpp
-    wrapper/adaptor_block_device.hpp)
+)
 
 target_include_directories(
     coroutine_experiments_app
@@ -50,8 +43,7 @@ target_link_libraries(
     watch_display
     UtilsLibrary
     logger_service
-    littlefs
-    spdlog::spdlog
+    filesystem
 )
 if(UNIX)
     target_link_libraries( coroutine_experiments_app PUBLIC Threads::Threads)

Firmware/firmware_tests/coroutine/fs_ideas/filesystem_holder.hpp Firmware/filesystem/filesystem/filesystem_holder.hpp

@@ -19,10 +19,10 @@
 #include <spi/spi_wrapper_async_templated.hpp>
 
 #include "st7789_draft.hpp"
+#include <filesystem/platform_filesystem.hpp>
+#include <filesystem/block_device_wrapper/heap_block_device.hpp>
+#include <filesystem/block_device_wrapper/adaptor_block_device.hpp>
 
-#include "fs_ideas/platform_filesystem.hpp"
-#include "wrapper/heap_block_device.hpp"
-#include "wrapper/adaptor_block_device.hpp"
 #include <spdlog/spdlog.h>
 
 using TFilesystem = Platform::Fs::Holder<Wrapper::LogAdaptorBlockDevice<Wrapper::HeapBlockDevice<

Firmware/firmware_tests/coroutine/fs_ideas/platform_filesystem.hpp Firmware/filesystem/filesystem/platform_filesystem.hpp

@@ -0,0 +1,42 @@
+#pragma once
+#include <gtest/gtest.h>
+
+#include <filesystem/platform_filesystem.hpp>
+#include <filesystem/block_device_wrapper/heap_block_device.hpp>
+#include <filesystem/block_device_wrapper/adaptor_block_device.hpp>
+
+
+#include <utils/coroutine/SyncWait.hpp>
+
+struct FilesystemParamInterfaceData
+{
+    std::string_view fileData;
+    std::string_view filename;
+};
+
+class FilesystemTopLevelTestFixture
+    : public ::testing::Test
+    , public ::testing::WithParamInterface<FilesystemParamInterfaceData>
+{
+
+public:
+
+    using TFilesystem = Platform::Fs::Holder<Wrapper::LogAdaptorBlockDevice<Wrapper::HeapBlockDevice<
+        Wrapper::kBlockSize,
+        Wrapper::kSectorsCount,
+        Wrapper::kReadSize,
+        Wrapper::kEraseSize>>>;
+
+    using TFile = Platform::Fs::File<TFilesystem>;
+
+protected:
+    void SetUp() override
+    {
+        CoroUtils::syncWait(m_testFilesystem.initializeFs());
+    }
+
+ 
+
+protected:
+    TFilesystem m_testFilesystem;
+};

Firmware/firmware_tests/CMakeLists.txt

@@ -0,0 +1,74 @@
+#include "filesystem_fixture.hpp"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+#include <utils/coroutine/SyncWait.hpp>
+
+
+constexpr auto HelloWorldData = FilesystemParamInterfaceData{ .fileData = "Hello world!", .filename = "helloworld.txt" };
+
+constexpr auto kNmeaDataExample = std::string_view{
+    "$GPGSA,A,1,,,,,,,,,,,,,,,* 1E\n"
+    "$GPGSV,1,1,0,,,,,,,,,,,,,,,,* 49\n"
+    "$GPRMC,114811.00,A,5548.2054190,N,03732.8518300,E,0.22,0.00,210618,0.0,E,A * 30\n"
+    "$GPGGA,114811.00,5548.2054190,N,03732.8518300,E,1,06,1.0,179.534,M,14.753,M,0.0,* 45\n"
+    "$GPGSA,A,3,02,21,25,26,31,,,,,,,,5.4,1.2,5.3,1 * 2B\n"
+    "$GAGSA,A,3,30,,,,,,,,,,,,0.0,0.0,0.0,3 * 3F\n"
+    "$GPGSV,2,1,05,02,23,059,28,21,30,222,32,25,41,166,35,26,36,303,34,1 * 67\n"
+    "$GPGSV,2,2,05,31,27,254,34,,,,,,,,,,,,,1 * 52\n"
+    "$GAGSV,1,1,01,30,23,183,33,,,,,,,,,,,,,7 * 4A\n"
+    "$GPRMC,114812.00,A,5548.2052305,N,03732.8513810,E,0.17,0.00,210618,0.0,E,A * 3C\n"
+    "$GPGGA,114812.00,5548.2052305,N,03732.8513810,E,1,06,1.0,178.149,M,14.753,M,0.0,* 40\n"
+    "$GPGSA,A,3,02,21,25,26,31,,,,,,,,5.4,1.2,5.3,1 * 2B\n"
+    "$GAGSA,A,3,30,,,,,,,,,,,,0.0,0.0,0.0,3 * 3F\n"
+    "$GPGSV,2,1,05,02,23,059,28,21,30,222,31,25,41,166,36,26,36,303,34,1 * 67\n"
+    "$GPGSV,2,2,05,31,27,254,34,,,,,,,,,,,,,1 * 52\n"
+    "$GAGSV,1,1,01,30,23,183,32,,,,,,,,,,,,,7 * 4B\n"
+    "$GPRMC,114813.00,A,5548.2048307,N,03732.8514121,E,0.28,0.00,210618,0.0,E,A * 34\n"
+    "$GPGGA,114813.00,5548.2048307,N,03732.8514121,E,1,06,1.0,172.326,M,14.753,M,0.0,* 45\n"
+    "$GPGSA,A,3,02,21,25,26,31,,,,,,,,5.4,1.2,5.3,1 * 2B\n"
+    "$GAGSA,A,3,30,,,,,,,,,,,,0.0,0.0,0.0,3 * 3F\n"
+    "$GPGSV,2,1,05,02,23,059,28,21,31,222,32,25,41,166,36,26,36,303,34,1 * 65\n"
+    "$GPGSV,2,2,05,31,27,254,34,,,,,,,,,,,,,1 * 52\n"
+    "$GAGSV,1,1,01,30,23,183,32,,,,,,,,,,,,,7 * 4B\n"
+    "$GPRMC,114814.00,A,5548.2047440,N,03732.8516481,E,0.19,0.00,210618,0.0,E,A * 37\n"
+    "$GPGGA,114814.00,5548.2047440,N,03732.8516481,E,1,06,1.0,172.488,M,14.753,M,0.0,* 47\n"
+    "$GPGSA,A,3,02,21,25,26,31,,,,,,,,5.4,1.2,5.3,1 * 2B\n"
+    "$GAGSA,A,3,30,,,,,,,,,,,,0.0,0.0,0.0,3 * 3F\n"
+    "$GPGSV,2,1,05,02,23,059,28,21,31,222,32,25,41,166,35,26,36,303,34,1 * 66\n"
+    "$GPGSV,2,2,05,31,27,254,34,,,,,,,,,,,,,1 * 52\n"
+    "$GAGSV,1,1,01,30,23,183,32,,,,,,,,,,,,,7 * 4B\n"
+
+};
+
+constexpr auto NmeaData = FilesystemParamInterfaceData{ .fileData = kNmeaDataExample,.filename = "nmea_data.txt" };
+
+
+TEST_P(FilesystemTopLevelTestFixture, CheckFileReadWriteProcedure)
+{
+    spdlog::warn("simpleRwTest begin");
+    auto lfs = m_testFilesystem.fsInstance();
+    {
+        auto filename = std::move(CoroUtils::syncWait(m_testFilesystem.openFile(GetParam().filename)));
+        CoroUtils::syncWait(filename.write(
+            std::span(reinterpret_cast<const std::uint8_t*>(GetParam().fileData.data()), GetParam().fileData.size())));
+    }
+
+    std::vector<std::uint8_t> readFrom;
+    readFrom.resize(GetParam().fileData.size());
+
+    {
+        auto holdedFile = std::move(CoroUtils::syncWait(m_testFilesystem.openFile(GetParam().filename)));
+        auto resultRead = CoroUtils::syncWait( holdedFile.read(std::span(readFrom.data(), GetParam().fileData.size())));
+    }
+
+    auto kCompareStringView{
+        std::string_view{reinterpret_cast<const char*>(readFrom.data()), readFrom.size()} };
+    EXPECT_EQ(kCompareStringView, GetParam().fileData);
+}
+
+
+INSTANTIATE_TEST_SUITE_P(
+    FilesystemTopLevelTesting,
+    FilesystemTopLevelTestFixture,
+    ::testing::Values(
+        FilesystemParamInterfaceData{}));