Stroage unittest directory restructure

- Move UNITTESTS/features/storage to UNITTESTS/storage
- update the .cmake files to refer the new directory
pull/13244/head
Rajkumar Kanagaraj 2020-07-06 18:38:42 +01:00
parent aafdb8a0a3
commit fdaaffdc7a
30 changed files with 103 additions and 102 deletions

View File

@ -113,6 +113,7 @@ set(unittest-includes-base
"${PROJECT_SOURCE_DIR}/../features" "${PROJECT_SOURCE_DIR}/../features"
"${PROJECT_SOURCE_DIR}/../features/netsocket" "${PROJECT_SOURCE_DIR}/../features/netsocket"
"${PROJECT_SOURCE_DIR}/../platform" "${PROJECT_SOURCE_DIR}/../platform"
"${PROJECT_SOURCE_DIR}/../storage"
"${PROJECT_SOURCE_DIR}/../drivers" "${PROJECT_SOURCE_DIR}/../drivers"
"${PROJECT_SOURCE_DIR}/../hal" "${PROJECT_SOURCE_DIR}/../hal"
"${PROJECT_SOURCE_DIR}/../events" "${PROJECT_SOURCE_DIR}/../events"
@ -144,7 +145,7 @@ set(unittest-includes-base
"${PROJECT_SOURCE_DIR}/../features/lorawan/system" "${PROJECT_SOURCE_DIR}/../features/lorawan/system"
"${PROJECT_SOURCE_DIR}/../features/mbedtls" "${PROJECT_SOURCE_DIR}/../features/mbedtls"
"${PROJECT_SOURCE_DIR}/../features/mbedtls/inc" "${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
"${PROJECT_SOURCE_DIR}/../features/storage/kvstore/conf" "${PROJECT_SOURCE_DIR}/../storage/kvstore/conf"
) )
# Create a list for test suites. # Create a list for test suites.

View File

