workflows: re-add native sim twister tests

Add native sim tests.

Signed-off-by: Giacomo Dematteis <giacomo.dematteis@nordicsemi.no>

Author: DematteisGiacomo

.github/workflows/sonarcloud.yml

@@ -54,10 +54,19 @@ jobs:
       # - name: Install sonar-scanner and build-wrapper
       #   uses: SonarSource/sonarcloud-github-c-cpp@v3
 
-      # - name: Build and test native sim
-      #   working-directory: asset-tracker-template
-      #   run: |
-      #     west twister -T . -C --coverage-platform=native_sim -v --inline-logs --integration
+      - name: Build and test native sim
+        working-directory: asset-tracker-template
+        run: |
+          west twister -T . -C --coverage-platform=native_sim -v --inline-logs --integration
+
+      - name: Results
+        if: always()
+        uses: pmeier/pytest-results-action@v0.7.1
+        with:
+          path: asset-tracker-template//twister-out/*.xml
+          summary: true
+          fail-on-empty: true
+          title: ATT FW Unittest natvie sim Results
 
       # - name: Build and test
       #   working-directory: asset-tracker-template

app/sample.yaml

@@ -15,25 +15,25 @@ tests:
     platform_allow:
       - thingy91x/nrf9151/ns
     tags: ci_build
-  app.build.memfault:
-    build_only: true
-    sysbuild: true
-    integration_platforms:
-      - thingy91x/nrf9151/ns
-    platform_allow:
-      - thingy91x/nrf9151/ns
-    extra_configs:
-      - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
-    extra_args: EXTRA_CONF_FILE="overlay-memfault.conf;overlay-modemtrace-to-memfault.conf;overlay-etb.conf"
-    tags: ci_build
-  app.build.bootloader_update:
-    build_only: true
-    sysbuild: true
-    integration_platforms:
-      - thingy91x/nrf9151/ns
-    platform_allow:
-      - thingy91x/nrf9151/ns
-    tags: ci_build
-    extra_args:
-      - mcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3
-      - CONFIG_BUILD_S1_VARIANT=y
+  # app.build.memfault:
+  #   build_only: true
+  #   sysbuild: true
+  #   integration_platforms:
+  #     - thingy91x/nrf9151/ns
+  #   platform_allow:
+  #     - thingy91x/nrf9151/ns
+  #   extra_configs:
+  #     - CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
+  #   extra_args: EXTRA_CONF_FILE="overlay-memfault.conf;overlay-modemtrace-to-memfault.conf;overlay-etb.conf"
+  #   tags: ci_build
+  # app.build.bootloader_update:
+  #   build_only: true
+  #   sysbuild: true
+  #   integration_platforms:
+  #     - thingy91x/nrf9151/ns
+  #   platform_allow:
+  #     - thingy91x/nrf9151/ns
+  #   tags: ci_build
+  #   extra_args:
+  #     - mcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3
+  #     - CONFIG_BUILD_S1_VARIANT=y

tests/module/README.md

@@ -0,0 +1,33 @@
+# Assert Tracker Template Unit Tests on native sim
+
+## Run tests locally
+
+### Setup docker
+```shell
+cd <path_to_att_dir>
+docker run --rm -it \
+  --privileged \
+  -e BUILD_WRAPPER_OUT_DIR=build_wrapper_output_directory \
+  -e CMAKE_PREFIX_PATH=/opt/toolchains \
+  -v .:/work/asset-tracker-template \
+  ghcr.io/zephyrproject-rtos/ci:v0.27.4 \
+  /bin/bash
+```
+
+### Commmands
+```shell
+cd work/asset-tracker-template/
+west init -l .
+west config manifest.group-filter +bsec
+west config build.sysbuild True
+west update -o=--depth=1 -n
+west blobs fetch hal_nordic
+
+cd ..
+pip install -r nrf/scripts/requirements-build.txt
+apt-get update
+apt install -y curl ruby-full
+
+cd asset-tracker-template/
+west twister -T . -C --coverage-platform=native_sim -v --inline-logs --integration
+```

