tooling: Move tests into project root tests directory

We still support multiple profiles, but this makes it easier to support the cloe super-build and should also make it easier to develop and maintain tests.
eclipse · Jun 3, 2024 · b3ff8f1 · b3ff8f1
1 parent c50a223
commit b3ff8f1
Show file tree

Hide file tree

Showing 75 changed files with 647 additions and 408 deletions.
diff --git a/engine/tests/conanfile_with_server.py b/engine/tests/conanfile_with_server.py
diff --git a/engine/tests/conanfile_without_server.py b/engine/tests/conanfile_without_server.py
diff --git a/engine/tests/config_nop_infinite.json b/engine/tests/config_nop_infinite.json
diff --git a/engine/tests/config_nop_smoketest.json b/engine/tests/config_nop_smoketest.json
diff --git a/plugins/esmini/tests/conanfile_esmini.py b/plugins/esmini/tests/conanfile_esmini.py
diff --git a/plugins/esmini/tests/controller_virtue.json b/plugins/esmini/tests/controller_virtue.json
diff --git a/plugins/gndtruth_extractor/tests/conanfile_default.py b/plugins/gndtruth_extractor/tests/conanfile_default.py
diff --git a/plugins/minimator/tests/conanfile_default.py b/plugins/minimator/tests/conanfile_default.py
diff --git a/plugins/virtue/tests/conanfile_default.py b/plugins/virtue/tests/conanfile_default.py
diff --git a/plugins/esmini/tests/config_esmini_aeb.json → tests/config_esmini_aeb.json b/plugins/esmini/tests/config_esmini_aeb.json → tests/config_esmini_aeb.json
diff --git a/...mini/tests/config_esmini_closed_loop.json → tests/config_esmini_closed_loop.json b/...mini/tests/config_esmini_closed_loop.json → tests/config_esmini_closed_loop.json
@@ -27,7 +27,7 @@
           {
             "label": "Ego vehicle should reach stand-still.",
             "event": "default_speed/kmph=<0.2", "action": "succeed"
-          }      
+          }
         ]
       }
     }

diff --git a/...ns/esmini/tests/config_esmini_cut_in.json → tests/config_esmini_cut_in.json b/...ns/esmini/tests/config_esmini_cut_in.json → tests/config_esmini_cut_in.json
diff --git a/...esmini/tests/config_esmini_open_loop.json → tests/config_esmini_open_loop.json b/...esmini/tests/config_esmini_open_loop.json → tests/config_esmini_open_loop.json
diff --git a/...ator/tests/config_minimator_infinite.json → tests/config_minimator_infinite.json b/...ator/tests/config_minimator_infinite.json → tests/config_minimator_infinite.json
@@ -1,7 +1,7 @@
 {
   "version": "4",
   "include": [
-    "${CLOE_ROOT}/tests/controller_basic.json"
+    "just_controller_basic.json"
   ],
   "defaults": {
     "controllers": [

diff --git a/...onfig_minimator_multi_agent_infinite.json → ...onfig_minimator_multi_agent_infinite.json b/...onfig_minimator_multi_agent_infinite.json → ...onfig_minimator_multi_agent_infinite.json
diff --git a/...tor/tests/config_minimator_smoketest.json → tests/config_minimator_smoketest.json b/...tor/tests/config_minimator_smoketest.json → tests/config_minimator_smoketest.json
diff --git a/tests/config_nop_infinite.json b/tests/config_nop_infinite.json
@@ -1,8 +1,8 @@
 {
   "version": "4",
   "include": [
-    "controller_virtue.json",
-    "controller_basic.json"
+    "just_controller_virtue.json",
+    "just_controller_basic.json"
   ],
   "simulators": [
     {

diff --git a/tests/config_nop_smoketest.json b/tests/config_nop_smoketest.json
@@ -1,15 +1,12 @@
 {
   "version": "4",
-
   "include": [
     "config_nop_infinite.json"
   ],
-
   "server": {
     "listen": false,
     "listen_port": 23456
   },
-
   "triggers": [
     {"event": "virtue/failure", "action": "fail"},
     {

diff --git a/tests/controller_basic.json b/tests/controller_basic.json
diff --git a/...ns/esmini/tests/controller_basic_aeb.json → tests/controller_basic_aeb.json b/...ns/esmini/tests/controller_basic_aeb.json → tests/controller_basic_aeb.json
diff --git a/engine/tests/controller_basic.json → tests/just_controller_basic.json b/engine/tests/controller_basic.json → tests/just_controller_basic.json
diff --git a/engine/tests/controller_virtue.json → tests/just_controller_virtue.json b/engine/tests/controller_virtue.json → tests/just_controller_virtue.json
diff --git a/tests/debug_callgrind.json → tests/option_debug_callgrind.json b/tests/debug_callgrind.json → tests/option_debug_callgrind.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ @@
               {
                 "label": "Ego vehicle should reach stand-still.",
                 "event": "default_speed/kmph=<0.2", "action": "succeed"
-              }
+              }
             ]
           }
         }
@@ Expand Down @@