Skip to content

Commit 74f6344

Browse files
symonkAutomatedTester
symonk
and
AutomatedTester
authored
python: test function names tidy up inline with pep8 (#10490)
* `python`: apply pep8 compliant snake case to tests * fix fallout from commented test changes; update everything inside `py/test/` Co-authored-by: David Burns <[email protected]>
1 parent cfec55b commit 74f6344

39 files changed

Lines changed: 609 additions & 608 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ Gemfile.lock
107107
.idea/inspectionProfiles/Project_Default.xml
108108
.idea/misc.xml
109109
third_party/py/googlestorage/client_secrets.json
110+
.venv
110111
venv
111112
venv3
112113
py/.idea

‎py/docs/source/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Selenium WebDriver is often used as a basis for testing web applications. Here
114114
self.browser = webdriver.Firefox()
115115
self.addCleanup(self.browser.quit)
116116
117-
def testPageTitle(self):
117+
def test_page_title(self):
118118
self.browser.get('http://www.google.com')
119119
self.assertIn('Google', self.browser.title)
120120

‎py/test/selenium/webdriver/common/alerts_tests.py‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def close_alert(driver):
3737
pass
3838

3939

40-
def testShouldBeAbleToOverrideTheWindowAlertMethod(driver, pages):
40+
def test_should_be_able_to_override_the_window_alert_method(driver, pages):
4141
pages.load("alerts.html")
4242
driver.execute_script(
4343
"window.alert = function(msg) { document.getElementById('text').innerHTML = msg; }")
@@ -48,79 +48,79 @@ def testShouldBeAbleToOverrideTheWindowAlertMethod(driver, pages):
4848
# if we're here, likely the alert is displayed
4949
# not dismissing it will affect other tests
5050
try:
51-
_waitForAlert(driver).dismiss()
51+
_wait_for_alert(driver).dismiss()
5252
except Exception:
5353
pass
5454
raise e
5555

5656

57-
def testShouldAllowUsersToAcceptAnAlertManually(driver, pages):
57+
def test_should_allow_users_to_accept_an_alert_manually(driver, pages):
5858
pages.load("alerts.html")
5959
driver.find_element(by=By.ID, value="alert").click()
60-
alert = _waitForAlert(driver)
60+
alert = _wait_for_alert(driver)
6161
alert.accept()
6262
# If we can perform any action, we're good to go
6363
assert "Testing Alerts" == driver.title
6464

6565

66-
def testShouldAllowUsersToAcceptAnAlertWithNoTextManually(driver, pages):
66+
def test_should_allow_users_to_accept_an_alert_with_no_text_manually(driver, pages):
6767
pages.load("alerts.html")
6868
driver.find_element(By.ID, "empty-alert").click()
69-
alert = _waitForAlert(driver)
69+
alert = _wait_for_alert(driver)
7070
alert.accept()
7171

7272
# If we can perform any action, we're good to go
7373
assert "Testing Alerts" == driver.title
7474

7575

76-
def testShouldGetTextOfAlertOpenedInSetTimeout(driver, pages):
76+
def test_should_get_text_of_alert_opened_in_set_timeout(driver, pages):
7777
pages.load("alerts.html")
7878
driver.find_element(By.ID, "slow-alert").click()
7979

8080
# DO NOT WAIT OR SLEEP HERE
8181
# This is a regression test for a bug where only the first switchTo call would throw,
8282
# and only if it happens before the alert actually loads.
8383

84-
alert = _waitForAlert(driver)
84+
alert = _wait_for_alert(driver)
8585
try:
8686
assert "Slow" == alert.text
8787
finally:
8888
alert.accept()
8989

9090

91-
def testShouldAllowUsersToDismissAnAlertManually(driver, pages):
91+
def test_should_allow_users_to_dismiss_an_alert_manually(driver, pages):
9292
pages.load("alerts.html")
9393
driver.find_element(by=By.ID, value="alert").click()
94-
alert = _waitForAlert(driver)
94+
alert = _wait_for_alert(driver)
9595
alert.dismiss()
9696
# If we can perform any action, we're good to go
9797
assert "Testing Alerts" == driver.title
9898

9999

100-
def testShouldAllowAUserToAcceptAPrompt(driver, pages):
100+
def test_should_allow_auser_to_accept_aprompt(driver, pages):
101101
pages.load("alerts.html")
102102
driver.find_element(by=By.ID, value="prompt").click()
103-
alert = _waitForAlert(driver)
103+
alert = _wait_for_alert(driver)
104104
alert.accept()
105105

106106
# If we can perform any action, we're good to go
107107
assert "Testing Alerts" == driver.title
108108

109109

110-
def testShouldAllowAUserToDismissAPrompt(driver, pages):
110+
def test_should_allow_auser_to_dismiss_aprompt(driver, pages):
111111
pages.load("alerts.html")
112112
driver.find_element(by=By.ID, value="prompt").click()
113-
alert = _waitForAlert(driver)
113+
alert = _wait_for_alert(driver)
114114
alert.dismiss()
115115

116116
# If we can perform any action, we're good to go
117117
assert "Testing Alerts" == driver.title
118118

119119

120-
def testShouldAllowAUserToSetTheValueOfAPrompt(driver, pages):
120+
def test_should_allow_auser_to_set_the_value_of_aprompt(driver, pages):
121121
pages.load("alerts.html")
122122
driver.find_element(by=By.ID, value="prompt").click()
123-
alert = _waitForAlert(driver)
123+
alert = _wait_for_alert(driver)
124124
alert.send_keys("cheese")
125125
alert.accept()
126126

@@ -130,11 +130,11 @@ def testShouldAllowAUserToSetTheValueOfAPrompt(driver, pages):
130130

131131
@pytest.mark.xfail_firefox
132132
@pytest.mark.xfail_remote
133-
def testSettingTheValueOfAnAlertThrows(driver, pages):
133+
def test_setting_the_value_of_an_alert_throws(driver, pages):
134134
pages.load("alerts.html")
135135
driver.find_element(By.ID, "alert").click()
136136

137-
alert = _waitForAlert(driver)
137+
alert = _wait_for_alert(driver)
138138
with pytest.raises(InvalidElementStateException):
139139
alert.send_keys("cheese")
140140
alert.accept()
@@ -148,11 +148,11 @@ def testSettingTheValueOfAnAlertThrows(driver, pages):
148148
condition=sys.platform == 'darwin',
149149
reason='https://bugs.chromium.org/p/chromedriver/issues/detail?id=26',
150150
run=False)
151-
def testAlertShouldNotAllowAdditionalCommandsIfDimissed(driver, pages):
151+
def test_alert_should_not_allow_additional_commands_if_dimissed(driver, pages):
152152
pages.load("alerts.html")
153153
driver.find_element(By.ID, "alert").click()
154154

