Unity integration

.gitmodules

@@ -7,3 +7,8 @@
 [submodule "lib/stm32-spl/SPL"]
 	path = lib/stm32-spl/SPL
 	url = https://github.com/forGGe/spl-hub.git
+[submodule "lib/unity/Unity"]
+	path = lib/unity/Unity
+	url = https://github.com/forGGe/Unity.git	
+	# Base repo
+	# url = https://github.com/ThrowTheSwitch/Unity.git

dev/bus/CMakeLists.txt

@@ -1,8 +1,6 @@
 add_library(bus INTERFACE)
 target_include_directories(bus INTERFACE export)
-target_link_libraries(bus INTERFACE dbg)
-target_link_libraries(bus INTERFACE platform_common)
-target_link_libraries(bus INTERFACE thread)
+target_link_libraries(bus INTERFACE dbg platform_common thread)
 
 add_unit_host_test(NAME bus
 				   SOURCES tests/bus_unit.cpp

lib/CMakeLists.txt

@@ -11,4 +11,4 @@ add_subdirectory(thread)
 add_subdirectory(containers)
 add_subdirectory(cmsis)
 add_subdirectory(stm32-spl)
-
+add_subdirectory(unity)

lib/allocators/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_library(allocators STATIC alloc.cpp)
 target_include_directories(allocators PUBLIC export)
 # Requires assert
-target_link_libraries(allocators dbg)
+target_link_libraries(allocators dbg types)
 # Static analysis
 add_cppcheck(allocators UNUSED_FUNCTIONS STYLE POSSIBLE_ERROR FORCE)
 # Unit tests

lib/cpp/CMakeLists.txt

@@ -14,8 +14,7 @@ else()
 endif()
 
 add_cppcheck(libcpp UNUSED_FUNCTIONS STYLE POSSIBLE_ERROR FORCE)
-target_link_libraries(libcpp PUBLIC types)
-target_link_libraries(libcpp PUBLIC bus)
+target_link_libraries(libcpp PUBLIC types bus)
 
 add_unit_host_test(NAME istream_test SOURCES tests/istream_unit.cpp
                                      INC_DIRS export)

lib/debug/CMakeLists.txt

@@ -1,5 +1,3 @@
 add_library(dbg assert.cpp)
-target_include_directories(dbg PUBLIC export)
-target_link_libraries(dbg PRIVATE libcpp)
-target_link_libraries(dbg PRIVATE ${PLATFORM_NAME})
-target_link_libraries(dbg INTERFACE types)
+target_include_directories(dbg PUBLIC export types)
+target_link_libraries(dbg PRIVATE libcpp ${PLATFORM_NAME})

lib/unity/CMakeLists.txt

@@ -0,0 +1,17 @@
+add_library(unity
+        unity_stubs.cpp
+        Unity/src/unity.c
+        Unity/extras/fixture/src/unity_fixture.c)
+
+target_include_directories(unity PUBLIC Unity/src/ Unity/extras/fixture/src)
+
+target_compile_definitions(unity PUBLIC
+        -DUNITY_EXCLUDE_STDLIB_MALLOC      # Prevent Unity from using standart library calls.
+        -DUNITY_EXCLUDE_FLOAT              # Float can be heavy on embedded platforms.
+        -DUNITY_EXCLUDE_DOUBLE             # Same.
+        -DUNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION # Do not use flush declaration.
+        -DUNITY_OUTPUT_CHAR=unity_putc     # Uses bypass platform driver internally to print output.
+        -DUNITY_OUTPUT_FLUSH=              # Bypass driver is fully synchronius in theCore.
+        )
+
+target_link_libraries(unity PRIVATE ${PLATFORM_NAME})

lib/unity/unity_stubs.cpp

@@ -0,0 +1,9 @@
+//! \file
+//! \brief Stubs implementation for Unity functions.
+
+#include <platform/console.hpp>
+
+extern "C" void unity_putc(char c)
+{
+    ecl::bypass_putc(c);
+}

tests/CMakeLists.txt

@@ -103,3 +103,17 @@ add_functional_test(hello_world
         TARGET_NAME         stm32f4discovery_simple
         CONFIG_NAME         stm32f4disc_nonos
         )
+
+#------------------------------------------------------------------------------
+# Unity test framework demo.
+
+add_functional_test(unity_demo
+        TARGET_NAME         host
+        CONFIG_NAME         host)
+
+add_functional_test(unity_demo
+        TOOLCHAIN_NAME      arm-cm3-gnu.cmake
+        MCU_NAME            stm32f407
+        TARGET_NAME         stm32f4discovery_simple
+        CONFIG_NAME         stm32f4disc_nonos
+        )

tests/cases/unity_demo/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.4)
+
+# Hello World basic case
+project(unity_demo)
+
+include(${APP_CFG}/app_defs.cmake)
+
+add_executable(unity_demo main.cpp)
+target_include_directories(unity_demo PUBLIC
+        ${TARGET_DIR}
+        ${CMAKE_CURRENT_LIST_DIR}/${APP_CFG})
+
+target_link_libraries(unity_demo the_core unity)
+
+add_subdirectory(${CORE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/core)

tests/cases/unity_demo/host/app_defs.cmake

@@ -0,0 +1,5 @@
+# Enable console.
+set(CONFIG_USE_CONSOLE 1)
+
+# Enable OS support, required to enable sleep_for() call
+set(CONFIG_OS host)

tests/cases/unity_demo/host/app_defs.hpp

@@ -0,0 +1,8 @@
+//! \file
+//! \brief Unity demo test running on host platform.
+//! \details Just a stub for now.
+#ifndef TEST_UNITY_DEMO_HOST_APP_DEFS_HPP_
+#define TEST_UNITY_DEMO_HOST_APP_DEFS_HPP_
+
+
+#endif // TEST_UNITY_DEMO_HOST_APP_DEFS_HPP_

tests/cases/unity_demo/main.cpp

@@ -0,0 +1,29 @@
+#include <unity.h>
+#include <unity_fixture.h>
+
+extern "C"
+void board_init()
+{
+}
+
+
+TEST_GROUP(demo_group);
+
+TEST_SETUP(demo_group) { }
+
+TEST_TEAR_DOWN(demo_group) { }
+
+TEST(demo_group, test1)
+{
+    TEST_ASSERT_TRUE(0 == 1);
+}
+
+TEST_GROUP_RUNNER(demo_group)
+{
+    RUN_TEST_CASE(demo_group, test1);
+}
+
+int main()
+{
+    RUN_TEST_GROUP(demo_group);
+}

tests/cases/unity_demo/stm32f4disc_nonos/app_defs.cmake

@@ -0,0 +1,2 @@
+# Console enabled by the target
+include(${TARGET_DIR}/target_defs.cmake)

tests/cases/unity_demo/stm32f4disc_nonos/app_defs.hpp

@@ -0,0 +1,8 @@
+//! \file
+//! \brief Application definitions for stm32f4 discovery Unity demo test (no OS)
+
+#ifndef TEST_UNITY_DEMO_STM32_DICS_NONOS_APP_DEFS_HPP_
+#define TEST_UNITY_DEMO_STM32_DICS_NONOS_APP_DEFS_HPP_
+
+
+#endif // TEST_UNITY_DEMO_STM32_DICS_NONOS_APP_DEFS_HPP_