Move storgae unittests

rajkan01 · rajkan01 · commit d47689be8e47 · 2020-07-17T03:10:58.000-07:00
diff --git a/UNITTESTS/storage/blockdevice/ChainingBlockDevice/unittest.cmake b/UNITTESTS/storage/blockdevice/ChainingBlockDevice/unittest.cmake
diff --git a/storage/blockdevice/tests/UNITTESTS/.mbedignore b/storage/blockdevice/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "storage/blockdevice/BufferedBlockDevice.h"
+#include "blockdevice/BufferedBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 using ::testing::_;
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/unittest.cmake
@@ -9,12 +9,11 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../storage/blockdevice/BufferedBlockDevice.cpp
+  ../storage/blockdevice/source/BufferedBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
-
 set(unittest-test-sources
-  storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test_BufferedBlockDevice.cpp
   stubs/BlockDevice_mock.h
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/test_ChainingBlockDevice.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/test_ChainingBlockDevice.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "storage/blockdevice/ChainingBlockDevice.cpp"
+#include "ChainingBlockDevice.cpp"
 #include "stubs/BlockDevice_mock.h"
 
 using ::testing::_;
@@ -160,4 +160,3 @@ TEST_F(ChainingBlockModuleTest, memory_overlap)
 
     EXPECT_EQ(bd.erase((SECTORS_NUM / 2 - 2) * BLOCK_SIZE, 4 * BLOCK_SIZE), BD_ERROR_OK);
 }
