rename test suite name

rename and cleanup the testbed name
rename the cuj_tests as compound_tests

Bug: 333764163
Test: Build
Change-Id: I5e8db1b6c2cbd0b70b67edcb9f8c903c61b9f09e

14 files changed, 34 insertions, 210 deletions

diff --git a/tests/bettertogether/betocq/Android.bp b/tests/bettertogether/betocq/Android.bp
index 11a9afa5f..1da8a6f3c 100644
--- a/tests/bettertogether/betocq/Android.bp
+++ b/tests/bettertogether/betocq/Android.bp
@@ -88,9 +88,9 @@ python_library_host {
 }
 
 python_library_host {
-    name: "betocq_cuj_tests",
+    name: "betocq_compound_tests",
     defaults: ["betocq_lib_defaults"],
-    srcs: ["cuj_tests/*.py"],
+    srcs: ["compound_tests/*.py"],
     libs: [
         "betocq_lib",
         "d2d_performance_test_base",
@@ -124,20 +124,20 @@ python_library_host {
 // Test suites
 
 python_test_host {
-    name: "batch_all_performance_test_suite",
-    main: "batch_all_performance_test_suite.py",
-    srcs: ["batch_all_performance_test_suite.py"],
+    name: "betocq_test_suite",
+    main: "betocq_test_suite.py",
+    srcs: ["betocq_test_suite.py"],
     libs: [
         "base_betocq_suite",
-        "betocq_cuj_tests",
+        "betocq_compound_tests",
         "betocq_directed_tests",
         "betocq_function_tests",
         "betocq_lib",
         "mobly",
     ],
     data: [
-        "local_dev_testbed.yml",
-        // package the snippes for atest
+        "cuj_and_test_config_testbed.yml",
+        // package the snippets for atest
         ":nearby_snippet",
         ":nearby_snippet_2",
     ],
@@ -150,20 +150,20 @@ python_test_host {
 }
 
 python_test_host {
-    name: "batch_performance_testing_with_2g_ap_test_suite",
-    main: "batch_performance_testing_with_2g_ap_test_suite.py",
-    srcs: ["batch_performance_testing_with_2g_ap_test_suite.py"],
+    name: "betocq_2g_ap_test_suite",
+    main: "betocq_2g_ap_test_suite.py",
+    srcs: ["betocq_2g_ap_test_suite.py"],
     defaults: ["betocq_test_defaults"],
     libs: [
         "base_betocq_suite",
-        "betocq_cuj_tests",
+        "betocq_compound_tests",
         "betocq_directed_tests",
         "betocq_function_tests",
         "betocq_lib",
         "mobly",
     ],
     data: [
-        "local_dev_testbed.yml",
+        "cuj_and_test_config_testbed.yml",
         // package the snippes for atest
         ":nearby_snippet",
         ":nearby_snippet_2",
@@ -177,9 +177,9 @@ python_test_host {
 }
 
 python_test_host {
-    name: "batch_performance_testing_with_5g_ap_test_suite",
-    main: "batch_performance_testing_with_5g_ap_test_suite.py",
-    srcs: ["batch_performance_testing_with_5g_ap_test_suite.py"],
+    name: "betocq_5g_ap_test_suite",
+    main: "betocq_5g_ap_test_suite.py",
+    srcs: ["betocq_5g_ap_test_suite.py"],
     defaults: ["betocq_test_defaults"],
     libs: [
         "base_betocq_suite",
@@ -188,7 +188,7 @@ python_test_host {
         "mobly",
     ],
     data: [
-        "local_dev_testbed.yml",
+        "cuj_and_test_config_testbed.yml",
         // package the snippes for atest
         ":nearby_snippet",
         ":nearby_snippet_2",
@@ -202,19 +202,19 @@ python_test_host {
 }
 
 python_test_host {
-    name: "batch_performance_testing_with_dfs_5g_ap_test_suite",
-    main: "batch_performance_testing_with_dfs_5g_ap_test_suite.py",
-    srcs: ["batch_performance_testing_with_dfs_5g_ap_test_suite.py"],
+    name: "betocq_dfs_5g_ap_test_suite",
+    main: "betocq_dfs_5g_ap_test_suite.py",
+    srcs: ["betocq_dfs_5g_ap_test_suite.py"],
     defaults: ["betocq_test_defaults"],
     libs: [
         "base_betocq_suite",
-        "betocq_cuj_tests",
+        "betocq_compound_tests",
         "betocq_directed_tests",
         "betocq_lib",
         "mobly",
     ],
     data: [
-        "local_dev_testbed.yml",
+        "cuj_and_test_config_testbed.yml",
         // package the snippes for atest
         ":nearby_snippet",
         ":nearby_snippet_2",
diff --git a/tests/bettertogether/betocq/batch_performance_testing_with_2g_ap_test_suite.py b/tests/bettertogether/betocq/betocq_2g_ap_test_suite.py
index fd0767fbc..f455ce08c 100644
--- a/tests/bettertogether/betocq/batch_performance_testing_with_2g_ap_test_suite.py
+++ b/tests/bettertogether/betocq/betocq_2g_ap_test_suite.py
@@ -31,9 +31,9 @@ from mobly import suite_runner
 
 from betocq import base_betocq_suite
 from betocq import nc_constants
-from betocq.cuj_tests import mcc_5g_all_wifi_non_dbs_2g_sta_test
-from betocq.cuj_tests import scc_2g_all_wifi_sta_test
-from betocq.cuj_tests import scc_5g_all_wifi_dbs_2g_sta_test
+from betocq.compound_tests import mcc_5g_all_wifi_non_dbs_2g_sta_test
+from betocq.compound_tests import scc_2g_all_wifi_sta_test
+from betocq.compound_tests import scc_5g_all_wifi_dbs_2g_sta_test
 from betocq.directed_tests import ble_performance_test
 from betocq.directed_tests import bt_performance_test
 from betocq.directed_tests import mcc_5g_wfd_non_dbs_2g_sta_test
diff --git a/tests/bettertogether/betocq/batch_performance_testing_with_5g_ap_test_suite.py b/tests/bettertogether/betocq/betocq_5g_ap_test_suite.py
index 8b50d82cd..8b50d82cd 100644
--- a/tests/bettertogether/betocq/batch_performance_testing_with_5g_ap_test_suite.py
+++ b/tests/bettertogether/betocq/betocq_5g_ap_test_suite.py
diff --git a/tests/bettertogether/betocq/batch_performance_testing_with_dfs_5g_ap_test_suite.py b/tests/bettertogether/betocq/betocq_dfs_5g_ap_test_suite.py
index 754183bec..c0609b549 100644
--- a/tests/bettertogether/betocq/batch_performance_testing_with_dfs_5g_ap_test_suite.py
+++ b/tests/bettertogether/betocq/betocq_dfs_5g_ap_test_suite.py
@@ -32,7 +32,7 @@ from mobly import suite_runner
 from betocq import base_betocq_suite
 from betocq import nc_constants
 
-from betocq.cuj_tests import scc_5g_all_wifi_sta_test
+from betocq.compound_tests import scc_5g_all_wifi_sta_test
 from betocq.directed_tests import mcc_5g_hotspot_dfs_5g_sta_test
 from betocq.directed_tests import mcc_5g_wfd_dfs_5g_sta_test
 from betocq.directed_tests import scc_dfs_5g_hotspot_sta_test
diff --git a/tests/bettertogether/betocq/batch_all_performance_test_suite.py b/tests/bettertogether/betocq/betocq_test_suite.py
index 844f2034a..bee2679e6 100644
--- a/tests/bettertogether/betocq/batch_all_performance_test_suite.py
+++ b/tests/bettertogether/betocq/betocq_test_suite.py
@@ -33,10 +33,10 @@ from mobly import suite_runner
 
 from betocq import base_betocq_suite
 from betocq import nc_constants
-from betocq.cuj_tests import mcc_5g_all_wifi_non_dbs_2g_sta_test
-from betocq.cuj_tests import scc_2g_all_wifi_sta_test
-from betocq.cuj_tests import scc_5g_all_wifi_dbs_2g_sta_test
-from betocq.cuj_tests import scc_5g_all_wifi_sta_test
+from betocq.compound_tests import mcc_5g_all_wifi_non_dbs_2g_sta_test
+from betocq.compound_tests import scc_2g_all_wifi_sta_test
+from betocq.compound_tests import scc_5g_all_wifi_dbs_2g_sta_test
+from betocq.compound_tests import scc_5g_all_wifi_sta_test
 from betocq.directed_tests import bt_performance_test
 from betocq.directed_tests import mcc_2g_wfd_indoor_5g_sta_test
 from betocq.directed_tests import mcc_5g_hotspot_dfs_5g_sta_test
diff --git a/tests/bettertogether/betocq/cuj_tests/bt_2g_wifi_coex_test.py b/tests/bettertogether/betocq/compound_tests/bt_2g_wifi_coex_test.py
index 84bcba050..84bcba050 100644
--- a/tests/bettertogether/betocq/cuj_tests/bt_2g_wifi_coex_test.py
+++ b/tests/bettertogether/betocq/compound_tests/bt_2g_wifi_coex_test.py
diff --git a/tests/bettertogether/betocq/cuj_tests/mcc_5g_all_wifi_non_dbs_2g_sta_test.py b/tests/bettertogether/betocq/compound_tests/mcc_5g_all_wifi_non_dbs_2g_sta_test.py
index cf397c4f4..cf397c4f4 100644
--- a/tests/bettertogether/betocq/cuj_tests/mcc_5g_all_wifi_non_dbs_2g_sta_test.py
+++ b/tests/bettertogether/betocq/compound_tests/mcc_5g_all_wifi_non_dbs_2g_sta_test.py
diff --git a/tests/bettertogether/betocq/cuj_tests/scc_2g_all_wifi_sta_test.py b/tests/bettertogether/betocq/compound_tests/scc_2g_all_wifi_sta_test.py
index 4e8c118b6..4e8c118b6 100644
--- a/tests/bettertogether/betocq/cuj_tests/scc_2g_all_wifi_sta_test.py
+++ b/tests/bettertogether/betocq/compound_tests/scc_2g_all_wifi_sta_test.py
diff --git a/tests/bettertogether/betocq/cuj_tests/scc_5g_all_wifi_dbs_2g_sta_test.py b/tests/bettertogether/betocq/compound_tests/scc_5g_all_wifi_dbs_2g_sta_test.py
index ae6278959..ae6278959 100644
--- a/tests/bettertogether/betocq/cuj_tests/scc_5g_all_wifi_dbs_2g_sta_test.py
+++ b/tests/bettertogether/betocq/compound_tests/scc_5g_all_wifi_dbs_2g_sta_test.py
diff --git a/tests/bettertogether/betocq/cuj_tests/scc_5g_all_wifi_sta_test.py b/tests/bettertogether/betocq/compound_tests/scc_5g_all_wifi_sta_test.py
index 784c01977..784c01977 100644
--- a/tests/bettertogether/betocq/cuj_tests/scc_5g_all_wifi_sta_test.py
+++ b/tests/bettertogether/betocq/compound_tests/scc_5g_all_wifi_sta_test.py
diff --git a/tests/bettertogether/betocq/local_dev_testbed.yml b/tests/bettertogether/betocq/cuj_and_test_config_testbed.yml
index e5b21581a..6f929df3b 100644
--- a/tests/bettertogether/betocq/local_dev_testbed.yml
+++ b/tests/bettertogether/betocq/cuj_and_test_config_testbed.yml
@@ -78,6 +78,10 @@ TestBeds:
   TestParams:
       <<: *test-params
       target_cuj_name: "quick_share"
+    # before the performance test, run the function tests first
+      run_function_tests_with_performance_tests: True
+    # if the function tests is failed, abort the performance test
+      abort_all_tests_on_function_tests_fail: True
 
 - Name: LocalEsimTransferPerformanceTestbed
   <<: *controllers
diff --git a/tests/bettertogether/betocq/cuj_tests/local_dev_cuj_testbed.yml b/tests/bettertogether/betocq/cuj_tests/local_dev_cuj_testbed.yml
deleted file mode 100644
index 2eeee66bd..000000000
--- a/tests/bettertogether/betocq/cuj_tests/local_dev_cuj_testbed.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-x-test-params: &test-params
-  # target_cuj_name: "quick_start"
-  allow_unrooted_device: False
-  wifi_2g_ssid: "NETGEAR62"
-  wifi_2g_password: "widetree588"
-  wifi_5g_ssid: "NETGEAR62-5G-1"
-  wifi_5g_password: "widetree588"
-  wifi_dfs_5g_ssid: "GoogleGuest"
-  wifi_dfs_5g_password: ""
-  # use the AP controlled by programming dynamically
-  use_auto_controlled_wifi_ap: False
-
-x-controllers: &controllers
-  Controllers:
-    AndroidDevice:
-      - serial: "R3CN90YNAR"  # "R3CN90YNAR"
-        role: "source_device"
-        # The max number of spatial streams
-        max_num_streams: 2
-        # The max PHY rate at 5G, in Mbps
-        max_phy_rate_5g_mbps: 2402
-        # The max PHY rate at 2G, in Mbps
-        max_phy_rate_2g_mbps: 287
-        # if the device supports 5G Wifi
-        supports_5g: True  # True
-        # if the device supports DBS (Dual Band Simultaneous) in STA + WiFi-Direct concurrency mode
-        supports_dbs_sta_wfd: True
-        # The max number of spatial streams in DBS mode.
-        max_num_streams_dbs: 2
-        # if the device supports to start WFD group owner at a STA-associated DFS channel
-        enable_sta_dfs_channel_for_peer_network: False
-        # if the device supports to start WFD group owner at a STA-associated indoor channel
-        enable_sta_indoor_channel_for_peer_network: False
-        # 14 - U, 13 - T, 12 - S
-        android_version: 14
-      - serial: "2B031FDJH0002G"  # "ABCDEF123456"
-        role: "target_device"
-        # The max number of spatial streams
-        max_num_streams: 2
-        # The max PHY rate at 5G, in Mbps
-        max_phy_rate_5g_mbps: 2402
-        # The max PHY rate at 2G, in Mbps
-        max_phy_rate_2g_mbps: 287
-        # if the device supports 5G Wifi
-        supports_5g: True  # True
-        # if the device supports DBS (Dual Band Simultaneous) in STA + WiFi-Direct concurrency mode
-        supports_dbs_sta_wfd: True
-        # The max number of spatial streams in DBS mode.
-        max_num_streams_dbs: 2
-        # if the device supports to start WFD group owner at a STA-associated DFS channel
-        enable_sta_dfs_channel_for_peer_network: True
-        # if the device supports to start WFD group owner at a STA-associated indoor channel
-        enable_sta_indoor_channel_for_peer_network: True
-        # 14 - U, 13 - T, 12 - S
-        android_version: 14
-
-TestBeds:
-- Name: LocalPerformanceDefaultTestbed
-  <<: *controllers
-  TestParams:
-      <<: *test-params
-
-- Name: LocalQuickstartPerformanceTestbed
-  <<: *controllers
-  TestParams:
-      <<: *test-params
-      target_cuj_name: "quick_start"
-      # before the performance test, run the function tests first
-      run_function_tests_with_performance_tests: True
-      # if the function tests is failed, abort the performance test
-      abort_all_tests_on_function_tests_fail: True
-
-- Name: LocalQuicksharePerformanceTestbed
-  <<: *controllers
-  TestParams:
-      <<: *test-params
-      target_cuj_name: "quick_share"
\ No newline at end of file
diff --git a/tests/bettertogether/betocq/directed_tests/local_dev_directed_testbed.yml b/tests/bettertogether/betocq/directed_tests/local_dev_directed_testbed.yml
deleted file mode 100644
index ea3e03016..000000000
--- a/tests/bettertogether/betocq/directed_tests/local_dev_directed_testbed.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-x-test-params: &test-params
-  target_cuj_name: "quick_start"
-  allow_unrooted_device: False
-  wifi_2g_ssid: "NETGEAR62"
-  wifi_2g_password: "widetree588"
-  wifi_5g_ssid: "NETGEAR62-5G-1"
-  wifi_5g_password: "widetree588"
-  wifi_dfs_5g_ssid: "GoogleGuest"
-  wifi_dfs_5g_password: ""
-  # use the AP controlled by programming dynamically
-  use_auto_controlled_wifi_ap: False
-
-x-controllers: &controllers
-  Controllers:
-    AndroidDevice:
-      - serial: "R3CN90YNAR"  # "R3CN90YNAR"
-        role: "source_device"
-        # The max number of spatial streams
-        max_num_streams: 2
-        # The max PHY rate at 5G, in Mbps
-        max_phy_rate_5g_mbps: 2402
-        # The max PHY rate at 2G, in Mbps
-        max_phy_rate_2g_mbps: 287
-        # if the device supports 5G Wifi
-        supports_5g: True  # True
-        # if the device supports DBS (Dual Band Simultaneous) in STA + WiFi-Direct concurrency mode
-        supports_dbs_sta_wfd: True
-        # The max number of spatial streams in DBS mode.
-        max_num_streams_dbs: 2
-        # if the device supports to start WFD group owner at a STA-associated DFS channel
-        enable_sta_dfs_channel_for_peer_network: False
-        # if the device supports to start WFD group owner at a STA-associated indoor channel
-        enable_sta_indoor_channel_for_peer_network: False
-        # 14 - U, 13 - T, 12 - S
-        android_version: 14
-      - serial: "2B031FDJH0002G"  # "ABCDEF123456"
-        role: "target_device"
-        # The max number of spatial streams
-        max_num_streams: 2
-        # The max PHY rate at 5G, in Mbps
-        max_phy_rate_5g_mbps: 2402
-        # The max PHY rate at 2G, in Mbps
-        max_phy_rate_2g_mbps: 287
-        # if the device supports 5G Wifi
-        supports_5g: True  # True
-        # if the device supports DBS (Dual Band Simultaneous) in STA + WiFi-Direct concurrency mode
-        supports_dbs_sta_wfd: True
-        # The max number of spatial streams in DBS mode.
-        max_num_streams_dbs: 2
-        # if the device supports to start WFD group owner at a STA-associated DFS channel
-        enable_sta_dfs_channel_for_peer_network: True
-        # if the device supports to start WFD group owner at a STA-associated indoor channel
-        enable_sta_indoor_channel_for_peer_network: True
-        # 14 - U, 13 - T, 12 - S
-        android_version: 14
-
-TestBeds:
-- Name: LocalPerformanceDefaultTestbed
-  <<: *controllers
-  TestParams:
-      <<: *test-params
-
-- Name: LocalQuickstartPerformanceTestbed
-  <<: *controllers
-  TestParams:
-      <<: *test-params
-      target_cuj_name: "quick_start"
-      # before the performance test, run the function tests first
-      run_function_tests_with_performance_tests: True
-      # if the function tests is failed, abort the performance test
-      abort_all_tests_on_function_tests_fail: True
-
-- Name: LocalQuicksharePerformanceTestbed
-  <<: *controllers
-  TestParams:
-      <<: *test-params
-      target_cuj_name: "quick_share"
diff --git a/tests/bettertogether/betocq/function_tests/local_dev_function_group_testbed.yml b/tests/bettertogether/betocq/function_tests/local_dev_function_group_testbed.yml
deleted file mode 100644
index ce7eac557..000000000
--- a/tests/bettertogether/betocq/function_tests/local_dev_function_group_testbed.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Test bed for the function tests only.
-x-test-params: &test-params
-  wifi_ssid: "anyAp"
-  wifi_password: "anyAp"
-  target_cuj_name: "quick_start"
-
-x-controllers: &controllers
-  Controllers:
-    AndroidDevice:
-      - serial: "123456ABCDEF"
-        role: "source_device"
-      - serial: "ABCDEF123456"
-        role: "target_device"
-
-TestBeds:
-- Name: LocalDevTestbed
-  # only for development, DO NOT port to AOSP.
-  Controllers:
-    AndroidDevice: '*'
-  TestParams:
-      <<: *test-params
-
-- Name: LocalFunctionGroupTestbed
-  <<: *controllers
-  TestParams:
-      <<: *test-params
\ No newline at end of file