Commit 8799ab1e authored by Rubin Gerritsen's avatar Rubin Gerritsen Committed by Alberto Escolar
Browse files

test: Apply semantic patch file ztest_strcmp.cocci 



This patch file updates the use of assertion macros
comparing strings.

Command line used:
```
./scripts/coccicheck --mode=patch \
--cocci=scripts/coccinelle/ztest_strcmp.cocci tests/
```

Signed-off-by: default avatarRubin Gerritsen <rubin.gerritsen@nordicsemi.no>
parent 470a0fca

tests/drivers/sensor/generic/src/dummy_sensor.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int dummy_sensor_init(const struct device *dev) 
	const struct device *i2c = device_get_binding(config->i2c_name);



	/* Bus and address should be configured. */

	zassert_equal(strcmp(config->i2c_name, "dummy I2C"), 0);

	zassert_str_equal(config->i2c_name, "dummy I2C");

	zassert_equal(config->i2c_address, 123);



	if (i2c != NULL) {

tests/kernel/common/src/printk.c

+2 −2
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ ZTEST(printk, test_printk) 
	pk_console[pos] = '\0';

	__printk_hook_install(_old_char_out);

	printk("expected '%s'\n", expected);

	zassert_true((strcmp(pk_console, expected) == 0), "printk failed");

	zassert_str_equal(pk_console, expected, "printk failed");



	(void)memset(pk_console, 0, sizeof(pk_console));

	count = 0;
@@ -251,7 +251,7 @@ ZTEST(printk, test_printk) 
	count += snprintk(pk_console + count, sizeof(pk_console) - count,

			  "0x%x %p %-2p\n", hex, ptr, (char *)42);

	pk_console[count] = '\0';

	zassert_true((strcmp(pk_console, expected) == 0), "snprintk failed");

	zassert_str_equal(pk_console, expected, "snprintk failed");

}



extern void *common_setup(void);

tests/kernel/threads/thread_apis/src/test_kthread_for_each.c

+11 −11
Original line number Diff line number Diff line
@@ -228,44 +228,44 @@ ZTEST(threads_lifecycle_1cpu, test_k_thread_state_str) 


	tid->base.thread_state = 0;

	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "") == 0);

	zassert_str_equal(str, "");



	tid->base.thread_state = _THREAD_DUMMY;



	str = k_thread_state_str(tid, NULL, sizeof(state_str));

	zassert_true(strcmp(str, "") == 0);

	zassert_str_equal(str, "");



	str = k_thread_state_str(tid, state_str, 0);

	zassert_true(strcmp(str, "") == 0);

	zassert_str_equal(str, "");



	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "dummy") == 0);

	zassert_str_equal(str, "dummy");



	tid->base.thread_state = _THREAD_PENDING;

	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "pending") == 0);

	zassert_str_equal(str, "pending");



	tid->base.thread_state = _THREAD_PRESTART;

	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "prestart") == 0);

	zassert_str_equal(str, "prestart");



	tid->base.thread_state = _THREAD_DEAD;

	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "dead") == 0);

	zassert_str_equal(str, "dead");



	tid->base.thread_state = _THREAD_SUSPENDED;

	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "suspended") == 0);

	zassert_str_equal(str, "suspended");



	tid->base.thread_state = _THREAD_ABORTING;

	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "aborting") == 0);

	zassert_str_equal(str, "aborting");



	tid->base.thread_state = _THREAD_QUEUED;

	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "queued") == 0);

	zassert_str_equal(str, "queued");



	tid->base.thread_state = _THREAD_PENDING | _THREAD_SUSPENDED;

	str = k_thread_state_str(tid, state_str, sizeof(state_str));

	zassert_true(strcmp(str, "pending+suspended") == 0);

	zassert_str_equal(str, "pending+suspended");

}

tests/kernel/threads/thread_apis/src/test_threads_suspend_resume.c

+4 −4
Original line number Diff line number Diff line
@@ -165,19 +165,19 @@ ZTEST(threads_lifecycle, test_resume_unsuspend_thread) 


	/* Resume an unsuspend thread will not change the thread state. */

	str = k_thread_state_str(tid, buffer, sizeof(buffer));

	zassert_true(strcmp(str, "queued") == 0);

	zassert_str_equal(str, "queued");

	k_thread_resume(tid);

	str = k_thread_state_str(tid, buffer, sizeof(buffer));

	zassert_true(strcmp(str, "queued") == 0);

	zassert_str_equal(str, "queued");



	/* suspend created thread */

	k_thread_suspend(tid);

	str = k_thread_state_str(tid, buffer, sizeof(buffer));

	zassert_true(strcmp(str, "suspended") == 0);

	zassert_str_equal(str, "suspended");



	/* Resume an suspend thread will make it to be next eligible.*/

	k_thread_resume(tid);

	str = k_thread_state_str(tid, buffer, sizeof(buffer));

	zassert_true(strcmp(str, "queued") == 0);

	zassert_str_equal(str, "queued");

	k_thread_abort(tid);

}

tests/kernel/workq/work/src/main.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static void test_queue_start(void) 


		zassert_true(tn != cfg.name);

		zassert_true(tn != NULL);

		zassert_equal(strcmp(tn, cfg.name), 0);

		zassert_str_equal(tn, cfg.name);

	}



	cfg.name = NULL;
@@ -251,7 +251,7 @@ static void test_queue_start(void) 


		zassert_true(tn != cfg.name);

		zassert_true(tn != NULL);

		zassert_equal(strcmp(tn, ""), 0);

		zassert_str_equal(tn, "");

	}



	cfg.name = "wq.coophi";

CRA Git | Maintained and supported by SUSTech CRA and CCSE