Skip to content

Commit 23326f7

Browse files
author
dtopuzov
committed
Update tests
1 parent 1d7ea1f commit 23326f7

7 files changed

+70
-123
lines changed

‎testdata/files/platform_ios_1.3.0.txt

-58
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,5 @@
11
metadataGenerator/bin/metadata-generation-build-step.sh
22
metadataGenerator/bin/objc-metadata-generator
3-
metadataGenerator/lib/clang/3.6.0/include/__stddef_max_align_t.h
4-
metadataGenerator/lib/clang/3.6.0/include/__wmmintrin_aes.h
5-
metadataGenerator/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
6-
metadataGenerator/lib/clang/3.6.0/include/adxintrin.h
7-
metadataGenerator/lib/clang/3.6.0/include/altivec.h
8-
metadataGenerator/lib/clang/3.6.0/include/ammintrin.h
9-
metadataGenerator/lib/clang/3.6.0/include/arm_acle.h
10-
metadataGenerator/lib/clang/3.6.0/include/arm_neon.h
11-
metadataGenerator/lib/clang/3.6.0/include/avx2intrin.h
12-
metadataGenerator/lib/clang/3.6.0/include/avx512bwintrin.h
13-
metadataGenerator/lib/clang/3.6.0/include/avx512erintrin.h
14-
metadataGenerator/lib/clang/3.6.0/include/avx512fintrin.h
15-
metadataGenerator/lib/clang/3.6.0/include/avx512vlbwintrin.h
16-
metadataGenerator/lib/clang/3.6.0/include/avx512vlintrin.h
17-
metadataGenerator/lib/clang/3.6.0/include/avxintrin.h
18-
metadataGenerator/lib/clang/3.6.0/include/bmi2intrin.h
19-
metadataGenerator/lib/clang/3.6.0/include/bmiintrin.h
20-
metadataGenerator/lib/clang/3.6.0/include/cpuid.h
21-
metadataGenerator/lib/clang/3.6.0/include/emmintrin.h
22-
metadataGenerator/lib/clang/3.6.0/include/f16cintrin.h
23-
metadataGenerator/lib/clang/3.6.0/include/float.h
24-
metadataGenerator/lib/clang/3.6.0/include/fma4intrin.h
25-
metadataGenerator/lib/clang/3.6.0/include/fmaintrin.h
26-
metadataGenerator/lib/clang/3.6.0/include/ia32intrin.h
27-
metadataGenerator/lib/clang/3.6.0/include/immintrin.h
28-
metadataGenerator/lib/clang/3.6.0/include/Intrin.h
29-
metadataGenerator/lib/clang/3.6.0/include/iso646.h
30-
metadataGenerator/lib/clang/3.6.0/include/limits.h
31-
metadataGenerator/lib/clang/3.6.0/include/lzcntintrin.h
32-
metadataGenerator/lib/clang/3.6.0/include/mm3dnow.h
33-
metadataGenerator/lib/clang/3.6.0/include/mm_malloc.h
34-
metadataGenerator/lib/clang/3.6.0/include/mmintrin.h
35-
metadataGenerator/lib/clang/3.6.0/include/module.modulemap
36-
metadataGenerator/lib/clang/3.6.0/include/nmmintrin.h
37-
metadataGenerator/lib/clang/3.6.0/include/pmmintrin.h
38-
metadataGenerator/lib/clang/3.6.0/include/popcntintrin.h
39-
metadataGenerator/lib/clang/3.6.0/include/prfchwintrin.h
40-
metadataGenerator/lib/clang/3.6.0/include/rdseedintrin.h
41-
metadataGenerator/lib/clang/3.6.0/include/rtmintrin.h
42-
metadataGenerator/lib/clang/3.6.0/include/shaintrin.h
43-
metadataGenerator/lib/clang/3.6.0/include/smmintrin.h
44-
metadataGenerator/lib/clang/3.6.0/include/stdalign.h
45-
metadataGenerator/lib/clang/3.6.0/include/stdarg.h
46-
metadataGenerator/lib/clang/3.6.0/include/stdatomic.h
47-
metadataGenerator/lib/clang/3.6.0/include/stdbool.h
48-
metadataGenerator/lib/clang/3.6.0/include/stddef.h
49-
metadataGenerator/lib/clang/3.6.0/include/stdint.h
50-
metadataGenerator/lib/clang/3.6.0/include/stdnoreturn.h
51-
metadataGenerator/lib/clang/3.6.0/include/tbmintrin.h
52-
metadataGenerator/lib/clang/3.6.0/include/tgmath.h
53-
metadataGenerator/lib/clang/3.6.0/include/tmmintrin.h
54-
metadataGenerator/lib/clang/3.6.0/include/unwind.h
55-
metadataGenerator/lib/clang/3.6.0/include/vadefs.h
56-
metadataGenerator/lib/clang/3.6.0/include/varargs.h
57-
metadataGenerator/lib/clang/3.6.0/include/wmmintrin.h
58-
metadataGenerator/lib/clang/3.6.0/include/x86intrin.h
59-
metadataGenerator/lib/clang/3.6.0/include/xmmintrin.h
60-
metadataGenerator/lib/clang/3.6.0/include/xopintrin.h
613
NativeScript/include/NativeScript.h
624
NativeScript/include/TNSRuntime+Inspector.h
635
NativeScript/include/TNSRuntime.h

