move greentea and UNITTESTS closure to library

storage/kvstore/direct_access_devicekey/tests/TESTS/direct_access_devicekey/direct_access_devicekey_tdb/main.cpp

@@ -23,13 +23,13 @@
 #include <stdio.h>
 #include <string.h>
 #include "DeviceKey.h"
-#include "KVStore.h"
-#include "KVMap.h"
-#include "kv_config.h"
-#include "TDBStore.h"
+#include "kvstore/KVStore.h"
+#include "kvstore/KVMap.h"
+#include "kv_config/kv_config.h"
+#include "kvstore/TDBStore.h"
 #include "FlashIAP.h"
 #include "FlashIAPBlockDevice.h"
-#include "DirectAccessDevicekey.h"
+#include "direct_access_devicekey/DirectAccessDevicekey.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
 #include "utest.h"

storage/kvstore/securestore/tests/TESTS/securestore/securestore_whitebox/main.cpp

@@ -16,8 +16,8 @@
 * limitations under the License.
 */
 
-#include "SecureStore.h"
-#include "TDBStore.h"
+#include "securestore/SecureStore.h"
+#include "kvstore/TDBStore.h"
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
 #endif

storage/kvstore/tests/TESTS/kvstore/general_tests_phase_1/main.cpp

@@ -14,8 +14,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include "SecureStore.h"
-#include "TDBStore.h"
+#include "securestore/SecureStore.h"
+#include "kvstore/TDBStore.h"
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "Thread.h"
 #endif

storage/kvstore/tests/TESTS/kvstore/general_tests_phase_2/main.cpp

@@ -14,8 +14,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#include "SecureStore.h"
-#include "TDBStore.h"
+#include "securestore/SecureStore.h"
+#include "kvstore/TDBStore.h"
 #include "mbed_error.h"
 #include "FlashSimBlockDevice.h"
 #include "SlicingBlockDevice.h"

storage/kvstore/tests/UNITTESTS/.mbedignore

@@ -0,0 +1 @@
+*

storage/kvstore/tests/UNITTESTS/FileSystemStore/moduletest.cpp

@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "blockdevice/HeapBlockDevice.h"
-#include "storage/kvstore/filesystemstore/FileSystemStore.h"
+#include "kvstore/FileSystemStore.h"
 #include "littlefs/LittleFileSystem.h"
 #include "mbed_error.h"
 #include <stdlib.h>

storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake

@@ -10,7 +10,7 @@ set(unittest-includes ${unittest-includes}
 
 set(unittest-sources
   ../storage/blockdevice/source/HeapBlockDevice.cpp
-  ../storage/kvstore/filesystemstore/FileSystemStore.cpp
+  ../storage/kvstore/source/FileSystemStore.cpp
   ../storage/filesystem/littlefs/source/LittleFileSystem.cpp
   ../storage/filesystem/source/Dir.cpp
   ../storage/filesystem/source/File.cpp
@@ -24,7 +24,7 @@ set(unittest-sources
 )
 
 set(unittest-test-sources
-  moduletests/storage/kvstore/FileSystemStore/moduletest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/moduletest.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
   stubs/mbed_error.c
@@ -37,4 +37,4 @@ set(unittest-test-flags
   -DMBED_LFS_PROG_SIZE=64
   -DMBED_LFS_BLOCK_SIZE=512
   -DMBED_LFS_LOOKAHEAD=512
-)
+)

storage/kvstore/tests/UNITTESTS/TDBStore/moduletest.cpp

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

storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake

@@ -13,7 +13,7 @@ set(unittest-sources
   ../storage/blockdevice/source/FlashSimBlockDevice.cpp
   ../storage/blockdevice/source/HeapBlockDevice.cpp
   ../storage/blockdevice/source/BufferedBlockDevice.cpp
-  ../storage/kvstore/tdbstore/TDBStore.cpp
+  ../storage/kvstore/source/TDBStore.cpp
   ../features/frameworks/mbed-trace/source/mbed_trace.c
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
@@ -21,7 +21,7 @@ set(unittest-sources
 )
 
 set(unittest-test-sources
-  moduletests/storage/kvstore/TDBStore/moduletest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/moduletest.cpp
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")