155-
alert = _waitForAlert(driver)
155+
alert = _wait_for_alert(driver)
156156
alert.dismiss()
157157

158158
with pytest.raises(NoAlertPresentException):
@@ -162,12 +162,12 @@ def testAlertShouldNotAllowAdditionalCommandsIfDimissed(driver, pages):
162162
@pytest.mark.xfail_firefox(reason='Fails on travis')
163163
@pytest.mark.xfail_remote(reason='Fails on travis')
164164
@pytest.mark.xfail_safari
165-
def testShouldAllowUsersToAcceptAnAlertInAFrame(driver, pages):
165+
def test_should_allow_users_to_accept_an_alert_in_aframe(driver, pages):
166166
pages.load("alerts.html")
167167
driver.switch_to.frame(driver.find_element(By.NAME, "iframeWithAlert"))
168168
driver.find_element(By.ID, "alertInFrame").click()
169169

170-
alert = _waitForAlert(driver)
170+
alert = _wait_for_alert(driver)
171171
alert.accept()
172172

173173
assert "Testing Alerts" == driver.title
@@ -176,54 +176,54 @@ def testShouldAllowUsersToAcceptAnAlertInAFrame(driver, pages):
176176
@pytest.mark.xfail_firefox(reason='Fails on travis')
177177
@pytest.mark.xfail_remote(reason='Fails on travis')
178178
@pytest.mark.xfail_safari
179-
def testShouldAllowUsersToAcceptAnAlertInANestedFrame(driver, pages):
179+
def test_should_allow_users_to_accept_an_alert_in_anested_frame(driver, pages):
180180
pages.load("alerts.html")
181181
driver.switch_to.frame(driver.find_element(By.NAME, "iframeWithIframe"))
182182
driver.switch_to.frame(driver.find_element(By.NAME, "iframeWithAlert"))
183183

184184
driver.find_element(By.ID, "alertInFrame").click()
185185

186-
alert = _waitForAlert(driver)
186+
alert = _wait_for_alert(driver)
187187
alert.accept()
188188

189189
assert "Testing Alerts" == driver.title
190190

191191

192-
def testShouldThrowAnExceptionIfAnAlertHasNotBeenDealtWithAndDismissTheAlert():
192+
def test_should_throw_an_exception_if_an_alert_has_not_been_dealt_with_and_dismiss_the_alert():
193193
pass
194194
# //TODO(David) Complete this test
195195

196196

197-
def testPromptShouldUseDefaultValueIfNoKeysSent(driver, pages):
197+
def test_prompt_should_use_default_value_if_no_keys_sent(driver, pages):
198198
pages.load("alerts.html")
199199
driver.find_element(By.ID, "prompt-with-default").click()
200200

201-
alert = _waitForAlert(driver)
201+
alert = _wait_for_alert(driver)
202202
alert.accept()
203203

204204
txt = driver.find_element(By.ID, "text").text
205205
assert "This is a default value" == txt
206206

207207

208-
def testPromptShouldHaveNullValueIfDismissed(driver, pages):
208+
def test_prompt_should_have_null_value_if_dismissed(driver, pages):
209209
pages.load("alerts.html")
210210
driver.find_element(By.ID, "prompt-with-default").click()
211-
alert = _waitForAlert(driver)
211+
alert = _wait_for_alert(driver)
212212
alert.dismiss()
213213

