Skip to content

Commit 7fde4e7

Browse files
author
dtopuzov
committed
Update tests
1 parent 04f4adb commit 7fde4e7

7 files changed

+570
-40
lines changed

‎testdata/files/library_add_JarLib_1.4.0.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
lib/Android/androidappproject.jar
2+
platforms/android/libs/androidappproject.jar

‎testdata/files/library_add_ProjLib_1.4.0.txt

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
lib/Android/AndroidAppProject/.classpath
2+
lib/Android/AndroidAppProject/.project
3+
lib/Android/AndroidAppProject/.settings/org.eclipse.jdt.core.prefs
4+
lib/Android/AndroidAppProject/AndroidManifest.xml
5+
lib/Android/AndroidAppProject/build.xml
6+
lib/Android/AndroidAppProject/local.properties
7+
lib/Android/AndroidAppProject/proguard-project.txt
8+
lib/Android/AndroidAppProject/project.properties
9+
lib/Android/AndroidAppProject/res/drawable-hdpi/ic_launcher.png
10+
lib/Android/AndroidAppProject/res/drawable-mdpi/ic_launcher.png
11+
lib/Android/AndroidAppProject/res/drawable-xhdpi/ic_launcher.png
12+
lib/Android/AndroidAppProject/res/values/strings.xml
13+
lib/Android/AndroidAppProject/res/values/styles.xml
14+
lib/Android/AndroidAppProject/res/values-v11/styles.xml
15+
lib/Android/AndroidAppProject/res/values-v14/styles.xml
16+
lib/Android/AndroidAppProject/src/com/example/MyClass.java

‎testdata/files/library_build_JarLib_1.4.0.txt

+426
Large diffs are not rendered by default.

‎testdata/files/platform_ios_current.txt

