Move storage stubs into subdirectories of Mbed OS storage

Move storage stubs from UNITTESTS/stubs into components inside the
top-level storage directory. Specifically,
* storage/blockdevice/tests/UNITTESTS/doubles/ for BlockDevice stubs.
* storage/kvstore/filesystemstore/tests/UNITTESTS/ for a stub used by
the FileSystemStore test. The stub has been renamed from
kv_config_stub.cpp to filesystemstore_kv_config_stub.cpp, to make it
evident why it doesn't go into storage/kvstore/kv_config/.

UNITTESTS/stubs/CMakeLists.txt

@@ -103,7 +103,6 @@ target_include_directories(mbed-stubs-headers
 add_subdirectory(connectivity)
 add_subdirectory(events)
 add_subdirectory(platform)
-add_subdirectory(storage)
 
 add_library(mbed-stubs INTERFACE)
 
@@ -115,5 +114,4 @@ target_link_libraries(mbed-stubs
         mbed-stubs-hal
         mbed-stubs-platform
         mbed-stubs-rtos
-        mbed-stubs-storage
 )

storage/blockdevice/tests/UNITTESTS/CMakeLists.txt

@@ -3,3 +3,4 @@
 
 add_subdirectory(blockdevice)
 add_subdirectory(SFDP)
+add_subdirectory(doubles)

storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt

@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt

@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt

@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt

@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt

@@ -59,6 +59,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt

@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt

@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt

@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt

@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-stubs-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt

@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt

@@ -1,9 +1,14 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-stubs-storage)
+add_library(mbed-stubs-blockdevice)
 
-target_sources(mbed-stubs-storage
+target_include_directories(mbed-stubs-blockdevice
+    PUBLIC
+        .
+)
+
+target_sources(mbed-stubs-blockdevice
     PRIVATE
         BufferedBlockDevice_stub.cpp
         ChainingBlockDevice_stub.cpp
@@ -15,10 +20,9 @@ target_sources(mbed-stubs-storage
         ProfilingBlockDevice_stub.cpp
         ReadOnlyBlockDevice_stub.cpp
         SlicingBlockDevice_stub.cpp
-        kv_config_stub.cpp
 )
 
-target_link_libraries(mbed-stubs-storage
+target_link_libraries(mbed-stubs-blockdevice
     PRIVATE
         mbed-headers
         mbed-stubs-headers

storage/kvstore/filesystemstore/tests/UNITTESTS/CMakeLists.txt

@@ -2,3 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(FileSystemStore)
+add_subdirectory(doubles)

storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt

@@ -34,7 +34,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-stubs-platform
-        mbed-stubs-storage
+        mbed-stubs-filesystemstore
         gmock_main
 )
 

storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-stubs-filesystemstore)
+
+target_sources(mbed-stubs-filesystemstore
+    PRIVATE
+        filesystemstore_kv_config_stub.cpp
+)
+
+target_link_libraries(mbed-stubs-filesystemstore
+    PRIVATE
+        mbed-headers
+        mbed-stubs-headers
+)