Skip to content

Commit a068293

Browse files
nordic-krchkartben
nordic-krch
authored and
kartben
committed
tests: drivers: Fix zassert string
Fix wrong parameter used in zassert macros. Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent 96e2f8b commit a068293

File tree

34 files changed

+148
-145
lines changed

34 files changed

+148
-145
lines changed

‎tests/drivers/bbram/emul/src/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ZTEST(bbram, test_read_write)
4747
/* Set and verify content. */
4848
zassert_ok(bbram_write(dev, 0, BBRAM_SIZE, expected));
4949
zassert_ok(bbram_read(dev, 0, BBRAM_SIZE, buffer));
50-
zassert_mem_equal(buffer, expected, BBRAM_SIZE, NULL);
50+
zassert_mem_equal(buffer, expected, BBRAM_SIZE);
5151
}
5252

5353
ZTEST(bbram, test_set_invalid)

‎tests/drivers/can/api/src/canfd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ ZTEST_USER(canfd, test_invalid_sample_point)
484484
int err;
485485

486486
err = can_calc_timing_data(can_dev, &timing, TEST_BITRATE_3, 1000);
487-
zassert_equal(err, -EINVAL, "invalid sample point of 100.0% accepted (err %d)", err);
487+
zassert_equal(err, -EINVAL, "invalid sample point of 100.0%% accepted (err %d)", err);
488488
}
489489

490490
/**

‎tests/drivers/can/api/src/classic.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ ZTEST_USER(can_classic, test_invalid_sample_point)
538538
int err;
539539

540540
err = can_calc_timing(can_dev, &timing, TEST_BITRATE_1, 1000);
541-
zassert_equal(err, -EINVAL, "invalid sample point of 100.0% accepted (err %d)", err);
541+
zassert_equal(err, -EINVAL, "invalid sample point of 100.0%% accepted (err %d)", err);
542542
}
543543

544544
/**

‎tests/drivers/clock_control/stm32_clock_configuration/stm32_common_core/src/test_stm32_clock_configuration.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ ZTEST(stm32_sysclck_config, test_sysclk_src)
3838
#if STM32_SYSCLK_SRC_PLL
3939
zassert_equal(RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src,
4040
"Expected sysclk src: PLL (0x%x). Actual: 0x%x",
41-
RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src);
41+
(int)RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src);
4242
#elif STM32_SYSCLK_SRC_HSE
4343
zassert_equal(RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src,
4444
"Expected sysclk src: HSE (0x%x). Actual: 0x%x",
45-
RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src);
45+
(int)RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src);
4646
#elif STM32_SYSCLK_SRC_HSI
4747
zassert_equal(RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src,
4848
"Expected sysclk src: HSI (0x%x). Actual: 0x%x",
49-
RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src);
49+
(int)RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src);
5050
#elif STM32_SYSCLK_SRC_MSI
5151
zassert_equal(RCC_SYSCLKSOURCE_STATUS_MSI, sys_clk_src,
5252
"Expected sysclk src: MSI (0x%x). Actual: 0x%x",
53-
RCC_SYSCLKSOURCE_STATUS_MSI, sys_clk_src);
53+
(int)RCC_SYSCLKSOURCE_STATUS_MSI, sys_clk_src);
5454
#else
5555
/* Case not expected */
5656
zassert_true((STM32_SYSCLK_SRC_PLL ||
@@ -69,21 +69,21 @@ ZTEST(stm32_sysclck_config, test_pll_src)
6969
#if STM32_PLL_SRC_HSE
7070
zassert_equal(RCC_PLLSOURCE_HSE, pll_src,
7171
"Expected PLL src: HSE (%d). Actual PLL src: %d",
72-
RCC_PLLSOURCE_HSE, pll_src);
72+
(uint32_t)RCC_PLLSOURCE_HSE, pll_src);
7373
#elif STM32_PLL_SRC_HSI
7474
#if defined(CONFIG_SOC_SERIES_STM32F1X)
7575
zassert_equal(RCC_PLLSOURCE_HSI_DIV2, pll_src,
7676
"Expected PLL src: HSI (%d). Actual PLL src: %d",
77-
RCC_PLLSOURCE_HSI_DIV2, pll_src);
77+
(uint32_t)RCC_PLLSOURCE_HSI_DIV2, pll_src);
7878
#else
7979
zassert_equal(RCC_PLLSOURCE_HSI, pll_src,
8080
"Expected PLL src: HSI (%d). Actual PLL src: %d",
81-
RCC_PLLSOURCE_HSI, pll_src);
81+
(uint32_t)RCC_PLLSOURCE_HSI, pll_src);
8282
#endif /* CONFIG_SOC_SERIES_STM32F1X */
8383
#elif STM32_PLL_SRC_MSI
8484
zassert_equal(RCC_PLLSOURCE_MSI, pll_src,
8585
"Expected PLL src: MSI (%d). Actual PLL src: %d",
86-
RCC_PLLSOURCE_MSI, pll_src);
86+
(uint32_t)RCC_PLLSOURCE_MSI, pll_src);
8787
#else /* --> RCC_PLLSOURCE_NONE */
8888
#if defined(CONFIG_SOC_SERIES_STM32L0X) || defined(CONFIG_SOC_SERIES_STM32L1X) || \
8989
defined(CONFIG_SOC_SERIES_STM32F0X) || defined(CONFIG_SOC_SERIES_STM32F1X) || \