+108-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,113 @@
1-
metadataGenerator/bin/metadata-generation-build-step.sh
2-
metadataGenerator/bin/objc-metadata-generator
3-
NativeScript/include/NativeScript.h
4-
NativeScript/include/TNSRuntime+Inspector.h
5-
NativeScript/include/TNSRuntime.h
6-
NativeScript/lib/libNativeScript.a
1+
internal
2+
internal/main.m
3+
internal/metadata-generator
4+
internal/metadata-generator/bin
5+
internal/metadata-generator/bin/metadata-generation-build-step
6+
internal/metadata-generator/bin/objc-metadata-generator
7+
internal/metadata-generator/lib
8+
internal/metadata-generator/lib/clang
9+
internal/metadata-generator/lib/clang/3.7.0
10+
internal/metadata-generator/lib/clang/3.7.0/include
11+
internal/metadata-generator/lib/clang/3.7.0/include/__stddef_max_align_t.h
12+
internal/metadata-generator/lib/clang/3.7.0/include/__wmmintrin_aes.h
13+
internal/metadata-generator/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
14+
internal/metadata-generator/lib/clang/3.7.0/include/adxintrin.h
15+
internal/metadata-generator/lib/clang/3.7.0/include/altivec.h
16+
internal/metadata-generator/lib/clang/3.7.0/include/ammintrin.h
17+
internal/metadata-generator/lib/clang/3.7.0/include/arm_acle.h
18+
internal/metadata-generator/lib/clang/3.7.0/include/arm_neon.h
19+
internal/metadata-generator/lib/clang/3.7.0/include/avx2intrin.h
20+
internal/metadata-generator/lib/clang/3.7.0/include/avx512bwintrin.h
21+
internal/metadata-generator/lib/clang/3.7.0/include/avx512cdintrin.h
22+
internal/metadata-generator/lib/clang/3.7.0/include/avx512dqintrin.h
23+
internal/metadata-generator/lib/clang/3.7.0/include/avx512erintrin.h
24+
internal/metadata-generator/lib/clang/3.7.0/include/avx512fintrin.h
25+
internal/metadata-generator/lib/clang/3.7.0/include/avx512vlbwintrin.h
26+
internal/metadata-generator/lib/clang/3.7.0/include/avx512vldqintrin.h
27+
internal/metadata-generator/lib/clang/3.7.0/include/avx512vlintrin.h
28+
internal/metadata-generator/lib/clang/3.7.0/include/avxintrin.h
29+
internal/metadata-generator/lib/clang/3.7.0/include/bmi2intrin.h
30+
internal/metadata-generator/lib/clang/3.7.0/include/bmiintrin.h
31+
internal/metadata-generator/lib/clang/3.7.0/include/cpuid.h
32+
internal/metadata-generator/lib/clang/3.7.0/include/cuda_builtin_vars.h
33+
internal/metadata-generator/lib/clang/3.7.0/include/emmintrin.h
34+
internal/metadata-generator/lib/clang/3.7.0/include/f16cintrin.h
35+
internal/metadata-generator/lib/clang/3.7.0/include/float.h
36+
internal/metadata-generator/lib/clang/3.7.0/include/fma4intrin.h
37+
internal/metadata-generator/lib/clang/3.7.0/include/fmaintrin.h
38+
internal/metadata-generator/lib/clang/3.7.0/include/fxsrintrin.h
39+
internal/metadata-generator/lib/clang/3.7.0/include/htmintrin.h
40+
internal/metadata-generator/lib/clang/3.7.0/include/htmxlintrin.h
41+
internal/metadata-generator/lib/clang/3.7.0/include/ia32intrin.h
42+
internal/metadata-generator/lib/clang/3.7.0/include/immintrin.h
43+
internal/metadata-generator/lib/clang/3.7.0/include/Intrin.h
44+
internal/metadata-generator/lib/clang/3.7.0/include/inttypes.h
45+
internal/metadata-generator/lib/clang/3.7.0/include/iso646.h
46+
internal/metadata-generator/lib/clang/3.7.0/include/limits.h
47+
internal/metadata-generator/lib/clang/3.7.0/include/lzcntintrin.h
48+
internal/metadata-generator/lib/clang/3.7.0/include/mm3dnow.h
49+
internal/metadata-generator/lib/clang/3.7.0/include/mm_malloc.h
50+
internal/metadata-generator/lib/clang/3.7.0/include/mmintrin.h
51+
internal/metadata-generator/lib/clang/3.7.0/include/module.modulemap
52+
internal/metadata-generator/lib/clang/3.7.0/include/nmmintrin.h
53+
internal/metadata-generator/lib/clang/3.7.0/include/pmmintrin.h
54+
internal/metadata-generator/lib/clang/3.7.0/include/popcntintrin.h
55+
internal/metadata-generator/lib/clang/3.7.0/include/prfchwintrin.h
56+
internal/metadata-generator/lib/clang/3.7.0/include/rdseedintrin.h
57+
internal/metadata-generator/lib/clang/3.7.0/include/rtmintrin.h
58+
internal/metadata-generator/lib/clang/3.7.0/include/s390intrin.h
59+
internal/metadata-generator/lib/clang/3.7.0/include/shaintrin.h
60+
internal/metadata-generator/lib/clang/3.7.0/include/smmintrin.h
61+
internal/metadata-generator/lib/clang/3.7.0/include/stdalign.h
62+
internal/metadata-generator/lib/clang/3.7.0/include/stdarg.h
63+
internal/metadata-generator/lib/clang/3.7.0/include/stdatomic.h
64+
internal/metadata-generator/lib/clang/3.7.0/include/stdbool.h
65+
internal/metadata-generator/lib/clang/3.7.0/include/stddef.h
66+
internal/metadata-generator/lib/clang/3.7.0/include/stdint.h
67+
internal/metadata-generator/lib/clang/3.7.0/include/stdnoreturn.h
68+
internal/metadata-generator/lib/clang/3.7.0/include/tbmintrin.h
69+
internal/metadata-generator/lib/clang/3.7.0/include/tgmath.h
70+
internal/metadata-generator/lib/clang/3.7.0/include/tmmintrin.h
71+
internal/metadata-generator/lib/clang/3.7.0/include/unwind.h
72+
internal/metadata-generator/lib/clang/3.7.0/include/vadefs.h
73+
internal/metadata-generator/lib/clang/3.7.0/include/varargs.h
74+
internal/metadata-generator/lib/clang/3.7.0/include/vecintrin.h
75+
internal/metadata-generator/lib/clang/3.7.0/include/wmmintrin.h
76+
internal/metadata-generator/lib/clang/3.7.0/include/x86intrin.h
77+
internal/metadata-generator/lib/clang/3.7.0/include/xmmintrin.h
78+
internal/metadata-generator/lib/clang/3.7.0/include/xopintrin.h
79+
internal/metadata-generator/lib/clang/3.7.0/include/xtestintrin.h
80+
internal/NativeScript
81+
internal/NativeScript/Frameworks
82+
internal/NativeScript/Frameworks/NativeScript.framework
83+
internal/NativeScript/Frameworks/NativeScript.framework/_CodeSignature
84+
internal/NativeScript/Frameworks/NativeScript.framework/_CodeSignature/CodeResources
85+
internal/NativeScript/Frameworks/NativeScript.framework/Headers
86+
internal/NativeScript/Frameworks/NativeScript.framework/Headers/NativeScript.h
87+
internal/NativeScript/Frameworks/NativeScript.framework/Headers/TNSRuntime+Inspector.h
88+
internal/NativeScript/Frameworks/NativeScript.framework/Headers/TNSRuntime.h
89+
internal/NativeScript/Frameworks/NativeScript.framework/Info.plist
90+
internal/NativeScript/Frameworks/NativeScript.framework/NativeScript
91+
internal/NativeScript/include
92+
internal/NativeScript/include/NativeScript.h
93+
internal/NativeScript/include/TNSRuntime+Inspector.h
94+
internal/NativeScript/include/TNSRuntime.h
95+
internal/NativeScript/lib
96+
internal/NativeScript/lib/libNativeScript.a
97+
internal/nativescript-build.xcconfig
98+
internal/nativescript-post-build
99+
internal/nativescript-pre-build
100+
internal/nativescript-pre-link
101+
internal/strip-dynamic-framework-architectures.sh
102+
internal/TNSDebugging.h
103+
TNSApp
104+
TNSApp/build-debug.xcconfig
105+
TNSApp/build-release.xcconfig
7106
TNSApp/build.xcconfig
107+
TNSApp/en.lproj
8108
TNSApp/en.lproj/InfoPlist.strings
9109
TNSApp/en.lproj/LaunchScreen.xib
10-
TNSApp/main.m
11-
TNSApp/strip-dynamic-framework-architectures.sh
12110
TNSApp/TNSApp-Info.plist
13111
TNSApp/TNSApp-Prefix.pch
14-
TNSApp/TNSDebugging.h
15-
TNSApp.xcodeproj/project.pbxproj
112+
TNSApp.xcodeproj
113+
TNSApp.xcodeproj/project.pbxproj