-
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/unittest.cmake
@@ -6,15 +6,16 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
+  ../storage/blockdevice/source
 )
 
 set(unittest-sources
-  ../storage/blockdevice/SlicingBlockDevice.cpp
-  ../storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/source/ChainingBlockDevice.cpp
+  ../storage/blockdevice/source/HeapBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  moduletests/storage/blockdevice/SlicingBlockDevice/moduletest.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test_ChainingBlockDevice.cpp
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "storage/blockdevice/ExhaustibleBlockDevice.h"
+#include "blockdevice/ExhaustibleBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 #define BLOCK_SIZE (512)
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/unittest.cmake
@@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../storage/blockdevice/FlashSimBlockDevice.cpp
+  ../storage/blockdevice/source/ExhaustibleBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test_ExhaustibleBlockDevice.cpp
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "storage/blockdevice/FlashSimBlockDevice.h"
+#include "blockdevice/FlashSimBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 #define BLOCK_SIZE (512)
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/unittest.cmake
@@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../storage/blockdevice/ExhaustibleBlockDevice.cpp
+  ../storage/blockdevice/source/FlashSimBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  storage/blockdevice/ExhaustibleBlockDevice/test_ExhaustibleBlockDevice.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test_FlashSimBlockDevice.cpp
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/test.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/test.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "storage/blockdevice/HeapBlockDevice.h"
+#include "blockdevice/HeapBlockDevice.h"
 #include <string.h>
 #include "mbed_assert.h"
 
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/unittest.cmake
@@ -6,16 +6,17 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
+  ../storage/blockdevice/include
 )
 
 set(unittest-sources
-  ../storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/source/HeapBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  storage/blockdevice/HeapBlockDevice/test.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test.cpp
 )
 
 set(unittest-test-flags
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "storage/blockdevice/MBRBlockDevice.h"
+#include "blockdevice/MBRBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 #define BLOCK_SIZE (512)
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/unittest.cmake
@@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../storage/blockdevice/MBRBlockDevice.cpp
+  ../storage/blockdevice/source/MBRBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  storage/blockdevice/MBRBlockDevice/test_MBRBlockDevice.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test_MBRBlockDevice.cpp
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "gtest/gtest.h"
-#include "storage/blockdevice/ObservingBlockDevice.h"
-#include "storage/blockdevice/ReadOnlyBlockDevice.h"
+#include "blockdevice/ObservingBlockDevice.h"
+#include "blockdevice/ReadOnlyBlockDevice.h"
 #include "stubs/BlockDevice_mock.h"
 
 using ::testing::_;
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/unittest.cmake
@@ -9,14 +9,14 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../storage/blockdevice/ObservingBlockDevice.cpp
-  ../storage/blockdevice/ReadOnlyBlockDevice.cpp
+  ../storage/blockdevice/source/ObservingBlockDevice.cpp
+  ../storage/blockdevice/source/ReadOnlyBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
   stubs/mbed_error.c
 )
 
 set(unittest-test-sources
-  storage/blockdevice/ObservingBlockDevice/test_ObservingBlockDevice.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test_ObservingBlockDevice.cpp
   stubs/BlockDevice_mock.h
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/test_ProfilingBlockDevice.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/test_ProfilingBlockDevice.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "stubs/BlockDevice_mock.h"
-#include "storage/blockdevice/ProfilingBlockDevice.h"
+#include "blockdevice/ProfilingBlockDevice.h"
 
 #define BLOCK_SIZE (512)
 #define DEVICE_SIZE (BLOCK_SIZE*10)
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/unittest.cmake
@@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../storage/blockdevice/ProfilingBlockDevice.cpp
-  ../storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/source/ProfilingBlockDevice.cpp
+  ../storage/blockdevice/source/HeapBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  storage/blockdevice/ProfilingBlockDevice/test_ProfilingBlockDevice.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test_ProfilingBlockDevice.cpp
   stubs/mbed_error.c
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/test_ReadOnlyBlockDevice.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/test_ReadOnlyBlockDevice.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 #include "stubs/BlockDevice_mock.h"
-#include "storage/blockdevice/ReadOnlyBlockDevice.h"
+#include "blockdevice/ReadOnlyBlockDevice.h"
 #include "platform/mbed_error.h"
 
 #define BLOCK_SIZE (512)
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/unittest.cmake
@@ -9,13 +9,13 @@ set(unittest-includes ${unittest-includes}
 )
 
 set(unittest-sources
-  ../storage/blockdevice/ReadOnlyBlockDevice.cpp
-  ../storage/blockdevice/HeapBlockDevice.cpp
+  ../storage/blockdevice/source/ReadOnlyBlockDevice.cpp
+  ../storage/blockdevice/source/HeapBlockDevice.cpp
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
 )
 
 set(unittest-test-sources
-  storage/blockdevice/ReadOnlyBlockDevice/test_ReadOnlyBlockDevice.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/test_ReadOnlyBlockDevice.cpp
   stubs/mbed_error.c
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/moduletest.cpp b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/moduletest.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "gtest/gtest.h"
-#include "storage/blockdevice/HeapBlockDevice.h"
-#include "storage/blockdevice/SlicingBlockDevice.h"
+#include "blockdevice/HeapBlockDevice.h"
+#include "blockdevice/SlicingBlockDevice.h"
 
 #define BLOCK_SIZE (512)
 #define DEVICE_SIZE (BLOCK_SIZE*10)
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/unittest.cmake b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/unittest.cmake
@@ -0,0 +1,20 @@
+
+####################
+# UNIT TESTS
+####################
+
+set(unittest-includes ${unittest-includes}
+  .
+  ..
+)
+
+set(unittest-sources
+  ../storage/blockdevice/source/SlicingBlockDevice.cpp
+  ../storage/blockdevice/source/HeapBlockDevice.cpp
+  stubs/mbed_atomic_stub.c
+  stubs/mbed_assert_stub.cpp
+)
+
+set(unittest-test-sources
+  ${CMAKE_CURRENT_LIST_DIR}/moduletest.cpp
+)

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,11 @@ set(unittest-includes ${unittest-includes}`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`set(unittest-sources`
`12`		`- ../storage/blockdevice/BufferedBlockDevice.cpp`
	`12`	`+ ../storage/blockdevice/source/BufferedBlockDevice.cpp`
`13`	`13`	`stubs/mbed_atomic_stub.c`
`14`	`14`	`stubs/mbed_assert_stub.cpp`
`15`	`15`	`)`
`16`		`-`
`17`	`16`	`set(unittest-test-sources`
`18`		`- storage/blockdevice/BufferedBlockDevice/test_BufferedBlockDevice.cpp`
	`17`	`+ ${CMAKE_CURRENT_LIST_DIR}/test_BufferedBlockDevice.cpp`
`19`	`18`	`stubs/BlockDevice_mock.h`
`20`	`19`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,16 @@`
`6`	`6`	`set(unittest-includes ${unittest-includes}`
`7`	`7`	`.`
`8`	`8`	`..`
	`9`	`+ ../storage/blockdevice/source`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`set(unittest-sources`
`12`		`- ../storage/blockdevice/SlicingBlockDevice.cpp`
`13`		`- ../storage/blockdevice/HeapBlockDevice.cpp`
	`13`	`+ ../storage/blockdevice/source/ChainingBlockDevice.cpp`
	`14`	`+ ../storage/blockdevice/source/HeapBlockDevice.cpp`
`14`	`15`	`stubs/mbed_atomic_stub.c`
`15`	`16`	`stubs/mbed_assert_stub.cpp`
`16`	`17`	`)`
`17`	`18`
`18`	`19`	`set(unittest-test-sources`
`19`		`- moduletests/storage/blockdevice/SlicingBlockDevice/moduletest.cpp`
	`20`	`+ ${CMAKE_CURRENT_LIST_DIR}/test_ChainingBlockDevice.cpp`
`20`	`21`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ set(unittest-includes ${unittest-includes}`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`set(unittest-sources`
`12`		`- ../storage/blockdevice/FlashSimBlockDevice.cpp`
	`12`	`+ ../storage/blockdevice/source/ExhaustibleBlockDevice.cpp`
`13`	`13`	`stubs/mbed_atomic_stub.c`
`14`	`14`	`stubs/mbed_assert_stub.cpp`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`set(unittest-test-sources`
`18`		`- storage/blockdevice/FlashSimBlockDevice/test_FlashSimBlockDevice.cpp`
	`18`	`+ ${CMAKE_CURRENT_LIST_DIR}/test_ExhaustibleBlockDevice.cpp`
`19`	`19`	`)`