214214
assert "null" == driver.find_element(By.ID, "text").text
215215

216216

217-
def testHandlesTwoAlertsFromOneInteraction(driver, pages):
217+
def test_handles_two_alerts_from_one_interaction(driver, pages):
218218
pages.load("alerts.html")
219219

220220
driver.find_element(By.ID, "double-prompt").click()
221221

222-
alert1 = _waitForAlert(driver)
222+
alert1 = _wait_for_alert(driver)
223223
alert1.send_keys("brie")
224224
alert1.accept()
225225

226-
alert2 = _waitForAlert(driver)
226+
alert2 = _wait_for_alert(driver)
227227
alert2.send_keys("cheddar")
228228
alert2.accept()
229229

@@ -232,18 +232,18 @@ def testHandlesTwoAlertsFromOneInteraction(driver, pages):
232232

233233

234234
@pytest.mark.xfail_safari
235-
def testShouldHandleAlertOnPageLoad(driver, pages):
235+
def test_should_handle_alert_on_page_load(driver, pages):
236236
pages.load("alerts.html")
237237
driver.find_element(By.ID, "open-page-with-onload-alert").click()
238-
alert = _waitForAlert(driver)
238+
alert = _wait_for_alert(driver)
239239
value = alert.text
240240
alert.accept()
241241
assert "onload" == value
242242

243243

244-
def testShouldHandleAlertOnPageLoadUsingGet(driver, pages):
244+
def test_should_handle_alert_on_page_load_using_get(driver, pages):
245245
pages.load("pageWithOnLoad.html")
246-
alert = _waitForAlert(driver)
246+
alert = _wait_for_alert(driver)
247247
value = alert.text
248248
alert.accept()
249249

@@ -253,39 +253,39 @@ def testShouldHandleAlertOnPageLoadUsingGet(driver, pages):
253253

254254
@pytest.mark.xfail_chrome(reason='Non W3C conformant')
255255
@pytest.mark.xfail_chromiumedge(reason='Non W3C conformant')
256-
def testShouldHandleAlertOnPageBeforeUnload(driver, pages):
256+
def test_should_handle_alert_on_page_before_unload(driver, pages):
257257
pages.load("pageWithOnBeforeUnloadMessage.html")
258258

259259
element = driver.find_element(By.ID, "navigate")
260260
element.click()
261261
WebDriverWait(driver, 3).until(EC.title_is("Testing Alerts"))
262262

263263

264-
def testShouldAllowTheUserToGetTheTextOfAnAlert(driver, pages):
264+
def test_should_allow_the_user_to_get_the_text_of_an_alert(driver, pages):
265265
pages.load("alerts.html")
266266
driver.find_element(by=By.ID, value="alert").click()
267-
alert = _waitForAlert(driver)
267+
alert = _wait_for_alert(driver)
268268
value = alert.text
269269
alert.accept()
270270
assert "cheese" == value
271271

272272

273-
def testShouldAllowTheUserToGetTheTextOfAPrompt(driver, pages):
273+
def test_should_allow_the_user_to_get_the_text_of_aprompt(driver, pages):
274274
pages.load("alerts.html")
275275
driver.find_element(By.ID, "prompt").click()
276276

277-
alert = _waitForAlert(driver)
277+
alert = _wait_for_alert(driver)
278278
value = alert.text
279279
alert.accept()
280280

281281
assert "Enter something" == value
282282

283283

284-
def testAlertShouldNotAllowAdditionalCommandsIfDismissed(driver, pages):
284+
def test_alert_should_not_allow_additional_commands_if_dismissed(driver, pages):
285285
pages.load("alerts.html")
286286
driver.find_element(By.ID, "alert").click()
287287

288-
alert = _waitForAlert(driver)
288+
alert = _wait_for_alert(driver)
289289
alert.accept()
290290

291291
with pytest.raises(NoAlertPresentException):
@@ -297,16 +297,16 @@ def testAlertShouldNotAllowAdditionalCommandsIfDismissed(driver, pages):
297297
@pytest.mark.xfail_remote(
298298
reason='https://bugzilla.mozilla.org/show_bug.cgi?id=1279211')
299299
@pytest.mark.xfail_chrome
300-
def testUnexpectedAlertPresentExceptionContainsAlertText(driver, pages):
300+
def test_unexpected_alert_present_exception_contains_alert_text(driver, pages):
301301
pages.load("alerts.html")
302302
driver.find_element(by=By.ID, value="alert").click()
303-
alert = _waitForAlert(driver)
303+
alert = _wait_for_alert(driver)
304304
value = alert.text
305305
with pytest.raises(UnexpectedAlertPresentException) as e:
306306
pages.load("simpleTest.html")
307307
assert value == e.value.alert_text
308308
assert "Alert Text: {}".format(value) in str(e)
309309

310310

311-
def _waitForAlert(driver):
311+
def _wait_for_alert(driver):
312312
return WebDriverWait(driver, 3).until(EC.alert_is_present())

0 commit comments

Comments
 (0)