@ -13,33 +13,33 @@ set(unittest-includes ${unittest-includes}
set(unittest-sources set(unittest-sources
../features/device_key/source/DeviceKey.cpp ../features/device_key/source/DeviceKey.cpp
../components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp ../storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp ../storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp ../storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp ../storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp ../storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
../components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp ../storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
../features/storage/filesystem/Dir.cpp ../storage/filesystem/Dir.cpp
../features/storage/filesystem/FileSystem.cpp ../storage/filesystem/FileSystem.cpp
../features/storage/filesystem/File.cpp ../storage/filesystem/File.cpp
../features/storage/kvstore/global_api/kvstore_global_api.cpp ../storage/kvstore/global_api/kvstore_global_api.cpp
../features/storage/kvstore/securestore/SecureStore.cpp ../storage/kvstore/securestore/SecureStore.cpp
../features/storage/kvstore/kv_map/KVMap.cpp ../storage/kvstore/kv_map/KVMap.cpp
../features/storage/kvstore/tdbstore/TDBStore.cpp ../storage/kvstore/tdbstore/TDBStore.cpp
../features/storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp ../storage/kvstore/direct_access_devicekey/DirectAccessDevicekey.cpp
../features/storage/kvstore/conf/kv_config.cpp ../storage/kvstore/conf/kv_config.cpp
../features/storage/kvstore/filesystemstore/FileSystemStore.cpp ../storage/kvstore/filesystemstore/FileSystemStore.cpp
../features/storage/system_storage/SystemStorage.cpp ../storage/system_storage/SystemStorage.cpp
../features/storage/blockdevice/ChainingBlockDevice.cpp ../storage/blockdevice/ChainingBlockDevice.cpp
../features/storage/blockdevice/ReadOnlyBlockDevice.cpp ../storage/blockdevice/ReadOnlyBlockDevice.cpp
../features/storage/blockdevice/SlicingBlockDevice.cpp ../storage/blockdevice/SlicingBlockDevice.cpp
../features/storage/blockdevice/MBRBlockDevice.cpp ../storage/blockdevice/MBRBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp ../storage/blockdevice/HeapBlockDevice.cpp
../features/storage/blockdevice/FlashSimBlockDevice.cpp ../storage/blockdevice/FlashSimBlockDevice.cpp
../features/storage/blockdevice/ObservingBlockDevice.cpp ../storage/blockdevice/ObservingBlockDevice.cpp
../features/storage/blockdevice/ProfilingBlockDevice.cpp ../storage/blockdevice/ProfilingBlockDevice.cpp
../features/storage/blockdevice/BufferedBlockDevice.cpp ../storage/blockdevice/BufferedBlockDevice.cpp
../features/storage/blockdevice/ExhaustibleBlockDevice.cpp ../storage/blockdevice/ExhaustibleBlockDevice.cpp
) )
set(unittest-test-sources set(unittest-test-sources

View File

@ -1,20 +0,0 @@
####################
# UNIT TESTS
####################
set(unittest-includes ${unittest-includes}
.
..
)
set(unittest-sources
../features/storage/blockdevice/ChainingBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)
set(unittest-test-sources
features/storage/blockdevice/ChainingBlockDevice/test_ChainingBlockDevice.cpp
)

View File

@ -15,8 +15,8 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/HeapBlockDevice.h" #include "storage/blockdevice/HeapBlockDevice.h"
#include "features/storage/blockdevice/SlicingBlockDevice.h" #include "storage/blockdevice/SlicingBlockDevice.h"
#define BLOCK_SIZE (512) #define BLOCK_SIZE (512)
#define DEVICE_SIZE (BLOCK_SIZE*10) #define DEVICE_SIZE (BLOCK_SIZE*10)

View File

@ -9,8 +9,8 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/SlicingBlockDevice.cpp ../storage/blockdevice/SlicingBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp ../storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
) )

View File

@ -15,9 +15,9 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/HeapBlockDevice.h" #include "storage/blockdevice/HeapBlockDevice.h"
#include "features/storage/kvstore/filesystemstore/FileSystemStore.h" #include "storage/kvstore/filesystemstore/FileSystemStore.h"
#include "features/storage/filesystem/littlefs/LittleFileSystem.h" #include "storage/filesystem/littlefs/LittleFileSystem.h"
#include "mbed_error.h" #include "mbed_error.h"
#include <stdlib.h> #include <stdlib.h>

View File

@ -9,15 +9,15 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/HeapBlockDevice.cpp ../storage/blockdevice/HeapBlockDevice.cpp
../features/storage/kvstore/filesystemstore/FileSystemStore.cpp ../storage/kvstore/filesystemstore/FileSystemStore.cpp
../features/storage/filesystem/littlefs/LittleFileSystem.cpp ../storage/filesystem/littlefs/LittleFileSystem.cpp
../features/storage/filesystem/Dir.cpp ../storage/filesystem/Dir.cpp
../features/storage/filesystem/File.cpp ../storage/filesystem/File.cpp
../features/storage/filesystem/FileSystem.cpp ../storage/filesystem/FileSystem.cpp
../features/frameworks/mbed-trace/source/mbed_trace.c ../features/frameworks/mbed-trace/source/mbed_trace.c
../features/storage/filesystem/littlefs/littlefs/lfs_util.c ../storage/filesystem/littlefs/littlefs/lfs_util.c
../features/storage/filesystem/littlefs/littlefs/lfs.c ../storage/filesystem/littlefs/littlefs/lfs.c
../platform/source/FileBase.cpp ../platform/source/FileBase.cpp
../platform/source/FileSystemHandle.cpp ../platform/source/FileSystemHandle.cpp
../platform/source/FileHandle.cpp ../platform/source/FileHandle.cpp

View File

@ -15,9 +15,9 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/HeapBlockDevice.h" #include "storage/blockdevice/HeapBlockDevice.h"
#include "features/storage/blockdevice/FlashSimBlockDevice.h" #include "storage/blockdevice/FlashSimBlockDevice.h"
#include "features/storage/kvstore/tdbstore/TDBStore.h" #include "storage/kvstore/tdbstore/TDBStore.h"
#include <stdlib.h> #include <stdlib.h>
#define BLOCK_SIZE (512) #define BLOCK_SIZE (512)

View File

@ -10,10 +10,10 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/FlashSimBlockDevice.cpp ../storage/blockdevice/FlashSimBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp ../storage/blockdevice/HeapBlockDevice.cpp
../features/storage/blockdevice/BufferedBlockDevice.cpp ../storage/blockdevice/BufferedBlockDevice.cpp
../features/storage/kvstore/tdbstore/TDBStore.cpp ../storage/kvstore/tdbstore/TDBStore.cpp
../features/frameworks/mbed-trace/source/mbed_trace.c ../features/frameworks/mbed-trace/source/mbed_trace.c
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp

View File

@ -15,7 +15,7 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/BufferedBlockDevice.h" #include "storage/blockdevice/BufferedBlockDevice.h"
#include "stubs/BlockDevice_mock.h" #include "stubs/BlockDevice_mock.h"
using ::testing::_; using ::testing::_;

View File

@ -9,12 +9,12 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/BufferedBlockDevice.cpp ../storage/blockdevice/BufferedBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
) )
set(unittest-test-sources set(unittest-test-sources
features/storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp
stubs/BlockDevice_mock.h stubs/BlockDevice_mock.h
) )

