Skip to content

Commit 5491c03

Browse files
KazuCocoaKazuCocoa
committed
use add_command
1 parent 131776b commit 5491c03

20 files changed

+89
-106
lines changed

‎appium/webdriver/extensions/android/network.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,19 @@ def set_network_speed(self, speed_type: str) -> Self:
157157
return self
158158

159159
def _add_commands(self) -> None:
160-
# noinspection PyProtectedMember,PyUnresolvedReferences
161-
commands = self.command_executor._commands
162-
commands[Command.TOGGLE_WIFI] = ('POST', '/session/$sessionId/appium/device/toggle_wifi')
163-
commands[Command.GET_NETWORK_CONNECTION] = (
160+
self.command_executor.add_command(Command.TOGGLE_WIFI, 'POST', '/session/$sessionId/appium/device/toggle_wifi')
161+
self.command_executor.add_command(
162+
Command.GET_NETWORK_CONNECTION,
164163
'GET',
165164
'/session/$sessionId/network_connection',
166165
)
167-
commands[Command.SET_NETWORK_CONNECTION] = (
166+
self.command_executor.add_command(
167+
Command.SET_NETWORK_CONNECTION,
168168
'POST',
169169
'/session/$sessionId/network_connection',
170170
)
171-
commands[Command.SET_NETWORK_SPEED] = (
171+
self.command_executor.add_command(
172+
Command.SET_NETWORK_SPEED,
172173
'POST',
173174
'/session/$sessionId/appium/device/network_speed',
174175
)

‎appium/webdriver/extensions/android/performance.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ def get_performance_data_types(self) -> List[str]:
7373
return self.mark_extension_absence(ext_name).execute(Command.GET_PERFORMANCE_DATA_TYPES)['value']
7474

7575
def _add_commands(self) -> None:
76-
# noinspection PyProtectedMember,PyUnresolvedReferences
77-
commands = self.command_executor._commands
78-
commands[Command.GET_PERFORMANCE_DATA] = (
76+
self.command_executor.add_command(
77+
Command.GET_PERFORMANCE_DATA,
7978
'POST',
8079
'/session/$sessionId/appium/getPerformanceData',
8180
)
82-
commands[Command.GET_PERFORMANCE_DATA_TYPES] = (
81+
self.command_executor.add_command(
82+
Command.GET_PERFORMANCE_DATA_TYPES,
8383
'POST',
8484
'/session/$sessionId/appium/performanceData/types',
8585
)

‎appium/webdriver/extensions/android/power.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ def set_power_ac(self, ac_state: str) -> Self:
7272
return self
7373

7474
def _add_commands(self) -> None:
75-
# noinspection PyProtectedMember,PyUnresolvedReferences
76-
commands = self.command_executor._commands
77-
commands[Command.SET_POWER_CAPACITY] = (
75+
self.command_executor.add_command(
76+
Command.SET_POWER_CAPACITY,
7877
'POST',
7978
'/session/$sessionId/appium/device/power_capacity',
8079
)
81-
commands[Command.SET_POWER_AC] = ('POST', '/session/$sessionId/appium/device/power_ac')
80+
self.command_executor.add_command(Command.SET_POWER_AC, 'POST', '/session/$sessionId/appium/device/power_ac')

‎appium/webdriver/extensions/android/sms.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,4 @@ def send_sms(self, phone_number: str, message: str) -> Self:
4747
return self
4848

4949
def _add_commands(self) -> None:
50-
# noinspection PyProtectedMember,PyUnresolvedReferences
51-
commands = self.command_executor._commands
52-
commands[Command.SEND_SMS] = ('POST', '/session/$sessionId/appium/device/send_sms')
50+
self.command_executor.add_command(Command.SEND_SMS, 'POST', '/session/$sessionId/appium/device/send_sms')

‎appium/webdriver/extensions/android/system_bars.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ def get_system_bars(self) -> Dict[str, Dict[str, Union[int, bool]]]:
5151
return self.mark_extension_absence(ext_name).execute(Command.GET_SYSTEM_BARS)['value']
5252

5353
def _add_commands(self) -> None:
54-
# noinspection PyProtectedMember,PyUnresolvedReferences
55-
commands = self.command_executor._commands
56-
commands[Command.GET_SYSTEM_BARS] = (
54+
self.command_executor.add_command(
55+
Command.GET_SYSTEM_BARS,
5756
'GET',
5857
'/session/$sessionId/appium/device/system_bars',
5958
)

‎appium/webdriver/extensions/applications.py‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,25 +248,27 @@ def app_strings(self, language: Union[str, None] = None, string_file: Union[str,
248248
return self.mark_extension_absence(ext_name).execute(Command.GET_APP_STRINGS, data)['value']
249249

250250
def _add_commands(self) -> None:
251-
# noinspection PyProtectedMember,PyUnresolvedReferences
252-
commands = self.command_executor._commands
253-
commands[Command.BACKGROUND] = ('POST', '/session/$sessionId/appium/app/background')
254-
commands[Command.IS_APP_INSTALLED] = (
251+
self.command_executor.add_command(Command.BACKGROUND, 'POST', '/session/$sessionId/appium/app/background')
252+
self.command_executor.add_command(
253+
Command.IS_APP_INSTALLED,
255254
'POST',
256255
'/session/$sessionId/appium/device/app_installed',
257256
)
258-
commands[Command.INSTALL_APP] = ('POST', '/session/$sessionId/appium/device/install_app')
259-
commands[Command.REMOVE_APP] = ('POST', '/session/$sessionId/appium/device/remove_app')
260-
commands[Command.TERMINATE_APP] = (
257+
self.command_executor.add_command(Command.INSTALL_APP, 'POST', '/session/$sessionId/appium/device/install_app')
258+
self.command_executor.add_command(Command.REMOVE_APP, 'POST', '/session/$sessionId/appium/device/remove_app')
259+
self.command_executor.add_command(
260+
Command.TERMINATE_APP,
261261
'POST',
262262
'/session/$sessionId/appium/device/terminate_app',
263263
)
264-
commands[Command.ACTIVATE_APP] = (
264+
self.command_executor.add_command(
265+
Command.ACTIVATE_APP,
265266
'POST',
266267
'/session/$sessionId/appium/device/activate_app',
267268
)
268-
commands[Command.QUERY_APP_STATE] = (
269+
self.command_executor.add_command(
270+
Command.QUERY_APP_STATE,
269271
'POST',
270272
'/session/$sessionId/appium/device/app_state',
271273
)
272-
commands[Command.GET_APP_STRINGS] = ('POST', '/session/$sessionId/appium/app/strings')
274+
self.command_executor.add_command(Command.GET_APP_STRINGS, 'POST', '/session/$sessionId/appium/app/strings')

‎appium/webdriver/extensions/clipboard.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ def get_clipboard_text(self) -> str:
9595
return self.get_clipboard(ClipboardContentType.PLAINTEXT).decode('UTF-8')
9696

9797
def _add_commands(self) -> None:
98-
# noinspection PyProtectedMember,PyUnresolvedReferences
99-
commands = self.command_executor._commands
100-
commands[Command.SET_CLIPBOARD] = (
98+
self.command_executor.add_command(
99+
Command.SET_CLIPBOARD,
101100
'POST',
102101
'/session/$sessionId/appium/device/set_clipboard',
103102
)
104-
commands[Command.GET_CLIPBOARD] = (
103+
self.command_executor.add_command(
104+
Command.GET_CLIPBOARD,
105105
'POST',
106106
'/session/$sessionId/appium/device/get_clipboard',
107107
)

‎appium/webdriver/extensions/context.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ def context(self) -> str:
5858
return self.current_context
5959

6060
def _add_commands(self) -> None:
61-
# noinspection PyProtectedMember,PyUnresolvedReferences
62-
commands = self.command_executor._commands
63-
commands[Command.CONTEXTS] = ('GET', '/session/$sessionId/contexts')
64-
commands[Command.GET_CURRENT_CONTEXT] = ('GET', '/session/$sessionId/context')
65-
commands[Command.SWITCH_TO_CONTEXT] = ('POST', '/session/$sessionId/context')
61+
self.command_executor.add_command(Command.CONTEXTS, 'GET', '/session/$sessionId/contexts')
62+
self.command_executor.add_command(Command.GET_CURRENT_CONTEXT, 'GET', '/session/$sessionId/context')
63+
self.command_executor.add_command(Command.SWITCH_TO_CONTEXT, 'POST', '/session/$sessionId/context')

‎appium/webdriver/extensions/device_time.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ def get_device_time(self, format: Optional[str] = None) -> str:
6363
return self.mark_extension_absence(ext_name).execute(Command.GET_DEVICE_TIME_POST, {'format': format})['value']
6464

6565
def _add_commands(self) -> None:
66-
# noinspection PyProtectedMember,PyUnresolvedReferences
67-
commands = self.command_executor._commands
68-
commands[Command.GET_DEVICE_TIME_GET] = (
66+
self.command_executor.add_command(
67+
Command.GET_DEVICE_TIME_GET,
6968
'GET',
7069
'/session/$sessionId/appium/device/system_time',
7170
)
72-
commands[Command.GET_DEVICE_TIME_POST] = (
71+
self.command_executor.add_command(
72+
Command.GET_DEVICE_TIME_POST,
7373
'POST',
7474
'/session/$sessionId/appium/device/system_time',
7575
)

‎appium/webdriver/extensions/execute_driver.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,4 @@ def __init__(self, res: Dict):
5757
return Result(response)
5858

5959
def _add_commands(self) -> None:
60-
# noinspection PyProtectedMember,PyUnresolvedReferences
61-
commands = self.command_executor._commands
62-
commands[Command.EXECUTE_DRIVER] = ('POST', '/session/$sessionId/appium/execute_driver')
60+
self.command_executor.add_command(Command.EXECUTE_DRIVER, 'POST', '/session/$sessionId/appium/execute_driver')

0 commit comments

Comments
 (0)