From 967978a432e5cea87af34385e3a3fdda11c7c51f Mon Sep 17 00:00:00 2001
From: Henrik Brix Andersen <hebad@vestas.com>
Date: Tue, 29 Mar 2022 10:10:02 +0200
Subject: [PATCH] tests: drivers: can: move CAN utilities tests to correct
 location

Move the CAN utilities tests to the tests/drivers/can/ directory. The
tests/subsys/canbus directory is for tests related to code located in
subsys/canbus.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
---
 .../can/utilities}/CMakeLists.txt                |  2 +-
 .../frame => drivers/can/utilities}/prj.conf     |  0
 .../frame => drivers/can/utilities}/src/main.c   | 16 +++++-----------
 tests/drivers/can/utilities/testcase.yaml        |  3 +++
 tests/subsys/canbus/frame/testcase.yaml          |  5 -----
 5 files changed, 9 insertions(+), 17 deletions(-)
 rename tests/{subsys/canbus/frame => drivers/can/utilities}/CMakeLists.txt (90%)
 rename tests/{subsys/canbus/frame => drivers/can/utilities}/prj.conf (100%)
 rename tests/{subsys/canbus/frame => drivers/can/utilities}/src/main.c (94%)
 create mode 100644 tests/drivers/can/utilities/testcase.yaml
 delete mode 100644 tests/subsys/canbus/frame/testcase.yaml

diff --git a/tests/subsys/canbus/frame/CMakeLists.txt b/tests/drivers/can/utilities/CMakeLists.txt
similarity index 90%
rename from tests/subsys/canbus/frame/CMakeLists.txt
rename to tests/drivers/can/utilities/CMakeLists.txt
index d405d213045..c1df85fb052 100644
--- a/tests/subsys/canbus/frame/CMakeLists.txt
+++ b/tests/drivers/can/utilities/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(can_frame)
+project(can_utilities)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/tests/subsys/canbus/frame/prj.conf b/tests/drivers/can/utilities/prj.conf
similarity index 100%
rename from tests/subsys/canbus/frame/prj.conf
rename to tests/drivers/can/utilities/prj.conf
diff --git a/tests/subsys/canbus/frame/src/main.c b/tests/drivers/can/utilities/src/main.c
similarity index 94%
rename from tests/subsys/canbus/frame/src/main.c
rename to tests/drivers/can/utilities/src/main.c
index 47182c34c95..78419ad5eef 100644
--- a/tests/subsys/canbus/frame/src/main.c
+++ b/tests/drivers/can/utilities/src/main.c
@@ -1,21 +1,15 @@
-/* main.c - Application main entry point */
-
 /*
  * Copyright (c) 2019 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
-LOG_MODULE_REGISTER(can_test, LOG_LEVEL_ERR);
-
-#include <zephyr/types.h>
-#include <stddef.h>
-#include <string.h>
 #include <drivers/can.h>
-
+#include <logging/log.h>
 #include <ztest.h>
 
+LOG_MODULE_REGISTER(can_utilities, LOG_LEVEL_ERR);
+
 static void test_can_frame_to_zcan_frame(void)
 {
 	struct can_frame frame = { 0 };
@@ -137,11 +131,11 @@ static void test_zcan_filter_to_can_filter(void)
 
 void test_main(void)
 {
-	ztest_test_suite(test_can_frame,
+	ztest_test_suite(can_utilities_tests,
 			 ztest_unit_test(test_can_frame_to_zcan_frame),
 			 ztest_unit_test(test_zcan_frame_to_can_frame),
 			 ztest_unit_test(test_can_filter_to_zcan_filter),
 			 ztest_unit_test(test_zcan_filter_to_can_filter));
 
-	ztest_run_test_suite(test_can_frame);
+	ztest_run_test_suite(can_utilities_tests);
 }
diff --git a/tests/drivers/can/utilities/testcase.yaml b/tests/drivers/can/utilities/testcase.yaml
new file mode 100644
index 00000000000..c8b25d04486
--- /dev/null
+++ b/tests/drivers/can/utilities/testcase.yaml
@@ -0,0 +1,3 @@
+tests:
+  drivers.can.utilities:
+    tags: drivers can
diff --git a/tests/subsys/canbus/frame/testcase.yaml b/tests/subsys/canbus/frame/testcase.yaml
deleted file mode 100644
index 876c75b4ee6..00000000000
--- a/tests/subsys/canbus/frame/testcase.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-common:
-  platform_allow: native_posix native_posix_64 qemu_x86 qemu_cortex_m3 qemu_leon3 qemu_riscv32 qemu_riscv64
-tests:
-  can.frame:
-    tags: net