Skip to content

Commit 27110dd

Browse files
dtopuzovdtopuzov
committed
refactor: nsconfig tests
Just refactoring to fix PEP8 warrnings, nothing changed in test logic.
1 parent 915fc4b commit 27110dd

16 files changed

+200
-182
lines changed

‎tests/nsconfig/build_android_ng_tests.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,21 @@ def setUpClass(cls):
2222
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationNG", TEST_RUN_HOME + "/ChangeAppLocationNG")
2323
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationAndNameNG",
2424
TEST_RUN_HOME + "/ChangeAppLocationAndNameNG")
25-
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationNG", TEST_RUN_HOME + "/ChangeAppResLocationNG")
25+
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationNG",
26+
TEST_RUN_HOME + "/ChangeAppResLocationNG")
2627
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationInRootNG",
2728
TEST_RUN_HOME + "/ChangeAppResLocationInRootNG")
2829
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameAppNG", TEST_RUN_HOME + "/RenameAppNG")
2930
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameAppResNG", TEST_RUN_HOME + "/RenameAppResNG")
3031
else:
31-
CreateNSConfigApps.createAppsNG(cls.__name__)
32+
CreateNSConfigApps.createAppsNG()
3233
if not File.exists(TEST_RUN_HOME + "/ChangeAppLocationNG"):
33-
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationNG", TEST_RUN_HOME + "/ChangeAppLocationNG")
34+
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationNG",
35+
TEST_RUN_HOME + "/ChangeAppLocationNG")
3436
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationAndNameNG",
3537
TEST_RUN_HOME + "/ChangeAppLocationAndNameNG")
36-
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationNG", TEST_RUN_HOME + "/ChangeAppResLocationNG")
38+
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationNG",
39+
TEST_RUN_HOME + "/ChangeAppResLocationNG")
3740
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationInRootNG",
3841
TEST_RUN_HOME + "/ChangeAppResLocationInRootNG")
3942
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameAppNG", TEST_RUN_HOME + "/RenameAppNG")

‎tests/nsconfig/build_android_tests.py

+4-11
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ def setUpClass(cls):
4343
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameApp", TEST_RUN_HOME + "/RenameApp")
4444
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameAppRes", TEST_RUN_HOME + "/RenameAppRes")
4545
else:
46-
CreateNSConfigApps.createApps(cls.__name__)
46+
CreateNSConfigApps.createApps()
4747
if not File.exists(TEST_RUN_HOME + "/ChangeAppLocation"):
4848
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocation", TEST_RUN_HOME + "/ChangeAppLocation")
4949
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationAndName",
5050
TEST_RUN_HOME + "/ChangeAppLocationAndName")
51-
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocation", TEST_RUN_HOME + "/ChangeAppResLocation")
51+
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocation",
52+
TEST_RUN_HOME + "/ChangeAppResLocation")
5253
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationInRoot",
5354
TEST_RUN_HOME + "/ChangeAppResLocationInRoot")
5455
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameApp", TEST_RUN_HOME + "/RenameApp")
@@ -105,13 +106,6 @@ def test_001_build_android(self, app_name):
105106
# Configs are respected
106107
assert 'debug' in File.read(os.path.join(self.app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, 'config.json'))
107108

108-
# And new platform specific file and verify next build is ok (test for issue #2697)
109-
# src = os.path.join(app_name, 'app', 'app.js')
110-
# dest_1 = os.path.join(app_name, 'app', 'new.android.js')
111-
# dest_2 = os.path.join(app_name, 'app', 'new.ios.js')
112-
# File.copy(src=src, dest=dest_1)
113-
# File.copy(src=src, dest=dest_2)
114-
115109
# Verify incremental native build
116110
before_build = datetime.datetime.now()
117111
output = Tns.build_android(attributes={"--path": self.app_name})
@@ -153,7 +147,7 @@ def test_001_build_android(self, app_name):
153147
assert output.count("Gradle build...") is 2, "Only one gradle build is triggered."
154148
assert build_time > 10, "Clean build takes less then 15 sec."
155149
assert build_time < 90, "Clean build takes more than 90 sec."
156-
#
150+
157151
@parameterized.expand([
158152
'ChangeAppLocation',
159153
'ChangeAppLocationAndName',
@@ -164,7 +158,6 @@ def test_001_build_android(self, app_name):
164158
])
165159
def test_002_build_android_release(self, app_name):
166160
self.app_name = app_name
167-
# self.platforms_android = self.app_name + "/" + TnsAsserts.PLATFORM_ANDROID
168161

169162
Tns.build_android(attributes={"--path": self.app_name,
170163
"--keyStorePath": ANDROID_KEYSTORE_PATH,

‎tests/nsconfig/build_ios_ng_tests.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,21 @@ def setUpClass(cls):
2222
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationNG", TEST_RUN_HOME + "/ChangeAppLocationNG")
2323
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationAndNameNG",
2424
TEST_RUN_HOME + "/ChangeAppLocationAndNameNG")
25-
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationNG", TEST_RUN_HOME + "/ChangeAppResLocationNG")
25+
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationNG",
26+
TEST_RUN_HOME + "/ChangeAppResLocationNG")
2627
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationInRootNG",
2728
TEST_RUN_HOME + "/ChangeAppResLocationInRootNG")
2829
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameAppNG", TEST_RUN_HOME + "/RenameAppNG")
2930
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameAppResNG", TEST_RUN_HOME + "/RenameAppResNG")
3031
else:
31-
CreateNSConfigApps.createAppsNG(cls.__name__)
32+
CreateNSConfigApps.createAppsNG()
3233
if not File.exists(TEST_RUN_HOME + "/ChangeAppLocationNG"):
33-
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationNG", TEST_RUN_HOME + "/ChangeAppLocationNG")
34+
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationNG",
35+
TEST_RUN_HOME + "/ChangeAppLocationNG")
3436
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocationAndNameNG",
3537
TEST_RUN_HOME + "/ChangeAppLocationAndNameNG")
36-
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationNG", TEST_RUN_HOME + "/ChangeAppResLocationNG")
38+
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationNG",
39+
TEST_RUN_HOME + "/ChangeAppResLocationNG")
3740
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppResLocationInRootNG",
3841
TEST_RUN_HOME + "/ChangeAppResLocationInRootNG")
3942
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameAppNG", TEST_RUN_HOME + "/RenameAppNG")

‎tests/nsconfig/build_ios_tests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def setUpClass(cls):
3131
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameApp", TEST_RUN_HOME + "/RenameApp")
3232
Folder.copy(TEST_RUN_HOME + "/data/Projects/RenameAppRes", TEST_RUN_HOME + "/RenameAppRes")
3333
else:
34-
CreateNSConfigApps.createApps(cls.__name__)
34+
CreateNSConfigApps.createApps()
3535

3636
if not File.exists(TEST_RUN_HOME + "/ChangeAppLocation"):
3737
Folder.copy(TEST_RUN_HOME + "/data/Projects/ChangeAppLocation", TEST_RUN_HOME + "/ChangeAppLocation")

0 commit comments

Comments
 (0)