tests/module/app/CMakeLists.txt

@@ -17,17 +17,39 @@ target_sources(app
   src/checks.c
   ../../../app/src/modules/app/app.c
   ../../../app/src/common/message_channel.c
+  ../../../app/src/modules/cloud/cloud_module.c
 )
 
 target_include_directories(app PRIVATE src)
 
 zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/)
 zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
 zephyr_include_directories(../../../app/src/common)
+zephyr_include_directories(../../../app/src/modules/cloud)
+zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/include)
+zephyr_include_directories(${NRF_DIR}/../modules/lib/cjson)
+
+target_link_options(app PRIVATE --whole-archive)
+
 
 # Options that cannot be passed through Kconfig fragments
 target_compile_definitions(app PRIVATE
 	-DCONFIG_APP_LOG_LEVEL=4
 	-DCONFIG_APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE=100
 	-DCONFIG_APP_MODULE_TRIGGER_TIMEOUT_SECONDS=600
+	-DCONFIG_APP_CLOUD_LOG_LEVEL=0
+	-DCONFIG_APP_CLOUD_THREAD_STACK_SIZE=2048
+	-DCONFIG_APP_CLOUD_MESSAGE_QUEUE_SIZE=5
+	-DCONFIG_APP_CLOUD_EXEC_TIME_SECONDS_MAX=1
+	-DCONFIG_APP_CLOUD_WATCHDOG_TIMEOUT_SECONDS=2
+	-DCONFIG_APP_CLOUD_BACKOFF_TYPE_LINEAR=1
+	-DCONFIG_APP_CLOUD_BACKOFF_INITIAL_SECONDS=6
+	-DCONFIG_APP_CLOUD_BACKOFF_LINEAR_INCREMENT_SECONDS=6
+	-DCONFIG_APP_CLOUD_BACKOFF_MAX_SECONDS=36
+	-DCONFIG_APP_NETWORK_SAMPLE_NETWORK_QUALITY=1
+	-DCONFIG_LTE_LC_CONN_EVAL_MODULE=1
+	-DCONFIG_LTE_LC_EDRX_MODULE=1
+	-DCONFIG_LTE_LC_PSM_MODULE=1
+	-DCONFIG_APP_MODULE_RECV_BUFFER_SIZE=1024
+	-DCOAP_CONTENT_FORMAT_APP_JSON=50
 )

tests/module/app/VERSION

@@ -0,0 +1,6 @@
+# Do not modify, will be overwritten by release workflow.
+VERSION_MAJOR = 0
+VERSION_MINOR = 0
+PATCHLEVEL = 0
+VERSION_TWEAK = 0
+EXTRAVERSION = dev

tests/module/app/src/main.c

@@ -25,6 +25,15 @@ FAKE_VALUE_FUNC(int, dk_buttons_init, button_handler_t);
 FAKE_VALUE_FUNC(int, task_wdt_feed, int);
 FAKE_VALUE_FUNC(int, task_wdt_add, uint32_t, task_wdt_callback_t, void *);
 FAKE_VOID_FUNC(date_time_register_handler, date_time_evt_handler_t);
+FAKE_VALUE_FUNC(int, nrf_cloud_client_id_get, char *, size_t);
+FAKE_VALUE_FUNC(int, nrf_cloud_coap_init);
+FAKE_VALUE_FUNC(int, nrf_cloud_coap_connect, const char * const);
+FAKE_VALUE_FUNC(int, nrf_cloud_coap_disconnect);
+FAKE_VALUE_FUNC(int, nrf_cloud_coap_shadow_device_status_update);
+FAKE_VALUE_FUNC(int, nrf_cloud_coap_bytes_send, uint8_t *, size_t, bool);
+FAKE_VALUE_FUNC(int, nrf_cloud_coap_sensor_send, const char *, double, int64_t, bool);
+FAKE_VALUE_FUNC(int, nrf_cloud_coap_json_message_send, const char *, bool, bool);
+FAKE_VALUE_FUNC(int, nrf_cloud_coap_shadow_get, char *, size_t *, bool, int);
 
 LOG_MODULE_REGISTER(trigger_module_test, 4);
 