‎testdata/files/platform_ios_symlink.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
TNSApp/build-debug.xcconfig
2+
TNSApp/build-release.xcconfig
13
TNSApp/build.xcconfig
24
TNSApp/en.lproj/InfoPlist.strings
35
TNSApp/en.lproj/LaunchScreen.xib
4-
TNSApp/main.m
5-
TNSApp/strip-dynamic-framework-architectures.sh
66
TNSApp/TNSApp-Info.plist
77
TNSApp/TNSApp-Prefix.pch
8-
TNSApp/TNSDebugging.h
9-
TNSApp.xcodeproj/project.pbxproj
8+
TNSApp.xcodeproj/project.pbxproj

‎tests/library_linux.py

+11-23
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,28 @@ def test_001_Library_Add_Android_JarLib(self):
2525
PlatformAdd(platform="android", frameworkPath=androidRuntimePath, path="TNS_App")
2626

2727
LibraryAdd(platform="android", libPath="QA-TestApps/external-lib", path="TNS_App")
28-
assert (CheckFilesExists("TNS_App", "library_add_JarLib_1.3.0.txt"))
28+
assert (CheckFilesExists("TNS_App", "library_add_JarLib_1.4.0.txt"))
2929

3030
Build(platform="android", path="TNS_App")
31-
assert (CheckFilesExists("TNS_App", "library_build_JarLib_1.3.0.txt"))
32-
33-
@unittest.skip("Skipped because of issue https://github.com/NativeScript/nativescript-cli/issues/838")
34-
def test_002_Library_Add_Android_ProjLib(self):
35-
CreateProject(projName="TNS_App", copyFrom="QA-TestApps/external-lib/external-lib-android")
36-
PlatformAdd(platform="android", frameworkPath=androidRuntimePath, path="TNS_App")
37-
38-
LibraryAdd(platform="android", libPath="QA-TestApps/external-lib/AndroidAppProject", path="TNS_App")
39-
assert (CheckFilesExists("TNS_App", "library_add_ProjLib_1.3.0.txt"))
40-
41-
output = runAUT("cat TNS_App/lib/Android/AndroidAppProject/project.properties")
42-
assert ("target=android-22" in output)
43-
assert ("android.library=true" in output)
44-
45-
Build(platform="android", path="TNS_App")
46-
assert (CheckFilesExists("TNS_App", "library_build_ProjLib_1.3.0.txt"))
31+
assert (CheckFilesExists("TNS_App", "library_build_JarLib_1.4.0.txt"))
4732

