Remove import * in telephony test code.
Bug: 26306153
Change-Id: Id9775235b6afc75d72dc8aed59ceddb3198a75db
diff --git a/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
index e08086b..28d92d6 100644
--- a/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
+++ b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
@@ -21,16 +21,16 @@
from acts.base_test import BaseTestClass
from acts.signals import TestSignal
-from .tel_test_utils import ensure_phones_default_state
-from .tel_test_utils import get_sub_ids_for_sim_slots
-from .tel_test_utils import set_phone_screen_on
-from .tel_test_utils import set_phone_silent_mode
-from .tel_test_utils import setup_droid_properties
-from .tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
-from .tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
-from .tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
-from .tel_defines import WIFI_VERBOSE_LOGGING_ENABLED
-from .tel_defines import WIFI_VERBOSE_LOGGING_DISABLED
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import get_sub_ids_for_sim_slots
+from acts.test_utils.tel.tel_test_utils import set_phone_screen_on
+from acts.test_utils.tel.tel_test_utils import set_phone_silent_mode
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
+from acts.test_utils.tel.tel_defines import WIFI_VERBOSE_LOGGING_ENABLED
+from acts.test_utils.tel.tel_defines import WIFI_VERBOSE_LOGGING_DISABLED
class TelephonyBaseTest(BaseTestClass):
diff --git a/acts/framework/acts/test_utils/tel/tel_atten_utils.py b/acts/framework/acts/test_utils/tel/tel_atten_utils.py
index 7e9b649..885e3b2 100644
--- a/acts/framework/acts/test_utils/tel/tel_atten_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_atten_utils.py
@@ -16,7 +16,10 @@
import time
import math
-from .tel_defines import *
+from acts.test_utils.tel.tel_defines import ATTEN_MAX_VALUE
+from acts.test_utils.tel.tel_defines import ATTEN_MIN_VALUE
+from acts.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
def get_atten(log, atten_obj):
"""Get attenuator current attenuation value.
diff --git a/acts/framework/acts/test_utils/tel/tel_data_utils.py b/acts/framework/acts/test_utils/tel/tel_data_utils.py
index b890286..3cdb7de 100644
--- a/acts/framework/acts/test_utils/tel/tel_data_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_data_utils.py
@@ -14,14 +14,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import random
-import string
import time
-import warnings
from acts.utils import rand_ascii_str
-from acts.test_utils.tel.tel_defines import *
-from acts.test_utils.tel.tel_test_utils import *
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_test_utils import WifiUtils
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import is_droid_in_network_generation
+from acts.test_utils.tel.tel_test_utils import rat_generation_from_rat
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
def wifi_tethering_cleanup(log, provider, client_list):
"""Clean up steps for WiFi Tethering.
diff --git a/acts/framework/acts/test_utils/tel/tel_test_anritsu_utils.py b/acts/framework/acts/test_utils/tel/tel_test_anritsu_utils.py
index 26e33f9..b204c73 100644
--- a/acts/framework/acts/test_utils/tel/tel_test_anritsu_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_test_anritsu_utils.py
@@ -19,16 +19,31 @@
from queue import Empty
from datetime import datetime
-from acts.controllers.tel.md8475a import BtsNumber
-from acts.controllers.tel.md8475a import BtsTechnology
-from acts.controllers.tel.md8475a import BtsNwNameEnable
-from acts.controllers.tel.md8475a import CsfbType
-from acts.controllers.tel.md8475a import ReturnToEUTRAN
-from acts.controllers.tel.md8475a import MD8475A
-from acts.controllers.tel.md8475a import BtsServiceState
-from acts.controllers.tel.md8475a import VirtualPhoneStatus
-from . tel_test_utils import *
from acts.controllers.tel._anritsu_utils import AnritsuUtils
+from acts.controllers.tel.md8475a import BtsNumber
+from acts.controllers.tel.md8475a import BtsNwNameEnable
+from acts.controllers.tel.md8475a import BtsServiceState
+from acts.controllers.tel.md8475a import BtsTechnology
+from acts.controllers.tel.md8475a import CsfbType
+from acts.controllers.tel.md8475a import MD8475A
+from acts.controllers.tel.md8475a import ReturnToEUTRAN
+from acts.controllers.tel.md8475a import VirtualPhoneStatus
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_REMOTE
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CALL_DROP
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_VIRTUAL_PHONE_STATE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import EventCmasReceived
+from acts.test_utils.tel.tel_defines import EventEtwsReceived
+from acts.test_utils.tel.tel_defines import EventSmsDeliverSuccess
+from acts.test_utils.tel.tel_defines import EventSmsSentSuccess
+from acts.test_utils.tel.tel_defines import EventSmsReceived
+from acts.test_utils.tel.tel_test_utils import ensure_phone_idle
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_test_utils import wait_for_droid_not_in_call
# Test PLMN information
TEST_PLMN_LTE_NAME = "MD8475A_LTE"
diff --git a/acts/framework/acts/test_utils/tel/tel_test_utils.py b/acts/framework/acts/test_utils/tel/tel_test_utils.py
index 97b7849..9ae08b5 100644
--- a/acts/framework/acts/test_utils/tel/tel_test_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_test_utils.py
@@ -15,18 +15,89 @@
# limitations under the License.
import concurrent.futures
-import random
-import string
import urllib.parse
import time
-import warnings
from queue import Empty
-from .tel_defines import *
-from .tel_lookup_tables import *
-from acts.controllers.event_dispatcher import EventDispatcher
-from acts.utils import load_config
from acts.controllers.android_device import AndroidDevice
+from acts.controllers.event_dispatcher import EventDispatcher
+from acts.test_utils.tel.tel_defines import CARRIER_UNKNOWN
+from acts.test_utils.tel.tel_defines import DATA_STATE_CONNECTED
+from acts.test_utils.tel.tel_defines import DATA_STATE_DISCONNECTED
+from acts.test_utils.tel.tel_defines import GEN_UNKNOWN
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_BACKGROUND
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_FOREGROUND
+from acts.test_utils.tel.tel_defines import INVALID_SIM_SLOT_INDEX
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_defines import MAX_SAVED_VOICE_MAIL
+from acts.test_utils.tel.tel_defines import MAX_SCREEN_ON_TIME
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_VOICE_MAIL_COUNT
+from acts.test_utils.tel.tel_defines import NetworkModeLteOnly
+from acts.test_utils.tel.tel_defines import NETWORK_CONNECTION_TYPE_CELL
+from acts.test_utils.tel.tel_defines import NETWORK_CONNECTION_TYPE_WIFI
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_7_DIGIT
+from acts.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_10_DIGIT
+from acts.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_11_DIGIT
+from acts.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_12_DIGIT
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_UNKNOWN
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_EMERGENCY_ONLY
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_IN_SERVICE
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_OUT_OF_SERVICE
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_POWER_OFF
+from acts.test_utils.tel.tel_defines import SIM_STATE_READY
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_IDLE
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_OFFHOOK
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_RINGING
+from acts.test_utils.tel.tel_defines import VOICEMAIL_DELETE_DIGIT
+from acts.test_utils.tel.tel_defines import VOICE_MAIL_SERVER_RESPONSE_DELAY
+from acts.test_utils.tel.tel_defines import \
+ WAIT_TIME_ACCEPT_CALL_TO_OFFHOOK_EVENT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AIRPLANEMODE_EVENT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANSWER_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CALL_INITIATION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CALLEE_RINGING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CONNECTION_STATE_UPDATE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_DATA_SUB_CHANGE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_HANGUP_TO_IDLE_EVENT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_REJECT_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_SMS_RECEIVE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_SMS_SENT_SUCCESS
+from acts.test_utils.tel.tel_defines import WAIT_TIME_TO_LEAVE_VOICE_MAIL
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import EventCallStateChanged
+from acts.test_utils.tel.tel_defines import EventConnectivityChanged
+from acts.test_utils.tel.tel_defines import EventDataConnectionStateChanged
+from acts.test_utils.tel.tel_defines import EventDataSmsReceived
+from acts.test_utils.tel.tel_defines import EventMessageWaitingIndicatorChanged
+from acts.test_utils.tel.tel_defines import EventServiceStateChanged
+from acts.test_utils.tel.tel_defines import EventMmsSentSuccess
+from acts.test_utils.tel.tel_defines import EventSmsReceived
+from acts.test_utils.tel.tel_defines import EventSmsSentSuccess
+from acts.test_utils.tel.tel_lookup_tables import \
+ connection_type_from_type_string
+from acts.test_utils.tel.tel_lookup_tables import is_valid_rat
+from acts.test_utils.tel.tel_lookup_tables import \
+ get_voice_mail_count_check_function
+from acts.test_utils.tel.tel_lookup_tables import get_voice_mail_number_function
+from acts.test_utils.tel.tel_lookup_tables import \
+ network_preference_for_generaton
+from acts.test_utils.tel.tel_lookup_tables import operator_name_from_plmn_id
+from acts.test_utils.tel.tel_lookup_tables import \
+ rat_families_for_network_preference
+from acts.test_utils.tel.tel_lookup_tables import rat_family_for_generation
+from acts.test_utils.tel.tel_lookup_tables import rat_family_from_rat
+from acts.test_utils.tel.tel_lookup_tables import rat_generation_from_rat
+from acts.utils import load_config
from acts.logger import LoggerProxy
log = LoggerProxy()
diff --git a/acts/framework/acts/test_utils/tel/tel_video_utils.py b/acts/framework/acts/test_utils/tel/tel_video_utils.py
index 0299335..4cd559d 100644
--- a/acts/framework/acts/test_utils/tel/tel_video_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_video_utils.py
@@ -14,9 +14,55 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts.test_utils.tel.tel_lookup_tables import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
+import time
+from queue import Empty
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
+from acts.test_utils.tel.tel_defines import CALL_STATE_RINGING
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_BACKGROUND
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_FOREGROUND
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_OFFHOOK
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_RINGING
+from acts.test_utils.tel.tel_defines import VT_STATE_AUDIO_ONLY
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL_PAUSED
+from acts.test_utils.tel.tel_defines import VT_STATE_RX_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_RX_PAUSED
+from acts.test_utils.tel.tel_defines import VT_STATE_TX_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_TX_PAUSED
+from acts.test_utils.tel.tel_defines import VT_STATE_STATE_INVALID
+from acts.test_utils.tel.tel_defines import VT_VIDEO_QUALITY_DEFAULT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ACCEPT_CALL_TO_OFFHOOK_EVENT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ACCEPT_VIDEO_CALL_TO_CHECK_STATE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANSWER_VIDEO_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CALL_INITIATION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CALLEE_RINGING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_VIDEO_SESSION_EVENT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import EventCallStateChanged
+from acts.test_utils.tel.tel_defines import EventTelecomVideoCallSessionModifyRequestReceived
+from acts.test_utils.tel.tel_defines import EventTelecomVideoCallSessionModifyResponseReceived
+from acts.test_utils.tel.tel_defines import EventSessionModifyResponsetRceived
+from acts.test_utils.tel.tel_defines import EventSessionModifyRequestRceived
+from acts.test_utils.tel.tel_test_utils import check_phone_number_match
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import is_sub_event_match
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte_for_subscription
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import wait_for_ringing_event
+from acts.test_utils.tel.tel_test_utils import wait_for_video_enabled
+from acts.test_utils.tel.tel_voice_utils import is_call_hd
def phone_setup_video(log, ad):
"""Setup phone default sub_id to make video call
diff --git a/acts/framework/acts/test_utils/tel/tel_voice_utils.py b/acts/framework/acts/test_utils/tel/tel_voice_utils.py
index 787ad5f..9091e8f 100644
--- a/acts/framework/acts/test_utils/tel/tel_voice_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_voice_utils.py
@@ -14,8 +14,64 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from .tel_lookup_tables import *
-from .tel_test_utils import *
+import time
+from acts.test_utils.tel.tel_defines import CALL_PROPERTY_HIGH_DEF_AUDIO
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
+from acts.test_utils.tel.tel_defines import GEN_2G
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_IWLAN
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_UMTS
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_TO_LEAVE_VOICE_MAIL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WFC_ENABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import NetworkModeCdma
+from acts.test_utils.tel.tel_defines import NetworkModeGsmOnly
+from acts.test_utils.tel.tel_defines import NetworkModeGsmUmts
+from acts.test_utils.tel.tel_defines import NetworkModeLteCdmaEvdo
+from acts.test_utils.tel.tel_defines import NetworkModeLteGsmWcdma
+from acts.test_utils.tel.tel_test_utils import call_reject_leave_message
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import \
+ ensure_network_generation_for_subscription
+from acts.test_utils.tel.tel_test_utils import \
+ ensure_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_network_gen_for_subscription
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import get_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import is_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import toggle_volte_for_subscription
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import \
+ wait_for_network_generation_for_subscription
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat
+from acts.test_utils.tel.tel_test_utils import \
+ wait_for_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import wait_for_volte_enabled
+from acts.test_utils.tel.tel_test_utils import \
+ wait_for_voice_attach_for_subscription
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
def two_phone_call_leave_voice_mail(
log,
diff --git a/acts/tests/google/tel/lab/TelLabCmasTest.py b/acts/tests/google/tel/lab/TelLabCmasTest.py
index 08b18fe..9adc46d 100644
--- a/acts/tests/google/tel/lab/TelLabCmasTest.py
+++ b/acts/tests/google/tel/lab/TelLabCmasTest.py
@@ -19,14 +19,45 @@
Sanity tests for voice tests in telephony
"""
from acts.base_test import BaseTestClass
-from acts.controllers.tel.md8475a import MD8475A
from acts.controllers.tel._anritsu_utils import AnritsuError
-from acts.controllers.tel.md8475a import CTCHSetup
-from acts.test_utils.tel.tel_test_anritsu_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
-from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.controllers.tel.md8475a import CBCHSetup
+from acts.controllers.tel.md8475a import CTCHSetup
+from acts.controllers.tel.md8475a import MD8475A
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_WCDMA_PREF
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_CATEGORY_AMBER
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_CATEGORY_EXTREME
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_CATEGORY_PRESIDENTIAL
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_CERTIANTY_LIKELY
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_RESPONSETYPE_EVACUATE
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_RESPONSETYPE_MONITOR
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_RESPONSETYPE_SHELTER
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_SEVERITY_EXTREME
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_URGENCY_IMMEDIATE
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_C2K_CERTIANTY_OBSERVED
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_MESSAGE_CHILD_ABDUCTION_EMERGENCY
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_MESSAGE_EXTREME_IMMEDIATE_LIKELY
+from acts.test_utils.tel.tel_test_anritsu_utils import CMAS_MESSAGE_PRESIDENTIAL_ALERT
+from acts.test_utils.tel.tel_test_anritsu_utils import cb_serial_number
+from acts.test_utils.tel.tel_test_anritsu_utils import cmas_receive_verify_message_cdma1x
+from acts.test_utils.tel.tel_test_anritsu_utils import cmas_receive_verify_message_lte_wcdma
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
class TelLabCmasTest(TelephonyBaseTest):
SERIAL_NO = cb_serial_number()
diff --git a/acts/tests/google/tel/lab/TelLabEmergencyCallTest.py b/acts/tests/google/tel/lab/TelLabEmergencyCallTest.py
index 8ec936e..209d89b 100644
--- a/acts/tests/google/tel/lab/TelLabEmergencyCallTest.py
+++ b/acts/tests/google/tel/lab/TelLabEmergencyCallTest.py
@@ -18,16 +18,33 @@
"""
Sanity tests for voice tests in telephony
"""
-from acts.base_test import BaseTestClass
-from acts.controllers.tel.md8475a import MD8475A
+import time
+
from acts.controllers.tel._anritsu_utils import AnritsuError
-from acts.controllers.tel.md8475a import VirtualPhoneStatus
-from acts.test_utils.tel.tel_test_anritsu_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
from acts.controllers.tel.md8475a import CsfbType
+from acts.controllers.tel.md8475a import MD8475A
from acts.controllers.tel.md8475a import VirtualPhoneAutoAnswer
+from acts.controllers.tel.md8475a import VirtualPhoneStatus
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANRITSU_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import NetworkModeCdma
+from acts.test_utils.tel.tel_defines import NetworkModeGsmOnly
+from acts.test_utils.tel.tel_defines import NetworkModeGsmUmts
+from acts.test_utils.tel.tel_defines import NetworkModeLteCdmaEvdo
+from acts.test_utils.tel.tel_defines import NetworkModeLteGsmWcdma
+from acts.test_utils.tel.tel_test_anritsu_utils import call_mo_setup_teardown
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte_1x
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
class TelLabEmergencyCallTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/lab/TelLabEtwsTest.py b/acts/tests/google/tel/lab/TelLabEtwsTest.py
index 4a72f2e..20ac7bf 100644
--- a/acts/tests/google/tel/lab/TelLabEtwsTest.py
+++ b/acts/tests/google/tel/lab/TelLabEtwsTest.py
@@ -18,15 +18,32 @@
"""
Sanity tests for voice tests in telephony
"""
-from acts.base_test import BaseTestClass
-from acts.controllers.tel.md8475a import MD8475A
from acts.controllers.tel._anritsu_utils import AnritsuError
-from acts.controllers.tel.md8475a import CTCHSetup
-from acts.test_utils.tel.tel_test_anritsu_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
-from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.controllers.tel.md8475a import MD8475A
from acts.controllers.tel.md8475a import CBCHSetup
+from acts.controllers.tel.md8475a import CTCHSetup
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_WCDMA_PREF
+from acts.test_utils.tel.tel_test_anritsu_utils import ETWS_WARNING_EARTHQUAKETSUNAMI
+from acts.test_utils.tel.tel_test_anritsu_utils import ETWS_WARNING_OTHER_EMERGENCY
+from acts.test_utils.tel.tel_test_anritsu_utils import cb_serial_number
+from acts.test_utils.tel.tel_test_anritsu_utils import etws_receive_verify_message_lte_wcdma
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
class TelLabEtwsTest(TelephonyBaseTest):
SERIAL_NO = cb_serial_number()
diff --git a/acts/tests/google/tel/lab/TelLabNeighborCellTest.py b/acts/tests/google/tel/lab/TelLabNeighborCellTest.py
index dc67ab9..066177e 100644
--- a/acts/tests/google/tel/lab/TelLabNeighborCellTest.py
+++ b/acts/tests/google/tel/lab/TelLabNeighborCellTest.py
@@ -18,19 +18,53 @@
"""
import time
-from acts.base_test import BaseTestClass
-from acts.controllers.tel.md8475a import MD8475A
from acts.controllers.tel._anritsu_utils import AnritsuError
from acts.controllers.tel.md8475a import CTCHSetup
from acts.controllers.tel.md8475a import BtsBandwidth
from acts.controllers.tel.md8475a import BtsPacketRate
-from acts.test_utils.tel.tel_test_anritsu_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
-from acts.controllers.tel.mg3710a import MG3710A
from acts.controllers.tel.md8475a import BtsServiceState
-from cell_configurations import *
+from acts.controllers.tel.md8475a import MD8475A
+from acts.controllers.tel.mg3710a import MG3710A
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_test_anritsu_utils import LTE_BAND_2
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte_lte
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma_gsm
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma_wcdma
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from cell_configurations import gsm_band850_ch128_fr869_cid58_cell
+from cell_configurations import gsm_band850_ch251_fr893_cid59_cell
+from cell_configurations import gsm_band1900_ch512_fr1930_cid51_cell
+from cell_configurations import gsm_band1900_ch512_fr1930_cid52_cell
+from cell_configurations import gsm_band1900_ch512_fr1930_cid53_cell
+from cell_configurations import gsm_band1900_ch512_fr1930_cid54_cell
+from cell_configurations import gsm_band1900_ch640_fr1955_cid56_cell
+from cell_configurations import gsm_band1900_ch750_fr1977_cid57_cell
+from cell_configurations import lte_band2_ch900_fr1960_pcid9_cell
+from cell_configurations import lte_band4_ch2000_fr2115_pcid1_cell
+from cell_configurations import lte_band4_ch2000_fr2115_pcid2_cell
+from cell_configurations import lte_band4_ch2000_fr2115_pcid3_cell
+from cell_configurations import lte_band4_ch2000_fr2115_pcid4_cell
+from cell_configurations import lte_band4_ch2050_fr2120_pcid7_cell
+from cell_configurations import lte_band4_ch2050_fr2120_pcid7_cell
+from cell_configurations import lte_band4_ch2250_fr2140_pcid8_cell
+from cell_configurations import lte_band12_ch5095_fr737_pcid10_cell
+from cell_configurations import wcdma_band1_ch10700_fr2140_cid31_cell
+from cell_configurations import wcdma_band1_ch10700_fr2140_cid32_cell
+from cell_configurations import wcdma_band1_ch10700_fr2140_cid33_cell
+from cell_configurations import wcdma_band1_ch10700_fr2140_cid34_cell
+from cell_configurations import wcdma_band1_ch10575_fr2115_cid36_cell
+from cell_configurations import wcdma_band1_ch10800_fr2160_cid37_cell
+from cell_configurations import wcdma_band2_ch9800_fr1960_cid38_cell
+from cell_configurations import wcdma_band2_ch9900_fr1980_cid39_cell
class TelLabNeighborCellTest(TelephonyBaseTest):
# These are not actual DB Loss. the signal strength seen at phone varies this
diff --git a/acts/tests/google/tel/lab/TelLabSmsTest.py b/acts/tests/google/tel/lab/TelLabSmsTest.py
index 1b74354..8e44732 100644
--- a/acts/tests/google/tel/lab/TelLabSmsTest.py
+++ b/acts/tests/google/tel/lab/TelLabSmsTest.py
@@ -19,15 +19,36 @@
Sanity tests for connectivity tests in telephony
"""
-from acts.base_test import BaseTestClass
+import time
+from acts.controllers.tel._anritsu_utils import AnritsuError
from acts.controllers.tel.md8475a import MD8475A
from acts.controllers.tel.md8475a import VirtualPhoneStatus
-from acts.test_utils.tel.tel_test_anritsu_utils import *
-from acts.controllers.tel._anritsu_utils import AnritsuError
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
-from acts.utils import rand_ascii_str
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_test_anritsu_utils import \
+ NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import \
+ NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_WCDMA_PREF
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.tel_test_anritsu_utils import sms_mo_send
+from acts.test_utils.tel.tel_test_anritsu_utils import sms_mt_receive_verify
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.utils import rand_ascii_str
+
SINGLE_PART_LEN = 40
MULTI_PART_LEN = 180
diff --git a/acts/tests/google/tel/lab/TelLabUeIdentityTest.py b/acts/tests/google/tel/lab/TelLabUeIdentityTest.py
index fb6b30d..86555ed 100644
--- a/acts/tests/google/tel/lab/TelLabUeIdentityTest.py
+++ b/acts/tests/google/tel/lab/TelLabUeIdentityTest.py
@@ -18,14 +18,29 @@
"""
Tests for reading UE Identity
"""
-from acts.base_test import BaseTestClass
-from acts.controllers.tel.md8475a import MD8475A
+import time
from acts.controllers.tel._anritsu_utils import AnritsuError
-from acts.test_utils.tel.tel_test_anritsu_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
+from acts.controllers.tel.md8475a import MD8475A
from acts.controllers.tel.md8475a import UEIdentityType
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANRITSU_REG_AND_OPER
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_WCDMA_PREF
+from acts.test_utils.tel.tel_test_anritsu_utils import read_ue_identity
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
class TelLabUeIdentityTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/lab/TelLabVoiceTest.py b/acts/tests/google/tel/lab/TelLabVoiceTest.py
index 6138a4b..b74d3cf 100644
--- a/acts/tests/google/tel/lab/TelLabVoiceTest.py
+++ b/acts/tests/google/tel/lab/TelLabVoiceTest.py
@@ -19,15 +19,35 @@
Sanity tests for voice tests in telephony
"""
-from acts.base_test import BaseTestClass
-from acts.controllers.tel.md8475a import MD8475A
-from acts.controllers.tel.md8475a import VirtualPhoneStatus
-from acts.test_utils.tel.tel_test_anritsu_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
+import time
from acts.controllers.tel.md8475a import CsfbType
+from acts.controllers.tel.md8475a import MD8475A
from acts.controllers.tel.md8475a import VirtualPhoneAutoAnswer
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_REMOTE
+from acts.test_utils.tel.tel_defines import MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_test_anritsu_utils import NETWORK_MODE_WCDMA_PREF
+from acts.test_utils.tel.tel_test_anritsu_utils import call_mo_setup_teardown
+from acts.test_utils.tel.tel_test_anritsu_utils import call_mt_setup_teardown
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.tel_test_anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
class TelLabVoiceTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/lab/TelephonyConnectivitySanityTest.py b/acts/tests/google/tel/lab/TelephonyConnectivitySanityTest.py
index 859514a..2c3a324 100644
--- a/acts/tests/google/tel/lab/TelephonyConnectivitySanityTest.py
+++ b/acts/tests/google/tel/lab/TelephonyConnectivitySanityTest.py
@@ -20,15 +20,14 @@
"""
import time
-from base_test import BaseTestClass
-from tel.md8475a import MD8475A
-from tel.md8475a import BtsTechnology
-from tel.md8475a import ProcessingStatus
-from tel.md8475a import BtsServiceState
-from tel.md8475a import TriggerMessageIDs
-from tel.md8475a import TriggerMessageReply
-import tel_utils
+from acts.controllers.tel.md8475a import BtsServiceState
+from acts.controllers.tel.md8475a import BtsTechnology
+from acts.controllers.tel.md8475a import MD8475A
+from acts.controllers.tel.md8475a import ProcessingStatus
+from acts.controllers.tel.md8475a import TriggerMessageIDs
+from acts.controllers.tel.md8475a import TriggerMessageReply
+from acts.test_utils.tel import tel_test_utils
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
class TelephonyConnectivitySanityTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/lab/TelephonyDataSanityTest.py b/acts/tests/google/tel/lab/TelephonyDataSanityTest.py
index 79b972c..8df5f0a 100644
--- a/acts/tests/google/tel/lab/TelephonyDataSanityTest.py
+++ b/acts/tests/google/tel/lab/TelephonyDataSanityTest.py
@@ -21,12 +21,11 @@
import time
from queue import Empty
-from base_test import BaseTestClass
-from tel.md8475a import MD8475A
-from tel.md8475a import BtsNumber
-from tel.md8475a import BtsTechnology
-import tel_utils
+from acts.controllers.tel.md8475a import BtsNumber
+from acts.controllers.tel.md8475a import BtsTechnology
+from acts.controllers.tel.md8475a import MD8475A
+from acts.test_utils.tel import tel_test_utils
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
class TelephonyDataSanityTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/lab/cell_configurations.py b/acts/tests/google/tel/lab/cell_configurations.py
index e14327b..2017817 100644
--- a/acts/tests/google/tel/lab/cell_configurations.py
+++ b/acts/tests/google/tel/lab/cell_configurations.py
@@ -17,7 +17,13 @@
Sanity tests for voice tests in telephony
"""
from acts.controllers.tel.md8475a import BtsBandwidth
-from acts.test_utils.tel.tel_test_anritsu_utils import *
+from acts.test_utils.tel.tel_test_anritsu_utils import GSM_BAND_PCS1900
+from acts.test_utils.tel.tel_test_anritsu_utils import GSM_BAND_GSM850
+from acts.test_utils.tel.tel_test_anritsu_utils import LTE_BAND_2
+from acts.test_utils.tel.tel_test_anritsu_utils import LTE_BAND_4
+from acts.test_utils.tel.tel_test_anritsu_utils import LTE_BAND_12
+from acts.test_utils.tel.tel_test_anritsu_utils import WCDMA_BAND_1
+from acts.test_utils.tel.tel_test_anritsu_utils import WCDMA_BAND_2
# Different Cell configurations
# TMO bands
diff --git a/acts/tests/google/tel/live/TelLiveDataTest.py b/acts/tests/google/tel/live/TelLiveDataTest.py
index f5c9d35..9d64c58 100644
--- a/acts/tests/google/tel/live/TelLiveDataTest.py
+++ b/acts/tests/google/tel/live/TelLiveDataTest.py
@@ -20,17 +20,61 @@
import time
from acts.base_test import BaseTestClass
from queue import Empty
-from acts.test_utils.wifi_test_utils import WifiEnums
-from acts.test_utils.tel.tel_lookup_tables import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_data_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts.utils import load_config
-from acts.utils import enable_doze
+from acts.test_utils.tel.tel_defines import GEN_2G
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import RAT_2G
+from acts.test_utils.tel.tel_defines import RAT_3G
+from acts.test_utils.tel.tel_defines import RAT_4G
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import TETHERING_ENTITLEMENT_CHECK_TIMEOUT
+from acts.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import \
+ WAIT_TIME_FOR_DATA_STATUS_CHANGE_DURING_WIFI_TETHERING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_TETHERING_AFTER_REBOOT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WIFI_CONNECTION
+from acts.test_utils.tel.tel_data_utils import airplane_mode_test
+from acts.test_utils.tel.tel_data_utils import data_connectivity_single_bearer
+from acts.test_utils.tel.tel_data_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_data_utils import tethering_check_internet_connection
+from acts.test_utils.tel.tel_data_utils import wifi_cell_switching
+from acts.test_utils.tel.tel_data_utils import wifi_tethering_cleanup
+from acts.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
+from acts.test_utils.tel.tel_test_utils import WifiUtils
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import set_call_state_listen_level
+from acts.test_utils.tel.tel_test_utils import setup_sim
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.wifi_test_utils import WifiEnums
from acts.utils import disable_doze
-
-
+from acts.utils import enable_doze
+from acts.utils import load_config
+from acts.utils import rand_ascii_str
class TelLiveDataTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/live/TelLiveIwlanTest.py b/acts/tests/google/tel/live/TelLiveIwlanTest.py
index d222c1a..a7cbb2a 100644
--- a/acts/tests/google/tel/live/TelLiveIwlanTest.py
+++ b/acts/tests/google/tel/live/TelLiveIwlanTest.py
@@ -15,10 +15,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts.base_test import BaseTestClass
-from acts.test_utils.tel.tel_test_utils import *
+import time
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-
+from acts.test_utils.tel.tel_test_utils import WifiUtils
+from acts.test_utils.tel.tel_test_utils import is_droid_in_rat_family
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_ims_registered
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat
+from acts.test_utils.tel.tel_test_utils import wait_for_not_network_rat
+from acts.test_utils.tel.tel_test_utils import wait_for_volte_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IMS_REGISTRATION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_USER_PLANE_DATA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WFC_ENABLED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WIFI_CONNECTION
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
class TelLiveIwlanTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/live/TelLiveMsimTest.py b/acts/tests/google/tel/live/TelLiveMsimTest.py
index 38d9d4d..a74283e 100644
--- a/acts/tests/google/tel/live/TelLiveMsimTest.py
+++ b/acts/tests/google/tel/live/TelLiveMsimTest.py
@@ -18,14 +18,24 @@
"""
import time
-from acts.base_test import BaseTestClass
from queue import Empty
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts.test_utils.tel.tel_test_utils import *
-from acts.utils import load_config
-from acts.test_utils.wifi_test_utils import reset_droid_wifi
-from acts.test_utils.wifi_test_utils import start_wifi_connection_scan
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import RAT_3G
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_lookup_tables import is_rat_svd_capable
+from acts.test_utils.tel.tel_test_utils import TelTestUtilsError
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.wifi_test_utils import reset_wifi
from acts.test_utils.wifi_test_utils import wifi_toggle_state
+from acts.utils import load_config
class TelLiveMsimTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/live/TelLivePreflightTest.py b/acts/tests/google/tel/live/TelLivePreflightTest.py
index f7c973b..b60d863 100644
--- a/acts/tests/google/tel/live/TelLivePreflightTest.py
+++ b/acts/tests/google/tel/live/TelLivePreflightTest.py
@@ -18,17 +18,8 @@
"""
import time
-from acts.base_test import BaseTestClass
from queue import Empty
-from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts.test_utils.tel.tel_test_utils import get_operator_name
-from acts.test_utils.tel.tel_test_utils import get_sub_ids_for_sim_slots
-from acts.test_utils.tel.tel_test_utils import setup_droid_properties
-from acts.test_utils.tel.tel_test_utils import set_phone_screen_on
-from acts.test_utils.tel.tel_test_utils import set_phone_silent_mode
-from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts.test_utils.tel.tel_test_utils import wait_for_voice_attach_for_subscription
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.test_utils.tel.tel_defines import AOSP_PREFIX
from acts.test_utils.tel.tel_defines import CAPABILITY_PHONE
from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
@@ -43,13 +34,17 @@
from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
from acts.test_utils.tel.tel_lookup_tables import device_capabilities
from acts.test_utils.tel.tel_lookup_tables import operator_capabilities
-from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-
-
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import get_sub_ids_for_sim_slots
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.tel.tel_test_utils import set_phone_screen_on
+from acts.test_utils.tel.tel_test_utils import set_phone_silent_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import wait_for_voice_attach_for_subscription
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
from acts.utils import load_config
-
-
class TelLivePreflightTest(TelephonyBaseTest):
def __init__(self, controllers):
diff --git a/acts/tests/google/tel/live/TelLiveSmokeTest.py b/acts/tests/google/tel/live/TelLiveSmokeTest.py
index eb5f703..f670add 100644
--- a/acts/tests/google/tel/live/TelLiveSmokeTest.py
+++ b/acts/tests/google/tel/live/TelLiveSmokeTest.py
@@ -18,15 +18,37 @@
"""
import time
-from acts.base_test import BaseTestClass
-from queue import Empty
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_data_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
-from acts.utils import load_config
-from acts.utils import rand_ascii_str
from acts.keys import Config
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_data_utils import airplane_mode_test
+from acts.test_utils.tel.tel_data_utils import wifi_cell_switching
+from acts.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import TETHERING_ENTITLEMENT_CHECK_TIMEOUT
+from acts.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_lookup_tables import is_rat_svd_capable
+from acts.test_utils.tel.tel_test_utils import WifiUtils
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.utils import load_config
+from acts.utils import rand_ascii_str
SKIP = 'Skip'
diff --git a/acts/tests/google/tel/live/TelLiveSmsTest.py b/acts/tests/google/tel/live/TelLiveSmsTest.py
index 55c4387..4a0f237 100644
--- a/acts/tests/google/tel/live/TelLiveSmsTest.py
+++ b/acts/tests/google/tel/live/TelLiveSmsTest.py
@@ -18,17 +18,38 @@
"""
import time
-from acts.base_test import BaseTestClass
from queue import Empty
-from acts.test_utils.tel.tel_test_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_CDMA
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_GSM
+from acts.test_utils.tel.tel_defines import RAT_3G
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import set_call_state_listen_level
+from acts.test_utils.tel.tel_test_utils import setup_sim
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
from acts.test_utils.tel.tel_video_utils import phone_setup_video
from acts.test_utils.tel.tel_video_utils import is_phone_in_call_video_bidirectional
from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
from acts.utils import load_config
from acts.utils import rand_ascii_str
-from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-
class TelLiveSmsTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/live/TelLiveStressCallTest.py b/acts/tests/google/tel/live/TelLiveStressCallTest.py
index a503570..de4ac25 100644
--- a/acts/tests/google/tel/live/TelLiveStressCallTest.py
+++ b/acts/tests/google/tel/live/TelLiveStressCallTest.py
@@ -21,14 +21,14 @@
from acts.base_test import BaseTestClass
from queue import Empty
from acts.test_utils.tel import tel_defines
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
-from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
-from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
from acts.test_utils.tel.tel_test_utils import initiate_call
from acts.test_utils.tel.tel_test_utils import hangup_call
from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
from acts.test_utils.tel.tel_test_utils import ensure_phone_idle
from acts.test_utils.tel.tel_test_utils import verify_active_call_number
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
MAX_NUMBER_REDIALS = 20
INCORRECT_STATE_MSG = "Caller not in correct state!"
diff --git a/acts/tests/google/tel/live/TelLiveVideoDataTest.py b/acts/tests/google/tel/live/TelLiveVideoDataTest.py
index 5fc0f78..3fe991d 100644
--- a/acts/tests/google/tel/live/TelLiveVideoDataTest.py
+++ b/acts/tests/google/tel/live/TelLiveVideoDataTest.py
@@ -16,15 +16,16 @@
"""
Test Script for VT Data test
"""
-
-import time
-from queue import Empty
-
-from acts.base_test import BaseTestClass
-from acts.test_utils.tel.tel_video_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.utils import load_config
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_video_utils import \
+ is_phone_in_call_video_bidirectional
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.utils import load_config
class TelLiveVideoDataTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/live/TelLiveVideoTest.py b/acts/tests/google/tel/live/TelLiveVideoTest.py
index 262f021..8786b8c 100644
--- a/acts/tests/google/tel/live/TelLiveVideoTest.py
+++ b/acts/tests/google/tel/live/TelLiveVideoTest.py
@@ -19,13 +19,48 @@
import time
from queue import Empty
-
-from acts.base_test import BaseTestClass
-from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts.test_utils.tel.tel_video_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.utils import load_config
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
+from acts.test_utils.tel.tel_defines import VT_STATE_AUDIO_ONLY
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL_PAUSED
+from acts.test_utils.tel.tel_defines import VT_VIDEO_QUALITY_DEFAULT
+from acts.test_utils.tel.tel_defines import VT_STATE_RX_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_TX_ENABLED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_VIDEO_SESSION_EVENT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import EventSessionEvent
+from acts.test_utils.tel.tel_defines import EventTelecomVideoCallSessionEvent
+from acts.test_utils.tel.tel_defines import SessionEventRxPause
+from acts.test_utils.tel.tel_defines import SessionEventRxResume
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import disconnect_call_by_id
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_for_video_enabled
+from acts.test_utils.tel.tel_video_utils import get_call_id_in_video_state
+from acts.test_utils.tel.tel_video_utils import \
+ is_phone_in_call_video_bidirectional
+from acts.test_utils.tel.tel_video_utils import is_phone_in_call_voice_hd
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import \
+ verify_video_call_in_expected_state
+from acts.test_utils.tel.tel_video_utils import video_call_downgrade
+from acts.test_utils.tel.tel_video_utils import video_call_modify_video
+from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.test_utils.tel.tel_voice_utils import get_audio_route
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import set_audio_route
+from acts.utils import load_config
class TelLiveVideoTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
index acaee57..81d4eb0 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
@@ -18,12 +18,46 @@
"""
import time
-from acts.base_test import BaseTestClass
-from queue import Empty
-from acts.test_utils.tel.tel_voice_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.utils import load_config
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MERGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_SWAP_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
+from acts.test_utils.tel.tel_defines import CARRIER_VZW
+from acts.test_utils.tel.tel_defines import RAT_3G
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_CDMA
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_GSM
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import get_call_uri
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import is_uri_equivalent
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import set_call_state_listen_level
+from acts.test_utils.tel.tel_test_utils import setup_sim
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import swap_calls
+from acts.utils import load_config
class TelLiveVoiceConfTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/live/TelLiveVoiceTest.py b/acts/tests/google/tel/live/TelLiveVoiceTest.py
index 36d1bc1..81e7315 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceTest.py
@@ -19,7 +19,7 @@
import time
from acts.utils import load_config
-
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
@@ -29,13 +29,12 @@
from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
-from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
-
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
from acts.test_utils.tel.tel_test_utils import call_setup_teardown
from acts.test_utils.tel.tel_test_utils import \
call_voicemail_erase_all_pending_voicemail
@@ -53,35 +52,32 @@
from acts.test_utils.tel.tel_test_utils import verify_incall_state
from acts.test_utils.tel.tel_test_utils import wait_for_not_network_rat
from acts.test_utils.tel.tel_test_utils import WifiUtils
-
-from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts.test_utils.tel.tel_voice_utils import two_phone_call_short_seq
-from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts.test_utils.tel.tel_voice_utils import phone_idle_csfb
-from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts.test_utils.tel.tel_voice_utils import two_phone_call_long_seq
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
-from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
-from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
-from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
-from acts.test_utils.tel.tel_voice_utils import phone_idle_2g
-from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import \
phone_setup_iwlan_cellular_preferred
-from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
-from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts.test_utils.tel.tel_voice_utils import two_phone_call_leave_voice_mail
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-
-from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import phone_idle_2g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_leave_voice_mail
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_long_seq
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_short_seq
class TelLiveVoiceTest(TelephonyBaseTest):
diff --git a/acts/tests/google/tel/live/TelPowerTest.py b/acts/tests/google/tel/live/TelPowerTest.py
index d3db4ec..a4816c8 100644
--- a/acts/tests/google/tel/live/TelPowerTest.py
+++ b/acts/tests/google/tel/live/TelPowerTest.py
@@ -16,10 +16,15 @@
import math
import os
-import time
-from queue import Empty
-
-from acts.base_test import BaseTestClass
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import is_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import set_phone_screen_on
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
@@ -31,15 +36,6 @@
from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
-from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts.test_utils.tel.tel_test_utils import is_wfc_enabled
-from acts.test_utils.tel.tel_test_utils import set_phone_screen_on
-from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts.test_utils.tel.tel_test_utils import verify_incall_state
-from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
from acts.utils import create_dir
from acts.utils import disable_doze
from acts.utils import get_current_human_time
diff --git a/acts/tests/google/tel/live/TelWifiDataTest.py b/acts/tests/google/tel/live/TelWifiDataTest.py
index 2a457bd..0fdbe88 100644
--- a/acts/tests/google/tel/live/TelWifiDataTest.py
+++ b/acts/tests/google/tel/live/TelWifiDataTest.py
@@ -15,7 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts.base_test import BaseTestClass
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.test_utils.tel.tel_atten_utils import set_rssi
from acts.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
diff --git a/acts/tests/google/tel/live/TelWifiVoiceTest.py b/acts/tests/google/tel/live/TelWifiVoiceTest.py
index ecb56ef..665af24 100755
--- a/acts/tests/google/tel/live/TelWifiVoiceTest.py
+++ b/acts/tests/google/tel/live/TelWifiVoiceTest.py
@@ -17,15 +17,69 @@
Test Script for epdg RF shield box related tests.
"""
-import random
import time
-from acts.base_test import BaseTestClass
from queue import Empty
-from acts.test_utils.tel.tel_atten_utils import *
-from acts.test_utils.tel.tel_voice_utils import *
-from acts.test_utils.tel.tel_test_utils import *
-from acts.utils import load_config
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_atten_utils import set_rssi
+from acts.test_utils.tel.tel_defines import CELL_STRONG_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import CELL_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import INVALID_WIFI_RSSI
+from acts.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_IWLAN
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CALL_DROP
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_WIFI_RSSI_CALIBRATION_SCREEN_ON
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_WIFI_RSSI_CALIBRATION_WIFI_CONNECTED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import NetworkCallBack
+from acts.test_utils.tel.tel_defines import NetworkCallBackAvailable
+from acts.test_utils.tel.tel_defines import NetworkCallBackLost
+from acts.test_utils.tel.tel_test_utils import WifiUtils
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import is_network_call_back_event_match
+from acts.test_utils.tel.tel_test_utils import is_phone_in_call
+from acts.test_utils.tel.tel_test_utils import is_phone_not_in_call
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_droid_not_in_call
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.utils import load_config
# Attenuator name
ATTEN_NAME_FOR_WIFI = 'wifi0'