Added 5G SA components to ACTS
Added 6 new utils in tel_5g_utils
Updated 8 tel_data_utils for separating 5G SA and 5G NSA components
Added 2 Sa5gSmsTest, 3 Sa5gMmsTest and 5 Sa5gDataTest
Created new directory for sa5g test clases under nr section
Test: automation
Bug: 184587718
Change-Id: I9d0faf75043327a405307ebefc81db816610cbaa
diff --git a/acts_tests/tests/google/nr/nsa5g/Nsa5gMmsTest.py b/acts_tests/tests/google/nr/nsa5g/Nsa5gMmsTest.py
index 2d812e3..4eded92 100755
--- a/acts_tests/tests/google/nr/nsa5g/Nsa5gMmsTest.py
+++ b/acts_tests/tests/google/nr/nsa5g/Nsa5gMmsTest.py
@@ -31,7 +31,7 @@
from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
from acts_contrib.test_utils.tel.tel_5g_utils import connect_both_devices_to_wifi
from acts_contrib.test_utils.tel.tel_5g_utils import disable_apm_mode_both_devices
-from acts_contrib.test_utils.tel.tel_5g_utils import provision_both_devices_for_5g
+from acts_contrib.test_utils.tel.tel_5g_utils import provision_device_for_5g
from acts_contrib.test_utils.tel.tel_5g_utils import provision_both_devices_for_volte
from acts_contrib.test_utils.tel.tel_5g_utils import provision_both_devices_for_wfc_cell_pref
from acts_contrib.test_utils.tel.tel_5g_utils import provision_both_devices_for_wfc_wifi_pref
@@ -42,6 +42,7 @@
from acts_contrib.test_utils.tel.tel_mms_utils import _long_mms_test_mo
from acts_contrib.test_utils.tel.tel_mms_utils import test_mms_mo_in_call
+
class Nsa5gMmsTest(TelephonyBaseTest):
def setup_class(self):
super().setup_class()
@@ -85,7 +86,7 @@
False if failed.
"""
ads = self.android_devices
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
if not _mms_test_mo(self.log, ads):
@@ -117,7 +118,7 @@
if not provision_both_devices_for_volte(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
if not _mms_test_mo(self.log, ads):
@@ -148,7 +149,7 @@
if not provision_both_devices_for_volte(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
self.log.info("Begin Incall mms test.")
@@ -189,7 +190,7 @@
if not disable_apm_mode_both_devices(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
if not provision_both_devices_for_wfc_cell_pref(self.log,
@@ -226,7 +227,7 @@
if not disable_apm_mode_both_devices(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
if not provision_both_devices_for_wfc_wifi_pref(self.log,
@@ -267,7 +268,7 @@
if not disable_apm_mode_both_devices(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
if not provision_both_devices_for_wfc_wifi_pref(self.log,
@@ -309,7 +310,7 @@
if not provision_both_devices_for_volte(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
if not connect_both_devices_to_wifi(self.log,
@@ -355,7 +356,7 @@
if not disable_apm_mode_both_devices(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
return _long_mms_test_mo(self.log, ads)
@@ -381,7 +382,7 @@
if not disable_apm_mode_both_devices(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
ensure_wifi_connected(self.log, ads[0], self.wifi_network_ssid,
@@ -410,7 +411,7 @@
if not disable_apm_mode_both_devices(self.log, ads):
return False
- if not provision_both_devices_for_5g(self.log, ads):
+ if not provision_device_for_5g(self.log, ads):
return False
ensure_wifi_connected(self.log, ads[0], self.wifi_network_ssid,
@@ -419,6 +420,7 @@
return _mms_test_mt(self.log, ads)
+ @test_tracker_info(uuid="156bf832-acc2-4729-a69d-b471cd5cfbde")
@TelephonyBaseTest.tel_test_wrap
def test_5g_nsa_mms_mo_mt_in_call_csfb_wifi(self):
""" Test MO/MT MMS during a MO csfb call and devices connect to Wifi.