4833
#TODO: Implement this test.
4934
@unittest.skip("Not implemented.")
50-
def test_201_Library_Add_Android_JarLibs(self):
51-
pass
52-
53-
#TODO: Implement this test.
54-
@unittest.skip("Not implemented.")
55-
def test_202_Library_Add_Android_SharedLibraries(self):
35+
def test_201_Library_Add_Android_Lib(self):
5636
pass
5737

5838
def test_301_Library(self):
5939
output = runAUT(tnsPath + " library")
6040
assert CheckOutput(output, 'library_help_output.txt')
6141

42+
def test_400_Library_Add_Android_EclipseProjLib(self):
43+
CreateProject(projName="TNS_App", copyFrom="QA-TestApps/external-lib/external-lib-android")
44+
PlatformAdd(platform="android", frameworkPath=androidRuntimePath, path="TNS_App")
45+
46+
output = LibraryAdd(platform="android", libPath="QA-TestApps/external-lib/AndroidAppProject", path="TNS_App", assertSuccess=False)
47+
assert ("Unable to add android library" in output)
48+
assert ("You can use `library add` command only with path to folder containing one or more .jar files." in output)
49+
6250
def test_401_Library_Add_Android_NoLib(self):
6351
CreateProject(projName="TNS_App", copyFrom="QA-TestApps/external-lib/external-lib-android")
6452
PlatformAdd(platform="android", frameworkPath=androidRuntimePath, path="TNS_App")

‎tests/platform_osx.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ def test_001_Platform_List_IOS_Project(self):
4545

4646
def test_002_Platform_Add_iOS(self):
4747
CreateProject(projName="TNS_App")
48-
output = PlatformAdd(platform="ios", path="TNS_App", frameworkPath=iosRuntimeSymlinkPath, symlink=True)
48+
output = PlatformAdd(platform="ios", path="TNS_App", symlink=False)
4949
assert("Copying template files..." in output)
5050
assert("Project successfully created" in output)
5151

5252
if ('TESTRUN' in os.environ) and (not "SMOKE" in os.environ['TESTRUN']):
5353
assert CheckFilesExists('TNS_App/platforms/ios', 'platform_ios_1.3.0.txt')
5454
Build(platform="ios", path="TNS_App")
5555

56+
@unittest.skip("This test is not valid, adding symlink platform from npm cache cause issues")
5657
def test_003_Platform_Add_iOS_Symlink(self):
5758
CreateProject(projName="TNS_App")
5859
output = PlatformAdd(platform="ios", path="TNS_App", frameworkPath=iosRuntimeSymlinkPath, symlink=True)
@@ -79,8 +80,8 @@ def test_004_Platform_Add_iOS_Symlink_And_FrameworkPath(self):
7980

8081
# Verify Runtime is symlink
8182
output = runAUT("ls -la TNS_App/platforms/ios/")
82-
assert ("NativeScript ->" in output)
83-
assert ("package/framework/NativeScript" in output)
83+
assert ("internal ->" in output)
84+
assert ("package/framework/internal" in output)
8485

8586
def test_200_Platform_Add_iOS_FrameworkPath(self):
8687
CreateProject(projName="TNS_App")

0 commit comments

Comments
 (0)