tests/module/app/testcase.yaml

@@ -5,3 +5,4 @@ tests:
       - native_sim/native/64
     integration_platforms:
       - native_sim
+    timeout: 120

tests/module/battery/CMakeLists.txt

@@ -27,6 +27,7 @@ zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/)
 zephyr_include_directories(${ZEPHYR_NRFXLIB_MODULE_DIR}/nrf_fuel_gauge/include/)
 zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
 zephyr_include_directories(${ASSET_TRACKER_TEMPLATE_DIR}/app/src/common)
+zephyr_include_directories(${ASSET_TRACKER_TEMPLATE_DIR}/app/src/modules/cloud)
 
 # Options that cannot be passed through Kconfig fragments
 target_compile_definitions(app PRIVATE

tests/module/battery/src/redef.c

@@ -12,7 +12,8 @@ static int sample_fetch(const struct device *dev, enum sensor_channel chan)
 	return 0;
 }
 
-static int channel_get(const struct device *dev, enum sensor_channel chan)
+static int channel_get(const struct device *dev, enum sensor_channel chan,
+		      struct sensor_value *val)
 {
 	return 0;
 }

tests/module/battery/testcase.yaml

@@ -1,5 +1,5 @@
 tests:
-  asset_tracker_template.fw.trigger:
+  asset_tracker_template.fw.battery:
     platform_allow:
       - native_sim
       - native_sim/native/64

tests/module/button/CMakeLists.txt

@@ -21,33 +21,11 @@ target_sources(app
 zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/)
 zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
 zephyr_include_directories(../../../app/src/common)
-
+zephyr_include_directories(../../../app/src/modules/cloud)
 
 target_link_options(app PRIVATE --whole-archive)
 # Options that cannot be passed through Kconfig fragments
 target_compile_definitions(app PRIVATE
 	-DCONFIG_APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE=100
   -DCONFIG_APP_BUTTON_LOG_LEVEL=4
 )
-
-# generate encoder code using zcbor
-set(zcbor_command
-	zcbor code # Invoke code generation
-	--cddl ${ZEPHYR_BASE}/subsys/net/lib/lwm2m/lwm2m_senml_cbor.cddl
-	--cddl ${APPLICATION_SOURCE_DIR}/../../../app/src/modules/button/button_object.cddl
-	--encode # Generate encoding functions
-	--decode # Generate encoding functions
-	--short-names # Attempt to make generated symbol names shorter (at the risk of collision)
-	-t button-object # Create a public API for decoding/encoding the "button-object" type from the cddl file
-	--output-cmake button_object.cmake # The generated cmake file will be placed here
-)
-execute_process(COMMAND ${zcbor_command}
-				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-				COMMAND_ERROR_IS_FATAL ANY)
-
-# Include the cmake file generated by zcbor. It adds the
-# generated code and the necessary zcbor C code files.
-include(${CMAKE_CURRENT_BINARY_DIR}/button_object.cmake)
-
-zephyr_link_libraries(button_object)
-target_link_libraries(button_object PRIVATE zephyr_interface)

tests/module/button/src/main.c

@@ -11,17 +11,15 @@
 
 #include "message_channel.h"
 
-#include "zcbor_decode.h"
-#include "button_object_decode.h"
 #include <dk_buttons_and_leds.h>
 #include <date_time.h>
 
 DEFINE_FFF_GLOBALS;
 
 LOG_MODULE_REGISTER(button_module_test, 4);
 
-ZBUS_MSG_SUBSCRIBER_DEFINE(transport);
-ZBUS_CHAN_ADD_OBS(PAYLOAD_CHAN, transport, 0);
+ZBUS_MSG_SUBSCRIBER_DEFINE(button_subscriber);
+ZBUS_CHAN_ADD_OBS(BUTTON_CHAN, button_subscriber, 0);
 
 #define FAKE_TIME_MS 1716552398505
 