‎testdata/files/platform_ios_current.txt

-58
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,5 @@
11
metadataGenerator/bin/metadata-generation-build-step.sh
22
metadataGenerator/bin/objc-metadata-generator
3-
metadataGenerator/lib/clang/3.6.0/include/__stddef_max_align_t.h
4-
metadataGenerator/lib/clang/3.6.0/include/__wmmintrin_aes.h
5-
metadataGenerator/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
6-
metadataGenerator/lib/clang/3.6.0/include/adxintrin.h
7-
metadataGenerator/lib/clang/3.6.0/include/altivec.h
8-
metadataGenerator/lib/clang/3.6.0/include/ammintrin.h
9-
metadataGenerator/lib/clang/3.6.0/include/arm_acle.h
10-
metadataGenerator/lib/clang/3.6.0/include/arm_neon.h
11-
metadataGenerator/lib/clang/3.6.0/include/avx2intrin.h
12-
metadataGenerator/lib/clang/3.6.0/include/avx512bwintrin.h
13-
metadataGenerator/lib/clang/3.6.0/include/avx512erintrin.h
14-
metadataGenerator/lib/clang/3.6.0/include/avx512fintrin.h
15-
metadataGenerator/lib/clang/3.6.0/include/avx512vlbwintrin.h
16-
metadataGenerator/lib/clang/3.6.0/include/avx512vlintrin.h
17-
metadataGenerator/lib/clang/3.6.0/include/avxintrin.h
18-
metadataGenerator/lib/clang/3.6.0/include/bmi2intrin.h
19-
metadataGenerator/lib/clang/3.6.0/include/bmiintrin.h
20-
metadataGenerator/lib/clang/3.6.0/include/cpuid.h
21-
metadataGenerator/lib/clang/3.6.0/include/emmintrin.h
22-
metadataGenerator/lib/clang/3.6.0/include/f16cintrin.h
23-
metadataGenerator/lib/clang/3.6.0/include/float.h
24-
metadataGenerator/lib/clang/3.6.0/include/fma4intrin.h
25-
metadataGenerator/lib/clang/3.6.0/include/fmaintrin.h
26-
metadataGenerator/lib/clang/3.6.0/include/ia32intrin.h
27-
metadataGenerator/lib/clang/3.6.0/include/immintrin.h
28-
metadataGenerator/lib/clang/3.6.0/include/Intrin.h
29-
metadataGenerator/lib/clang/3.6.0/include/iso646.h
30-
metadataGenerator/lib/clang/3.6.0/include/limits.h
31-
metadataGenerator/lib/clang/3.6.0/include/lzcntintrin.h
32-
metadataGenerator/lib/clang/3.6.0/include/mm3dnow.h
33-
metadataGenerator/lib/clang/3.6.0/include/mm_malloc.h
34-
metadataGenerator/lib/clang/3.6.0/include/mmintrin.h
35-
metadataGenerator/lib/clang/3.6.0/include/module.modulemap
36-
metadataGenerator/lib/clang/3.6.0/include/nmmintrin.h
37-
metadataGenerator/lib/clang/3.6.0/include/pmmintrin.h
38-
metadataGenerator/lib/clang/3.6.0/include/popcntintrin.h
39-
metadataGenerator/lib/clang/3.6.0/include/prfchwintrin.h
40-
metadataGenerator/lib/clang/3.6.0/include/rdseedintrin.h
41-
metadataGenerator/lib/clang/3.6.0/include/rtmintrin.h
42-
metadataGenerator/lib/clang/3.6.0/include/shaintrin.h
43-
metadataGenerator/lib/clang/3.6.0/include/smmintrin.h
44-
metadataGenerator/lib/clang/3.6.0/include/stdalign.h
45-
metadataGenerator/lib/clang/3.6.0/include/stdarg.h
46-
metadataGenerator/lib/clang/3.6.0/include/stdatomic.h
47-
metadataGenerator/lib/clang/3.6.0/include/stdbool.h
48-
metadataGenerator/lib/clang/3.6.0/include/stddef.h
49-
metadataGenerator/lib/clang/3.6.0/include/stdint.h
50-
metadataGenerator/lib/clang/3.6.0/include/stdnoreturn.h
51-
metadataGenerator/lib/clang/3.6.0/include/tbmintrin.h
52-
metadataGenerator/lib/clang/3.6.0/include/tgmath.h
53-
metadataGenerator/lib/clang/3.6.0/include/tmmintrin.h
54-
metadataGenerator/lib/clang/3.6.0/include/unwind.h
55-
metadataGenerator/lib/clang/3.6.0/include/vadefs.h
56-
metadataGenerator/lib/clang/3.6.0/include/varargs.h
57-
metadataGenerator/lib/clang/3.6.0/include/wmmintrin.h
58-
metadataGenerator/lib/clang/3.6.0/include/x86intrin.h
59-
metadataGenerator/lib/clang/3.6.0/include/xmmintrin.h
60-
metadataGenerator/lib/clang/3.6.0/include/xopintrin.h
613
NativeScript/include/NativeScript.h
624
NativeScript/include/TNSRuntime+Inspector.h
635
NativeScript/include/TNSRuntime.h

