Skip to content

Commit 1dc6d92

Browse files
mdmintzmdmintz
committed
Refactor the code
1 parent c7de291 commit 1dc6d92

File tree

10 files changed

+86
-74
lines changed

10 files changed

+86
-74
lines changed

‎seleniumbase/translate/chinese.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class 硒测试用例(BaseCase): # noqa
7-
87
def __init__(self, *args, **kwargs):
98
super(硒测试用例, self).__init__(*args, **kwargs)
109
self._language = "Chinese"
@@ -578,7 +577,6 @@ def 获取语言代码(self, *args, **kwargs):
578577

579578

580579
class MasterQA_中文(MasterQA, 硒测试用例):
581-
582580
def 校验(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "手动检查"

‎seleniumbase/translate/dutch.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class Testgeval(BaseCase):
7-
87
def __init__(self, *args, **kwargs):
98
super(Testgeval, self).__init__(*args, **kwargs)
109
self._language = "Dutch"
@@ -578,7 +577,6 @@ def taalcode_ophalen(self, *args, **kwargs):
578577

579578

580579
class MasterQA_Nederlands(MasterQA, Testgeval):
581-
582580
def controleren(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "Handmatige controle"

‎seleniumbase/translate/french.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class CasDeBase(BaseCase):
7-
87
def __init__(self, *args, **kwargs):
98
super(CasDeBase, self).__init__(*args, **kwargs)
109
self._language = "French"
@@ -578,7 +577,6 @@ def obtenir_code_de_langue(self, *args, **kwargs):
578577

579578

580579
class MasterQA_Français(MasterQA, CasDeBase):
581-
582580
def vérifier(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "Vérification manuelle"

‎seleniumbase/translate/italian.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class CasoDiProva(BaseCase):
7-
87
def __init__(self, *args, **kwargs):
98
super(CasoDiProva, self).__init__(*args, **kwargs)
109
self._language = "Italian"
@@ -578,7 +577,6 @@ def ottenere_codice_lingua(self, *args, **kwargs):
578577

579578

580579
class MasterQA_Italiano(MasterQA, CasoDiProva):
581-
582580
def verificare(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "Controllo manuale"

‎seleniumbase/translate/japanese.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class セレニウムテストケース(BaseCase): # noqa
7-
87
def __init__(self, *args, **kwargs):
98
super(セレニウムテストケース, self).__init__(*args, **kwargs)
109
self._language = "Japanese"
@@ -578,7 +577,6 @@ def 言語コードを取得する(self, *args, **kwargs):
578577

579578

580579
class MasterQA_日本語(MasterQA, セレニウムテストケース):
581-
582580
def を確認する(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "手動チェック"

‎seleniumbase/translate/korean.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class 셀레늄_테스트_케이스(BaseCase): # noqa
7-
87
def __init__(self, *args, **kwargs):
98
super(셀레늄_테스트_케이스, self).__init__(*args, **kwargs)
109
self._language = "Korean"
@@ -578,7 +577,6 @@ def 언어_코드를_얻을(self, *args, **kwargs):
578577

579578

580579
class MasterQA_한국어(MasterQA, 셀레늄_테스트_케이스):
581-
582580
def 확인(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "수동 검사"

‎seleniumbase/translate/master_dict.py

Lines changed: 86 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ def get_parent_class_lang(parent_class):
7474
parent_class_lang["ТестНаСелен"] = "Russian"
7575
parent_class_lang["CasoDePrueba"] = "Spanish"
7676
if parent_class not in parent_class_lang.keys():
77-
raise Exception("Invalid parent_class {%s} not in {%s}!"
78-
"" % (parent_class, parent_class_lang.keys()))
77+
raise Exception(
78+
"Invalid parent_class {%s} not in {%s}!"
79+
% (parent_class, parent_class_lang.keys())
80+
)
7981
return parent_class_lang[parent_class]
8082

8183
def get_mqa_par_class_lang(parent_class):
@@ -91,8 +93,10 @@ def get_mqa_par_class_lang(parent_class):
9193
parent_class_lang["MasterQA_Русский"] = "Russian"
9294
parent_class_lang["MasterQA_Español"] = "Spanish"
9395
if parent_class not in parent_class_lang.keys():
94-
raise Exception("Invalid parent_class {%s} not in {%s}!"
95-
"" % (parent_class, parent_class_lang.keys()))
96+
raise Exception(
97+
"Invalid parent_class {%s} not in {%s}!"
98+
% (parent_class, parent_class_lang.keys())
99+
)
96100
return parent_class_lang[parent_class]
97101

98102
def get_lang_parent_class(language):
@@ -108,8 +112,10 @@ def get_lang_parent_class(language):
108112
lang_parent_class["Russian"] = "ТестНаСелен"
109113
lang_parent_class["Spanish"] = "CasoDePrueba"
110114
if language not in lang_parent_class.keys():
111-
raise Exception("Invalid language {%s} not in {%s}!"
112-
"" % (language, lang_parent_class.keys()))
115+
raise Exception(
116+
"Invalid language {%s} not in {%s}!"
117+
% (language, lang_parent_class.keys())
118+
)
113119
return lang_parent_class[language]
114120

115121
def get_mqa_lang_par_class(language):
@@ -125,66 +131,88 @@ def get_mqa_lang_par_class(language):
125131
lang_parent_class["Russian"] = "MasterQA_Русский"
126132
lang_parent_class["Spanish"] = "MasterQA_Español"
127133
if language not in lang_parent_class.keys():
128-
raise Exception("Invalid language {%s} not in {%s}!"
129-
"" % (language, lang_parent_class.keys()))
134+
raise Exception(
135+
"Invalid language {%s} not in {%s}!"
136+
% (language, lang_parent_class.keys())
137+
)
130138
return lang_parent_class[language]
131139

132140
def get_import_line(language):
133141
import_line = {}
134142
# - The Default Import Line:
135-
import_line["English"] = (
136-
"from seleniumbase import BaseCase")
143+
import_line["English"] = "from seleniumbase import BaseCase"
137144
# - Translated Import Lines:
138-
import_line["Chinese"] = (
139-
"from seleniumbase.translate.chinese import 硒测试用例")
140-
import_line["Dutch"] = (
141-
"from seleniumbase.translate.dutch import Testgeval")
142-
import_line["French"] = (
143-
"from seleniumbase.translate.french import CasDeBase")
144-
import_line["Italian"] = (
145-
"from seleniumbase.translate.italian import CasoDiProva")
146-
import_line["Japanese"] = (
147-
"from seleniumbase.translate.japanese import セレニウムテストケース")
148-
import_line["Korean"] = (
149-
"from seleniumbase.translate.korean import 셀레늄_테스트_케이스")
150-
import_line["Portuguese"] = (
151-
"from seleniumbase.translate.portuguese import CasoDeTeste")
152-
import_line["Russian"] = (
153-
"from seleniumbase.translate.russian import ТестНаСелен")
154-
import_line["Spanish"] = (
155-
"from seleniumbase.translate.spanish import CasoDePrueba")
145+
import_line[
146+
"Chinese"
147+
] = "from seleniumbase.translate.chinese import 硒测试用例"
148+
import_line[
149+
"Dutch"
150+
] = "from seleniumbase.translate.dutch import Testgeval"
151+
import_line[
152+
"French"
153+
] = "from seleniumbase.translate.french import CasDeBase"
154+
import_line[
155+
"Italian"
156+
] = "from seleniumbase.translate.italian import CasoDiProva"
157+
import_line[
158+
"Japanese"
159+
] = "from seleniumbase.translate.japanese import セレニウムテストケース"
160+
import_line[
161+
"Korean"
162+
] = "from seleniumbase.translate.korean import 셀레늄_테스트_케이스"
163+
import_line[
164+
"Portuguese"
165+
] = "from seleniumbase.translate.portuguese import CasoDeTeste"
166+
import_line[
167+
"Russian"
168+
] = "from seleniumbase.translate.russian import ТестНаСелен"
169+
import_line[
170+
"Spanish"
171+
] = "from seleniumbase.translate.spanish import CasoDePrueba"
156172
if language not in import_line.keys():
157-
raise Exception("Invalid language {%s} not in {%s}!"
158-
"" % (language, import_line.keys()))
173+
raise Exception(
174+
"Invalid language {%s} not in {%s}!"
175+
% (language, import_line.keys())
176+
)
159177
return import_line[language]
160178

161179
def get_mqa_im_line(language):
162180
import_line = {}
163181
# - The Default Import Line:
164-
import_line["English"] = (
165-
"from seleniumbase import MasterQA")
182+
import_line["English"] = "from seleniumbase import MasterQA"
166183
# - Translated Import Lines:
167-
import_line["Chinese"] = (
168-
"from seleniumbase.translate.chinese import MasterQA_中文")
169-
import_line["Dutch"] = (
170-
"from seleniumbase.translate.dutch import MasterQA_Nederlands")
171-
import_line["French"] = (
172-
"from seleniumbase.translate.french import MasterQA_Français")
173-
import_line["Italian"] = (
174-
"from seleniumbase.translate.italian import MasterQA_Italiano")
175-
import_line["Japanese"] = (
176-
"from seleniumbase.translate.japanese import MasterQA_日本語")
177-
import_line["Korean"] = (
178-
"from seleniumbase.translate.korean import MasterQA_한국어")
179-
import_line["Portuguese"] = (
180-
"from seleniumbase.translate.portuguese import MasterQA_Português")
181-
import_line["Russian"] = (
182-
"from seleniumbase.translate.russian import MasterQA_Русский")
183-
import_line["Spanish"] = (
184-
"from seleniumbase.translate.spanish import MasterQA_Español")
184+
import_line[
185+
"Chinese"
186+
] = "from seleniumbase.translate.chinese import MasterQA_中文"
187+
import_line[
188+
"Dutch"
189+
] = "from seleniumbase.translate.dutch import MasterQA_Nederlands"
190+
import_line[
191+
"French"
192+
] = "from seleniumbase.translate.french import MasterQA_Français"
193+
import_line[
194+
"Italian"
195+
] = "from seleniumbase.translate.italian import MasterQA_Italiano"
196+
import_line[
197+
"Japanese"
198+
] = "from seleniumbase.translate.japanese import MasterQA_日本語"
199+
import_line[
200+
"Korean"
201+
] = "from seleniumbase.translate.korean import MasterQA_한국어"
202+
import_line[
203+
"Portuguese"
204+
] = "from seleniumbase.translate.portuguese import MasterQA_Português"
205+
import_line[
206+
"Russian"
207+
] = "from seleniumbase.translate.russian import MasterQA_Русский"
208+
import_line[
209+
"Spanish"
210+
] = "from seleniumbase.translate.spanish import MasterQA_Español"
185211
if language not in import_line.keys():
186-
raise Exception("Invalid language {%s} not in {%s}!"
187-
"" % (language, import_line.keys()))
212+
raise Exception(
213+
"Invalid language {%s} not in {%s}!"
214+
% (language, import_line.keys())
215+
)
188216
return import_line[language]
189217

190218
def get_locale_code(language):
@@ -200,8 +228,10 @@ def get_locale_code(language):
200228
locale_codes["Russian"] = "ru"
201229
locale_codes["Spanish"] = "es"
202230
if language not in locale_codes.keys():
203-
raise Exception("Invalid language {%s} not in {%s}!"
204-
"" % (language, locale_codes.keys()))
231+
raise Exception(
232+
"Invalid language {%s} not in {%s}!"
233+
% (language, locale_codes.keys())
234+
)
205235
return locale_codes[language]
206236

207237
def get_locale_list():
@@ -980,8 +1010,8 @@ class MD:
9801010
md["switch_to_default_content"][5] = "デフォルトのコンテンツに切り替える"
9811011
md["switch_to_default_content"][6] = "기본_콘텐츠로_전환"
9821012
md["switch_to_default_content"][7] = "mudar_para_o_conteúdo_padrão"
983-
md["switch_to_default_content"][8] = (
984-
"переключиться_на_содержимое_по_умолчанию")
1013+
switch_to_default_content_ru = "переключиться_на_содержимое_по_умолчанию"
1014+
md["switch_to_default_content"][8] = switch_to_default_content_ru
9851015
md["switch_to_default_content"][9] = "cambiar_al_contenido_predeterminado"
9861016

9871017
md["open_new_window"] = ["*"] * num_langs

‎seleniumbase/translate/portuguese.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class CasoDeTeste(BaseCase):
7-
87
def __init__(self, *args, **kwargs):
98
super(CasoDeTeste, self).__init__(*args, **kwargs)
109
self._language = "Portuguese"
@@ -578,7 +577,6 @@ def obter_código_de_idioma(self, *args, **kwargs):
578577

579578

580579
class MasterQA_Português(MasterQA, CasoDeTeste):
581-
582580
def verificar(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "Verificação manual"

‎seleniumbase/translate/russian.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class ТестНаСелен(BaseCase): # noqa
7-
87
def __init__(self, *args, **kwargs):
98
super(ТестНаСелен, self).__init__(*args, **kwargs)
109
self._language = "Russian"
@@ -578,7 +577,6 @@ def получить_код_языка(self, *args, **kwargs):
578577

579578

580579
class MasterQA_Русский(MasterQA, ТестНаСелен):
581-
582580
def подтвердить(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "Ручная проверка"

‎seleniumbase/translate/spanish.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55

66
class CasoDePrueba(BaseCase):
7-
87
def __init__(self, *args, **kwargs):
98
super(CasoDePrueba, self).__init__(*args, **kwargs)
109
self._language = "Spanish"
@@ -578,7 +577,6 @@ def obtener_código_de_idioma(self, *args, **kwargs):
578577

579578

580579
class MasterQA_Español(MasterQA, CasoDePrueba):
581-
582580
def verificar(self, *args, **kwargs):
583581
# "Manual Check"
584582
self.DEFAULT_VALIDATION_TITLE = "Comprobación manual"

0 commit comments

Comments
 (0)