‎tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_adc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ ZTEST(stm32_common_devices_clocks, test_adc_clk_config)
9696
switch (pclken[1].bus) {
9797
case STM32_SRC_SYSCLK:
9898
zassert_equal(dev_actual_clk_src, ADC_SOURCE_SYSCLK,
99-
"Expected ADC1 src: SYSCLK (0x%lx). Actual ADC1 src: 0x%x",
100-
ADC_SOURCE_SYSCLK, dev_actual_clk_src);
99+
"Expected ADC1 src: SYSCLK (0x%x). Actual ADC1 src: 0x%x",
100+
(uint32_t)ADC_SOURCE_SYSCLK, dev_actual_clk_src);
101101
break;
102102
#if defined(STM32_SRC_PLL_P)
103103
case STM32_SRC_PLL_P:
104104
zassert_equal(dev_actual_clk_src, ADC_SOURCE_PLL,
105-
"Expected ADC1 src: PLL (0x%lx). Actual ADC1 src: 0x%x",
106-
ADC_SOURCE_PLL, dev_actual_clk_src);
105+
"Expected ADC1 src: PLL (0x%x). Actual ADC1 src: 0x%x",
106+
(uint32_t)ADC_SOURCE_PLL, dev_actual_clk_src);
107107
break;
108108
#endif /* STM32_SRC_PLL_P */
109109
default:

‎tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_i2c.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ static void i2c_set_clock(const struct stm32_pclken *clk)
4242

4343
if (clk->bus == STM32_SRC_HSI) {
4444
zassert_equal(dev_actual_clk_src, RCC_I2C1CLKSOURCE_HSI,
45-
"Expected I2C src: HSI (0x%lx). Actual I2C src: 0x%x",
46-
RCC_I2C1CLKSOURCE_HSI, dev_actual_clk_src);
45+
"Expected I2C src: HSI (0x%x). Actual I2C src: 0x%x",
46+
(uint32_t)RCC_I2C1CLKSOURCE_HSI, dev_actual_clk_src);
4747
} else if (clk->bus == STM32_SRC_SYSCLK) {
4848
zassert_equal(dev_actual_clk_src, RCC_I2C1CLKSOURCE_SYSCLK,
49-
"Expected I2C src: SYSCLK (0x%lx). Actual I2C src: 0x%x",
50-
RCC_I2C1CLKSOURCE_SYSCLK, dev_actual_clk_src);
49+
"Expected I2C src: SYSCLK (0x%x). Actual I2C src: 0x%x",
50+
(uint32_t)RCC_I2C1CLKSOURCE_SYSCLK, dev_actual_clk_src);
5151
} else {
5252
zassert_true(0, "Unexpected domain clk (0x%x)", dev_actual_clk_src);
5353
}

‎tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_lptim.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ ZTEST(stm32_common_devices_clocks, test_lptim_clk_config)
5050

5151
if (pclken[1].bus == STM32_SRC_LSE) {
5252
zassert_equal(dev_actual_clk_src, RCC_LPTIM1CLKSOURCE_LSE,
53-
"Expected LPTIM1 src: LSE (0x%lx). Actual LPTIM1 src: 0x%x",
54-
RCC_LPTIM1CLKSOURCE_LSE, dev_actual_clk_src);
53+
"Expected LPTIM1 src: LSE (0x%x). Actual LPTIM1 src: 0x%x",
54+
(uint32_t)RCC_LPTIM1CLKSOURCE_LSE, dev_actual_clk_src);
5555
} else if (pclken[1].bus == STM32_SRC_LSI) {
5656
zassert_equal(dev_actual_clk_src, RCC_LPTIM1CLKSOURCE_LSI,
57-
"Expected LPTIM1 src: LSI (0x%lx). Actual LPTIM1 src: 0x%x",
58-
RCC_LPTIM1CLKSOURCE_LSI, dev_actual_clk_src);
57+
"Expected LPTIM1 src: LSI (0x%x). Actual LPTIM1 src: 0x%x",
58+
(uint32_t)RCC_LPTIM1CLKSOURCE_LSI, dev_actual_clk_src);
5959
} else {
6060
zassert_true(0, "Unexpected domain clk (%d)", dev_actual_clk_src);
6161
}