View File

@ -15,7 +15,7 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/ChainingBlockDevice.cpp" #include "storage/blockdevice/ChainingBlockDevice.cpp"
#include "stubs/BlockDevice_mock.h" #include "stubs/BlockDevice_mock.h"
using ::testing::_; using ::testing::_;

View File

@ -0,0 +1,20 @@
####################
# UNIT TESTS
####################
set(unittest-includes ${unittest-includes}
.
..
)
set(unittest-sources
../storage/blockdevice/ChainingBlockDevice.cpp
../storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp
)
set(unittest-test-sources
storage/blockdevice/ChainingBlockDevice/test_ChainingBlockDevice.cpp
)

View File

@ -15,7 +15,7 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/ExhaustibleBlockDevice.h" #include "storage/blockdevice/ExhaustibleBlockDevice.h"
#include "stubs/BlockDevice_mock.h" #include "stubs/BlockDevice_mock.h"
#define BLOCK_SIZE (512) #define BLOCK_SIZE (512)

View File

@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/FlashSimBlockDevice.cpp ../storage/blockdevice/ExhaustibleBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
) )
set(unittest-test-sources set(unittest-test-sources
features/storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp storage/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp
) )

View File

@ -15,7 +15,7 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/FlashSimBlockDevice.h" #include "storage/blockdevice/FlashSimBlockDevice.h"
#include "stubs/BlockDevice_mock.h" #include "stubs/BlockDevice_mock.h"
#define BLOCK_SIZE (512) #define BLOCK_SIZE (512)

View File

@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/MBRBlockDevice.cpp ../storage/blockdevice/FlashSimBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
) )
set(unittest-test-sources set(unittest-test-sources
features/storage/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp
) )

View File

@ -15,7 +15,7 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/HeapBlockDevice.h" #include "storage/blockdevice/HeapBlockDevice.h"
#include <string.h> #include <string.h>
#include "mbed_assert.h" #include "mbed_assert.h"

View File

@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/HeapBlockDevice.cpp ../storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
) )
set(unittest-test-sources set(unittest-test-sources
features/storage/blockdevice/HeapBlockDevice/test.cpp storage/blockdevice/HeapBlockDevice/test.cpp
) )
set(unittest-test-flags set(unittest-test-flags

View File

@ -15,7 +15,7 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/MBRBlockDevice.h" #include "storage/blockdevice/MBRBlockDevice.h"
#include "stubs/BlockDevice_mock.h" #include "stubs/BlockDevice_mock.h"
#define BLOCK_SIZE (512) #define BLOCK_SIZE (512)

View File

@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/ExhaustibleBlockDevice.cpp ../storage/blockdevice/MBRBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
) )
set(unittest-test-sources set(unittest-test-sources
features/storage/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp storage/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp
) )

View File