‎tests/build_linux.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import platform
33
import unittest
44

5-
from helpers._os_lib import CleanupFolder, CheckOutput, runAUT, FileExists
5+
from helpers._os_lib import CleanupFolder, runAUT, FileExists
66
from helpers._tns_lib import tnsPath, CreateProject, CreateProjectAndAddPlatform, \
77
androidRuntimePath, Prepare, androidKeyStorePath, androidKeyStorePassword, \
88
androidKeyStoreAlias, androidKeyStoreAliasPassword, PlatformAdd, \

‎tests/initinstall.py

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def test_001_Init_Defaults(self):
3939
output = runAUT("cat TNS_App/package.json")
4040
assert ("org.nativescript.TNSApp" in output)
4141
assert ("tns-android" in output)
42+
assert ("tns-core-modules" in output)
4243
if 'Darwin' in platform.platform():
4344
assert ("tns-ios" in output)
4445

‎tests/platform_osx.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import unittest
2-
import os, time
2+
import os
33

44
from helpers._os_lib import runAUT, CleanupFolder, CheckFilesExists, \
55
IsEmpty, FileExists

‎tests/plugins_linux.py

+33-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from helpers._os_lib import CleanupFolder, runAUT, FileExists
66
from helpers._tns_lib import CreateProjectAndAddPlatform, androidRuntimePath, \
7-
tnsPath, CreateProject
7+
tnsPath, CreateProject, PlatformAdd, Build
88

99

1010
class Plugins_Linux(unittest.TestCase):
@@ -87,7 +87,38 @@ def test_100_BuildAppWithPluginAddedInsideProject(self):
8787

8888
assert FileExists("TNS_App/platforms/android/build/outputs/apk/TNSApp-debug.apk")
8989
assert FileExists("TNS_App/platforms/android/src/main/assets/app/tns_modules/tns-plugin/index.js")
90-
90+
91+
def test_200_PluginAdd_Before_PlatformAdd_Android(self):
92+
CreateProject(projName="TNS_App");
93+
output = runAUT(tnsPath + " plugin add nativescript-telerik-ui --path TNS_App")
94+
if 'Windows' not in platform.platform():
95+
assert ("TNS_App/node_modules/nativescript-telerik-ui" in output)
96+
assert ("Successfully installed plugin nativescript-telerik-ui" in output)
97+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/package.json")
98+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/platforms/Android")
99+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/platforms/iOS")
100+
output = runAUT("cat TNS_App/package.json")
101+
assert ("org.nativescript.TNSApp" in output)
102+
assert ("dependencies" in output)
103+
assert ("nativescript-telerik-ui" in output)
104+
PlatformAdd(platform="android", frameworkPath=androidRuntimePath, path="TNS_App")
105+
Build(platform="android", path="TNS_App")
106+
107+
def test_201_PluginAdd_After_PlatformAdd_Android(self):
108+
CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)
109+
output = runAUT(tnsPath + " plugin add nativescript-telerik-ui --path TNS_App");
110+
if 'Windows' not in platform.platform():
111+
assert ("TNS_App/node_modules/nativescript-telerik-ui" in output)
112+
assert ("Successfully installed plugin nativescript-telerik-ui" in output)
113+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/package.json")
114+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/platforms/Android")
115+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/platforms/iOS")
116+
output = runAUT("cat TNS_App/package.json")
117+
assert ("org.nativescript.TNSApp" in output)
118+
assert ("dependencies" in output)
119+
assert ("nativescript-telerik-ui" in output)
120+
Build(platform="android", path="TNS_App")
121+
91122
def test_300_BuildAppWithPluginAddedOutsideProject(self):
92123