@@ -42,10 +40,10 @@ int dk_buttons_init(button_handler_t _button_handler)
 void tearDown(void)
 {
 	const struct zbus_channel *chan;
-	static struct payload received_payload;
+	uint8_t button_number;
 	int err;
 
-	err = zbus_sub_wait_msg(&transport, &chan, &received_payload, K_MSEC(1000));
+	err = zbus_sub_wait_msg(&button_subscriber, &chan, &button_number, K_MSEC(1000));
 	if (err == 0) {
 		LOG_ERR("Unhandled message in payload channel");
 		TEST_FAIL();
@@ -55,16 +53,15 @@ void tearDown(void)
 void test_button_trigger(void)
 {
 	const struct zbus_channel *chan;
-	static struct payload received_payload;
-	struct button_object button_obj = { 0 };
+	uint8_t button_number;
 	int err;
 
 	TEST_ASSERT_NOT_NULL(button_handler);
 	button_handler(DK_BTN1_MSK, DK_BTN1_MSK);
 
-	err = zbus_sub_wait_msg(&transport, &chan, &received_payload, K_MSEC(1000));
+	err = zbus_sub_wait_msg(&button_subscriber, &chan, &button_number, K_MSEC(1000));
 	if (err == -ENOMSG) {
-		LOG_ERR("No payload message received");
+		LOG_ERR("No BUTTON_CHAN message received");
 		TEST_FAIL();
 	} else if (err) {
 		LOG_ERR("zbus_sub_wait, error: %d", err);
@@ -73,21 +70,11 @@ void test_button_trigger(void)
 		return;
 	}
 
-	/* check if chan is payload channel */
-	if (chan != &PAYLOAD_CHAN) {
+	/* check if chan is button channel */
+	if (chan != &BUTTON_CHAN) {
 		LOG_ERR("Received message from wrong channel");
 		TEST_FAIL();
 	}
-
-	/* decode payload */
-	err = cbor_decode_button_object(received_payload.buffer,
-				  received_payload.buffer_len,
-				  &button_obj,
-				  NULL);
-	if (err != ZCBOR_SUCCESS) {
-		LOG_ERR("Failed to decode payload");
-		TEST_FAIL();
-	}
 }
 
 /* This is required to be added to each test. That is because unity's

tests/module/environmental/CMakeLists.txt

@@ -21,7 +21,7 @@ target_sources(app
 zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/)
 zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
 zephyr_include_directories(../../../app/src/common)
-
+zephyr_include_directories(../../../app/src/modules/cloud)
 
 target_link_options(app PRIVATE --whole-archive)
 # Options that cannot be passed through Kconfig fragments
@@ -33,25 +33,3 @@ target_compile_definitions(app PRIVATE
 	-DCONFIG_APP_ENVIRONMENTAL_EXEC_TIME_SECONDS_MAX=1
 	-DCONFIG_APP_ENVIRONMENTAL_WATCHDOG_TIMEOUT_SECONDS=2
 )
-
-# generate encoder code using zcbor
-set(zcbor_command
-	zcbor code # Invoke code generation
-	--cddl ${ZEPHYR_BASE}/subsys/net/lib/lwm2m/lwm2m_senml_cbor.cddl
-	--cddl ${APPLICATION_SOURCE_DIR}/../../../app/src/modules/environmental/env_object.cddl
-	--encode # Generate encoding functions
-	--decode # Generate decoding functions
-	--short-names # Attempt to make generated symbol names shorter (at the risk of collision)
-	-t env-object # Create a public API for decoding/encoding the "env-object" type from the cddl file
-	--output-cmake env_object.cmake # The generated cmake file will be placed here
-)
-execute_process(COMMAND ${zcbor_command}
-				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-				COMMAND_ERROR_IS_FATAL ANY)
-
-# Include the cmake file generated by zcbor. It adds the
-# generated code and the necessary zcbor C code files.
-include(${CMAKE_CURRENT_BINARY_DIR}/env_object.cmake)
-
-zephyr_link_libraries(env_object)
-target_link_libraries(env_object PRIVATE zephyr_interface)