@ -15,8 +15,8 @@
*/ */
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "features/storage/blockdevice/ObservingBlockDevice.h" #include "storage/blockdevice/ObservingBlockDevice.h"
#include "features/storage/blockdevice/ReadOnlyBlockDevice.h" #include "storage/blockdevice/ReadOnlyBlockDevice.h"
#include "stubs/BlockDevice_mock.h" #include "stubs/BlockDevice_mock.h"
using ::testing::_; using ::testing::_;

View File

@ -9,14 +9,14 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/ObservingBlockDevice.cpp ../storage/blockdevice/ObservingBlockDevice.cpp
../features/storage/blockdevice/ReadOnlyBlockDevice.cpp ../storage/blockdevice/ReadOnlyBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
stubs/mbed_error.c stubs/mbed_error.c
) )
set(unittest-test-sources set(unittest-test-sources
features/storage/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp storage/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp
stubs/BlockDevice_mock.h stubs/BlockDevice_mock.h
) )

View File

@ -16,7 +16,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "stubs/BlockDevice_mock.h" #include "stubs/BlockDevice_mock.h"
#include "features/storage/blockdevice/ProfilingBlockDevice.h" #include "storage/blockdevice/ProfilingBlockDevice.h"
#define BLOCK_SIZE (512) #define BLOCK_SIZE (512)
#define DEVICE_SIZE (BLOCK_SIZE*10) #define DEVICE_SIZE (BLOCK_SIZE*10)

View File

@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/ReadOnlyBlockDevice.cpp ../storage/blockdevice/ProfilingBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp ../storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
) )
set(unittest-test-sources set(unittest-test-sources
features/storage/blockdevice/ReadOnlyBlockDevice/test_ReadOnlyBlockDevice.cpp storage/blockdevice/ProfilingBlockDevice/test_ProfilingBlockDevice.cpp
stubs/mbed_error.c stubs/mbed_error.c
) )

View File

@ -16,7 +16,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "stubs/BlockDevice_mock.h" #include "stubs/BlockDevice_mock.h"
#include "features/storage/blockdevice/ReadOnlyBlockDevice.h" #include "storage/blockdevice/ReadOnlyBlockDevice.h"
#include "platform/mbed_error.h" #include "platform/mbed_error.h"
#define BLOCK_SIZE (512) #define BLOCK_SIZE (512)

View File

@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
) )
set(unittest-sources set(unittest-sources
../features/storage/blockdevice/ProfilingBlockDevice.cpp ../storage/blockdevice/ReadOnlyBlockDevice.cpp
../features/storage/blockdevice/HeapBlockDevice.cpp ../storage/blockdevice/HeapBlockDevice.cpp
stubs/mbed_atomic_stub.c stubs/mbed_atomic_stub.c
stubs/mbed_assert_stub.cpp stubs/mbed_assert_stub.cpp
) )
set(unittest-test-sources set(unittest-test-sources
features/storage/blockdevice/ProfilingBlockDevice/test_ProfilingBlockDevice.cpp storage/blockdevice/ReadOnlyBlockDevice/test_ReadOnlyBlockDevice.cpp
stubs/mbed_error.c stubs/mbed_error.c
) )

View File

@ -20,7 +20,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gmock/gmock.h" #include "gmock/gmock.h"
#include "features/storage/blockdevice/BlockDevice.h" #include "storage/blockdevice/BlockDevice.h"
class BlockDeviceMock : public BlockDevice { class BlockDeviceMock : public BlockDevice {
public: public:

View File

@ -17,7 +17,7 @@
#ifndef EMULATEDSD_H #ifndef EMULATEDSD_H
#define EMULATEDSD_H #define EMULATEDSD_H
#include "features/storage/blockdevice/BlockDevice.h" #include "storage/blockdevice/BlockDevice.h"
class EmulatedSD_Private; class EmulatedSD_Private;

View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "features/storage/kvstore/conf/kv_config.h" #include "storage/kvstore/conf/kv_config.h"
const char *get_filesystemstore_folder_path() const char *get_filesystemstore_folder_path()
{ {