‎tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/src/test_stm32_clock_configuration_sdmmc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ ZTEST(stm32_common_devices_clocks, test_sdmmc_clk_config)
6565

6666
if (pclken[1].bus == STM32_SRC_CK48) {
6767
zassert_equal(dev_actual_clk_src, RCC_SDIOCLKSOURCE_CLK48,
68-
"Expected SDMMC src: CLK 48 (0x%lx). Actual src: 0x%x",
68+
"Expected SDMMC src: CLK 48 (0x%x). Actual src: 0x%x",
6969
RCC_SDIOCLKSOURCE_CLK48, dev_actual_clk_src);
7070
} else if (pclken[1].bus == STM32_SRC_SYSCLK) {
7171
zassert_equal(dev_actual_clk_src, RCC_SDIOCLKSOURCE_SYSCLK,
72-
"Expected SDMMC src: SYSCLK (0x%lx). Actual src: 0x%x",
72+
"Expected SDMMC src: SYSCLK (0x%x). Actual src: 0x%x",
7373
RCC_SDIOCLKSOURCE_SYSCLK, dev_actual_clk_src);
7474
} else {
7575
zassert_true(0, "Unexpected domain clk (0x%x)", dev_actual_clk_src);

‎tests/drivers/clock_control/stm32_clock_configuration/stm32h5_core/src/test_stm32_clock_configuration.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ ZTEST(stm32_syclck_config, test_sysclk_src)
2929
#if STM32_SYSCLK_SRC_PLL
3030
zassert_equal(RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src,
3131
"Expected sysclk src: PLL1 (0x%x). Actual: 0x%x",
32-
RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src);
32+
(int)RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src);
3333
#elif STM32_SYSCLK_SRC_HSE
3434
zassert_equal(RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src,
3535
"Expected sysclk src: HSE (0x%x). Actual: 0x%x",
36-
RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src);
36+
(int)RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src);
3737
#elif STM32_SYSCLK_SRC_HSI
3838
zassert_equal(RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src,
3939
"Expected sysclk src: HSI (0x%x). Actual: 0x%x",
40-
RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src);
40+
(int)RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src);
4141
#elif STM32_SYSCLK_SRC_CSI
4242
zassert_equal(RCC_SYSCLKSOURCE_STATUS_CSI, sys_clk_src,
4343
"Expected sysclk src: MSI (0x%x). Actual: 0x%x",
44-
RCC_SYSCLKSOURCE_STATUS_CSI, sys_clk_src);
44+
(int)RCC_SYSCLKSOURCE_STATUS_CSI, sys_clk_src);
4545
#else
4646
/* Case not expected */
4747
zassert_true((STM32_SYSCLK_SRC_PLL ||

‎tests/drivers/clock_control/stm32_clock_configuration/stm32h7_core/src/test_stm32_clock_configuration.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ ZTEST(stm32_syclck_config, test_sysclk_src)
2929
#if STM32_SYSCLK_SRC_PLL
3030
zassert_equal(RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src,
3131
"Expected sysclk src: PLL (0x%x). Actual: 0x%x",
32-
RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src);
32+
(uint32_t)RCC_SYSCLKSOURCE_STATUS_PLLCLK, sys_clk_src);
3333
#elif STM32_SYSCLK_SRC_HSE
3434
zassert_equal(RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src,
3535
"Expected sysclk src: HSE (0x%x). Actual: 0x%x",
36-
RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src);
36+
(uint32_t)RCC_SYSCLKSOURCE_STATUS_HSE, sys_clk_src);
3737
#elif STM32_SYSCLK_SRC_HSI
3838
zassert_equal(RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src,
3939
"Expected sysclk src: HSI (0x%x). Actual: 0x%x",
40-
RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src);
40+
(uint32_t)RCC_SYSCLKSOURCE_STATUS_HSI, sys_clk_src);
4141
#elif STM32_SYSCLK_SRC_CSI
4242
zassert_equal(RCC_SYSCLKSOURCE_STATUS_CSI, sys_clk_src,
4343
"Expected sysclk src: CSI (0x%x). Actual: 0x%x",
44-
RCC_SYSCLKSOURCE_STATUS_CSI, sys_clk_src);
44+
(uint32_t)RCC_SYSCLKSOURCE_STATUS_CSI, sys_clk_src);
4545
#else
4646
/* Case not expected */
4747
zassert_true((STM32_SYSCLK_SRC_PLL ||

0 commit comments

Comments
 (0)