93124
CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)

‎tests/plugins_osx.py

+34-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import os
2+
import platform
23
import unittest
34

45
from helpers._os_lib import CleanupFolder, runAUT, FileExists
56
from helpers._tns_lib import CreateProjectAndAddPlatform, iosRuntimePath, \
6-
tnsPath, CreateProject, androidRuntimePath, PlatformAdd
7+
tnsPath, CreateProject, androidRuntimePath, PlatformAdd, Build
78

89

910
class Plugins_OSX(unittest.TestCase):
@@ -75,7 +76,38 @@ def test_100_BuildAppWithPluginInsideProject(self):
7576
assert ("** BUILD SUCCEEDED **" in output)
7677
assert not ("ERROR" in output)
7778
assert not ("malformed" in output)
78-
79+
80+
def test_200_PluginAdd_Before_PlatformAdd_iOS(self):
81+
CreateProject(projName="TNS_App");
82+
output = runAUT(tnsPath + " plugin add nativescript-telerik-ui --path TNS_App")
83+
if 'Windows' not in platform.platform():
84+
assert ("TNS_App/node_modules/nativescript-telerik-ui" in output)
85+
assert ("Successfully installed plugin nativescript-telerik-ui" in output)
86+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/package.json")
87+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/platforms/Android")
88+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/platforms/iOS")
89+
output = runAUT("cat TNS_App/package.json")
90+
assert ("org.nativescript.TNSApp" in output)
91+
assert ("dependencies" in output)
92+
assert ("nativescript-telerik-ui" in output)
93+
PlatformAdd(platform="ios", frameworkPath=iosRuntimePath, path="TNS_App")
94+
Build(platform="ios", path="TNS_App")
95+
96+
def test_201_PluginAdd_After_PlatformAdd_iOS(self):
97+
CreateProjectAndAddPlatform(projName="TNS_App", platform="ios", frameworkPath=iosRuntimePath)
98+
output = runAUT(tnsPath + " plugin add nativescript-telerik-ui --path TNS_App");
99+
if 'Windows' not in platform.platform():
100+
assert ("TNS_App/node_modules/nativescript-telerik-ui" in output)
101+
assert ("Successfully installed plugin nativescript-telerik-ui" in output)
102+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/package.json")
103+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/platforms/Android")
104+
assert FileExists("TNS_App/node_modules/nativescript-telerik-ui/platforms/iOS")
105+
output = runAUT("cat TNS_App/package.json")
106+
assert ("org.nativescript.TNSApp" in output)
107+
assert ("dependencies" in output)
108+
assert ("nativescript-telerik-ui" in output)
109+
Build(platform="ios", path="TNS_App")
110+
79111
def test_300_BuildAppWithPluginOutside(self):
80112

81113
CreateProjectAndAddPlatform(projName="TNS_App", platform="ios", frameworkPath=iosRuntimePath)
@@ -134,7 +166,6 @@ def test_301_BuildAppForBothPlatforms(self):
134166
assert not FileExists("TNS_App/platforms/android/src/main/assets/app/tns_modules/tns-plugin/test.android.js")
135167
assert not FileExists("TNS_App/platforms/android/src/main/assets/app/tns_modules/tns-plugin/test2.android.xml")
136168

137-
@unittest.skip("Skipped because of issue https://github.com/NativeScript/nativescript-cli/issues/842")
138169
def test_302_PlugingAndNPMModulesInSameProject(self):
139170
CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)
140171

0 commit comments

Comments
 (0)