Skip to content

Commit 14f811f

Browse files
author
dtopuzov
committed
Fix tests
1 parent bdc8742 commit 14f811f

16 files changed

+248
-59
lines changed

‎testdata/files/library_add_JarLib_1.3.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.3.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.3.0.txt

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
lib
2+
lib/Android
3+
lib/Android/androidappproject.jar
4+
platforms/android/libs/androidappproject.jar
5+
platforms/android/libs/jni
6+
platforms/android/libs/jni/armeabi-v7a
7+
platforms/android/libs/jni/armeabi-v7a/libNativeScript.so
8+
platforms/android/libs/jni/x86
9+
platforms/android/libs/jni/x86/libNativeScript.so
10+
platforms/android/libs/nativescript.jar
11+
platforms/android/libs/widgets.jar
12+
platforms/android/src/main
13+
platforms/android/src/main/AndroidManifest.xml
14+
platforms/android/src/main/assets
15+
platforms/android/src/main/assets/app
16+
platforms/android/src/main/assets/app/app.css
17+
platforms/android/src/main/assets/app/app.js
18+
platforms/android/src/main/assets/app/LICENSE
19+
platforms/android/src/main/assets/app/main-page.js
20+
platforms/android/src/main/assets/app/main-page.xml
21+
platforms/android/src/main/assets/app/main-view-model.js
22+
platforms/android/src/main/assets/app/package.json
23+
platforms/android/src/main/assets/app/tns_modules
24+
platforms/android/src/main/assets/internal
25+
platforms/android/src/main/assets/internal/prepareExtend.js
26+
platforms/android/src/main/assets/metadata
27+
platforms/android/src/main/assets/metadata/treeNodeStream.dat
28+
platforms/android/src/main/assets/metadata/treeStringsStream.dat
29+
platforms/android/src/main/assets/metadata/treeValueStream.dat
30+
platforms/android/src/main/res
31+
platforms/android/src/main/res/drawable-hdpi
32+
platforms/android/src/main/res/drawable-hdpi/icon.png
33+
platforms/android/src/main/res/drawable-ldpi
34+
platforms/android/src/main/res/drawable-ldpi/icon.png
35+
platforms/android/src/main/res/drawable-mdpi
36+
platforms/android/src/main/res/drawable-mdpi/icon.png
37+
platforms/android/src/main/res/drawable-nodpi
38+
platforms/android/src/main/res/drawable-nodpi/splashscreen.9.png
39+
platforms/android/src/main/res/values
40+
platforms/android/src/main/res/values/strings.xml
41+
platforms/android/src/main/res/values/styles.xml
42+
platforms/android/src/main/res/values-v21
43+
platforms/android/src/main/res/values-v21/styles.xml

‎testdata/files/library_build_ProjLib_1.3.0.txt

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
lib/Android/android-support-v4.jar
2+
lib/Android/android.jar
3+
lib/Android/AndroidAppProject/.classpath
4+
lib/Android/AndroidAppProject/.project
5+
lib/Android/AndroidAppProject/.settings/org.eclipse.jdt.core.prefs
6+
lib/Android/AndroidAppProject/AndroidManifest.xml
7+
lib/Android/AndroidAppProject/bin/AndroidManifest.xml
8+
lib/Android/AndroidAppProject/bin/AndroidManifest.xml.d
9+
lib/Android/AndroidAppProject/bin/build.prop
10+
lib/Android/AndroidAppProject/bin/classes/com/example/androidappproject/BuildConfig.class
11+
lib/Android/AndroidAppProject/bin/classes/com/example/androidappproject/R$attr.class
12+
lib/Android/AndroidAppProject/bin/classes/com/example/androidappproject/R$drawable.class
13+
lib/Android/AndroidAppProject/bin/classes/com/example/androidappproject/R$string.class
14+
lib/Android/AndroidAppProject/bin/classes/com/example/androidappproject/R$style.class
15+
lib/Android/AndroidAppProject/bin/classes/com/example/androidappproject/R.class
16+
lib/Android/AndroidAppProject/bin/classes/com/example/MyClass.class
17+
lib/Android/AndroidAppProject/bin/classes.jar
18+
lib/Android/AndroidAppProject/bin/proguard.txt
19+
lib/Android/AndroidAppProject/bin/R.txt
20+
lib/Android/AndroidAppProject/bin/res/drawable-hdpi/ic_launcher.png
21+
lib/Android/AndroidAppProject/bin/res/drawable-mdpi/ic_launcher.png
22+
lib/Android/AndroidAppProject/bin/res/drawable-xhdpi/ic_launcher.png
23+
lib/Android/AndroidAppProject/build.xml
24+
lib/Android/AndroidAppProject/gen/com/example/androidappproject/BuildConfig.java
25+
lib/Android/AndroidAppProject/gen/com/example/androidappproject/R.java
26+
lib/Android/AndroidAppProject/gen/R.java.d
27+
lib/Android/AndroidAppProject/local.properties
28+
lib/Android/AndroidAppProject/proguard-project.txt
29+
lib/Android/AndroidAppProject/project.properties
30+
lib/Android/AndroidAppProject/res/drawable-hdpi/ic_launcher.png
31+
lib/Android/AndroidAppProject/res/drawable-mdpi/ic_launcher.png
32+
lib/Android/AndroidAppProject/res/drawable-xhdpi/ic_launcher.png
33+
lib/Android/AndroidAppProject/res/values/strings.xml
34+
lib/Android/AndroidAppProject/res/values/styles.xml
35+
lib/Android/AndroidAppProject/res/values-v11/styles.xml
36+
lib/Android/AndroidAppProject/res/values-v14/styles.xml
37+
lib/Android/AndroidAppProject/src/com/example/MyClass.java
38+
lib/Android/nativescript.jar
39+
platforms/android/.project
40+
platforms/android/AndroidManifest.xml
41+
platforms/android/assets/app/app.css
42+
platforms/android/assets/app/app.js
43+
platforms/android/assets/app/main-page.js
44+
platforms/android/assets/app/main-page.xml
45+
platforms/android/assets/app/main-view-model.js
46+
platforms/android/assets/app/package.json
47+
platforms/android/assets/internal/prepareExtend.js
48+
platforms/android/assets/metadata/treeNodeStream.dat
49+
platforms/android/assets/metadata/treeStringsStream.dat
50+
platforms/android/assets/metadata/treeValueStream.dat
51+
platforms/android/bin/AndroidManifest.xml
52+
platforms/android/bin/AndroidManifest.xml.d
53+
platforms/android/bin/build.prop
54+
platforms/android/bin/classes/com/example/androidappproject/R$drawable.class
55+
platforms/android/bin/classes/com/example/androidappproject/R$string.class
56+
platforms/android/bin/classes/com/example/androidappproject/R$style.class
57+
platforms/android/bin/classes/com/example/androidappproject/R.class
58+
platforms/android/bin/classes/org/nativescript/TNSApp/BuildConfig.class
59+
platforms/android/bin/classes/org/nativescript/TNSApp/R$attr.class
60+
platforms/android/bin/classes/org/nativescript/TNSApp/R$drawable.class
61+
platforms/android/bin/classes/org/nativescript/TNSApp/R$string.class
62+
platforms/android/bin/classes/org/nativescript/TNSApp/R$style.class
63+
platforms/android/bin/classes/org/nativescript/TNSApp/R.class
64+
platforms/android/bin/classes.dex
65+
platforms/android/bin/classes.dex.d
66+
platforms/android/bin/dexedLibs/
67+
platforms/android/bin/jarlist.cache
68+
platforms/android/bin/proguard.txt
69+
platforms/android/bin/R.txt
70+
platforms/android/bin/res/drawable-hdpi/icon.png
71+
platforms/android/bin/res/drawable-ldpi/icon.png
72+
platforms/android/bin/res/drawable-mdpi/icon.png
73+
platforms/android/bin/res/drawable-nodpi/splashscreen.9.png
74+
platforms/android/bin/TNSApp-debug-unaligned.apk
75+
platforms/android/bin/TNSApp-debug-unaligned.apk.d
76+
platforms/android/bin/TNSApp-debug.apk
77+
platforms/android/bin/TNSApp.ap_
78+
platforms/android/bin/TNSApp.ap_.d
79+
platforms/android/build.xml
80+
platforms/android/custom_rules.xml
81+
platforms/android/gen/com/example/androidappproject/R.java
82+
platforms/android/gen/org/nativescript/TNSApp/BuildConfig.java
83+
platforms/android/gen/org/nativescript/TNSApp/R.java
84+
platforms/android/gen/R.java.d
85+
platforms/android/libs/android-support-v4.jar
86+
platforms/android/libs/armeabi-v7a/libNativeScript.so
87+
platforms/android/libs/nativescript.jar
88+
platforms/android/libs/x86/libNativeScript.so
89+
platforms/android/local.properties
90+
platforms/android/proguard-project.txt
91+
platforms/android/project.properties
92+
platforms/android/res/drawable-hdpi/icon.png
93+
platforms/android/res/drawable-ldpi/icon.png
94+
platforms/android/res/drawable-mdpi/icon.png
95+
platforms/android/res/drawable-nodpi/splashscreen.9.png
96+
platforms/android/res/values/strings.xml
97+
platforms/android/res/values/styles.xml

‎testdata/files/platform_android_1.3.0.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
libs
2+
libs/jni
3+
libs/jni/armeabi-v7a
4+
libs/jni/armeabi-v7a/libNativeScript.so
5+
libs/jni/x86
6+
libs/jni/x86/libNativeScript.so
7+
libs/nativescript.jar
8+
libs/widgets.jar
9+
build-tools
10+
build-tools/metadata-generator.jar
11+
build.gradle
12+
src
13+
src/main
14+
src/main/assets
15+
src/main/assets/internal
16+
src/main/assets/internal/prepareExtend.js
17+
src/main/AndroidManifest.xml
18+
src/main/res
19+
src/main/res/values
20+
src/main/res/values/styles.xml
21+
src/main/res/values/strings.xml
22+
src/main/res/values-v21
23+
src/main/res/values-v21/styles.xml

‎tests/build_linux.py

+15-10
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ def test_201_Build_Android_WithPrepare(self):
9494

9595
# Even if project is already prepared build will prepare it again
9696
assert ("Project successfully prepared" in output)
97-
assert ("Creating TNSApp-debug-unaligned.apk and signing it with a debug key..." in output)
97+
98+
# Not valid for 1.3.0+
99+
# assert ("Creating TNSApp-debug-unaligned.apk and signing it with a debug key..." in output)
100+
98101
assert ("BUILD SUCCESSFUL" in output)
99102
assert ("Project successfully built" in output)
100103
assert FileExists("TNS_App/platforms/android/build/outputs/apk/TNSApp-debug.apk")
@@ -110,33 +113,35 @@ def test_300_Build_Android_WithAdditionalStylesXML(self):
110113

111114
# Even if project is already prepared build will prepare it again
112115
assert ("Project successfully prepared" in output)
113-
assert ("Creating TNSApp-debug-unaligned.apk and signing it with a debug key..." in output)
116+
117+
# Not valid for 1.3.0+
118+
# assert ("Creating TNSApp-debug-unaligned.apk and signing it with a debug key..." in output)
119+
114120
assert ("BUILD SUCCESSFUL" in output)
115121
assert ("Project successfully built" in output)
116122
assert FileExists("TNS_App/platforms/android/build/outputs/apk/TNSApp-debug.apk")
117123

118-
def test_300_Build_Android_WithDashInPath(self):
124+
def test_301_Build_Android_WithDashInPath(self):
119125
CreateProjectAndAddPlatform(projName="tns-app", platform="android", frameworkPath=androidRuntimePath)
120126

121127
# Verify project builds
122128
output = runAUT(tnsPath + " build android --path tns-app")
123129
assert ("Project successfully prepared" in output)
124-
assert ("Creating tnsapp-debug-unaligned.apk and signing it with a debug key..." in output)
130+
131+
# Not valid for 1.3.0+
132+
# assert ("Creating TNSApp-debug-unaligned.apk and signing it with a debug key..." in output)
133+
125134
assert ("BUILD SUCCESSFUL" in output)
126135
assert ("Project successfully built" in output)
127-
assert FileExists("tns-app/platforms/android/bin/tnsapp-debug.apk")
136+
assert FileExists("tns-app/platforms/android/build/outputs/apk/tnsapp-debug.apk")
128137

129138
# Verify project id
130139
output = runAUT("cat tns-app/package.json")
131140
assert ("org.nativescript.tnsapp" in output)
132141

133142
# Verify AndroidManifest.xml
134-
output = runAUT("cat tns-app/platforms/android/AndroidManifest.xml")
143+
output = runAUT("cat tns-app/platforms/android/src/main/AndroidManifest.xml")
135144
assert ("org.nativescript.tnsapp" in output)
136-
137-
# Verify Build.xml
138-
output = runAUT("cat tns-app/platforms/android/build.xml")
139-
assert ("tnsapp" in output)
140145

141146
@unittest.skip("TODO: Fix this test. Now build command opens a browser")
142147
def test_400_Build_MissingPlatform(self):

‎tests/emulate_linux.py

-3
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,7 @@ def test_210_Emulate_MissingPlatform(self):
100100
CreateProject(projName="TNS_App")
101101
output = runAUT(tnsPath + " emulate android --timeout 180 --path TNS_App", set_timeout=660)
102102
assert ("Copying template files..." in output)
103-
assert ("Updated project.properties" in output)
104-
assert ("Updated local.properties" in output)
105103
assert ("Project successfully created." in output)
106-
107104
assert ("Project successfully prepared" in output)
108105
assert ("Project successfully built" in output)
109106

‎tests/initinstall.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_004_InstallDefaults(self):
7474
assert ("Project successfully created" in output)
7575

7676
# Not valid for 1.3.0+
77-
# assert FileExists("TNS_App/platforms/android/build.xml")
77+
# assert FileExists("TNS_App/platforms/android/build.gradle")
7878
assert FileExists("TNS_App/platforms/android/build.gradle")
7979

8080
if 'Darwin' in platform.platform():
@@ -102,7 +102,7 @@ def test_005_InstallNodeModules(self):
102102
assert FileExists("TNS_App/node_modules/gulp")
103103

104104
# Not valid for 1.3.0+
105-
# assert FileExists("TNS_App/platforms/android/build.xml")
105+
# assert FileExists("TNS_App/platforms/android/build.gradle")
106106
assert FileExists("TNS_App/platforms/android/build.gradle")
107107

108108
if 'Darwin' in platform.platform():
@@ -126,7 +126,7 @@ def test_300_InstallNodeModulesIfNodeModulesFodlerExists(self):
126126
assert ("Project successfully created" in output)
127127
assert FileExists("TNS_App/node_modules/lodash")
128128
assert FileExists("TNS_App/node_modules/gulp")
129-
assert FileExists("TNS_App/platforms/android/build.xml")
129+
assert FileExists("TNS_App/platforms/android/build.gradle")
130130
if 'Darwin' in platform.platform():
131131
assert FileExists("TNS_App/platforms/ios/TNSApp.xcodeproj")
132132

@@ -137,9 +137,9 @@ def test_301_InstallAndPrepare(self):
137137
os.chdir(os.path.join(currentDir,"TNS_App"))
138138
runAUT("npm i gulp --save-dev")
139139
runAUT("npm i lodash --save")
140-
runAUT("cp -R template-hello-world TNS_App/app")
141140

142141
os.chdir(currentDir);
142+
runAUT("cp -R template-hello-world TNS_App/app")
143143
output = runAUT("cat TNS_App/package.json")
144144
assert ("devDependencies" in output)
145145
assert ("gulp" in output)
@@ -149,13 +149,13 @@ def test_301_InstallAndPrepare(self):
149149
assert ("Project successfully created" in output)
150150
assert FileExists("TNS_App/node_modules/lodash")
151151
assert FileExists("TNS_App/node_modules/gulp")
152-
assert FileExists("TNS_App/platforms/android/build.xml")
152+
assert FileExists("TNS_App/platforms/android/build.gradle")
153153

154154
output = runAUT(tnsPath + " prepare android --path TNS_App")
155155
assert ("Project successfully prepared" in output)
156156

157-
assert FileExists("TNS_App/platforms/android/assets/app/tns_modules/lodash")
158-
assert not FileExists("TNS_App/platforms/android/assets/app/tns_modules/gulp")
157+
assert FileExists("TNS_App/platforms/android/src/main/assets/app/tns_modules/lodash")
158+
assert not FileExists("TNS_App/platforms/android/src/main/assets/app/tns_modules/gulp")
159159

160160
if 'Darwin' in platform.platform():
161161
assert FileExists("TNS_App/platforms/ios/TNSApp.xcodeproj")

‎tests/library_linux.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,25 @@ 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.1.0.txt"))
28+
assert (CheckFilesExists("TNS_App", "library_add_JarLib_1.3.0.txt"))
2929

3030
Build(platform="android", path="TNS_App")
31-
assert (CheckFilesExists("TNS_App", "library_build_JarLib_1.1.0.txt"))
31+
assert (CheckFilesExists("TNS_App", "library_build_JarLib_1.3.0.txt"))
3232

33+
@unittest.skip("Skipped because of issue https://github.com/NativeScript/nativescript-cli/issues/838")
3334
def test_002_Library_Add_Android_ProjLib(self):
3435
CreateProject(projName="TNS_App", copyFrom="QA-TestApps/external-lib/external-lib-android")
3536
PlatformAdd(platform="android", frameworkPath=androidRuntimePath, path="TNS_App")
3637

3738
LibraryAdd(platform="android", libPath="QA-TestApps/external-lib/AndroidAppProject", path="TNS_App")
38-
assert (CheckFilesExists("TNS_App", "library_add_ProjLib_1.1.0.txt"))
39+
assert (CheckFilesExists("TNS_App", "library_add_ProjLib_1.3.0.txt"))
3940

4041
output = runAUT("cat TNS_App/lib/Android/AndroidAppProject/project.properties")
4142
assert ("target=android-22" in output)
4243
assert ("android.library=true" in output)
4344

4445
Build(platform="android", path="TNS_App")
45-
assert (CheckFilesExists("TNS_App", "library_build_ProjLib_1.1.0.txt"))
46+
assert (CheckFilesExists("TNS_App", "library_build_ProjLib_1.3.0.txt"))
4647

4748
#TODO: Implement this test.
4849
@unittest.skip("Not implemented.")

‎tests/livesync_android.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def test_013_LiveSync_Android_TnsModules_File(self):
116116
CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)
117117
Run(platform="android", path="TNS_App")
118118

119-
replace("TNS_App/app/tns_modules/application/application-common.js", "(\"globals\");", "(\"globals\"); // test")
119+
replace("TNS_App/node_modules/tns-core-modules/application/application-common.js", "(\"globals\");", "(\"globals\"); // test")
120120
LiveSync(platform="android", path="TNS_App")
121121

122122
output = catAppFile("android", "TNSApp", "app/tns_modules/application/application-common.js")
@@ -126,7 +126,7 @@ def test_014_LiveSync_Android_TnsModules_LICENSE(self):
126126
CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)
127127
Run(platform="android", path="TNS_App")
128128

129-
replace("TNS_App/app/tns_modules/LICENSE", "2015", "9999")
129+
replace("TNS_App/node_modules/tns-core-modules/LICENSE", "2015", "9999")
130130
LiveSync(platform="android", path="TNS_App")
131131

132132
output = catAppFile("android", "TNSApp", "app/tns_modules/LICENSE")

‎tests/livesync_ios.py

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

44
from helpers._os_lib import CleanupFolder, replace, catAppFile, uninstall_app
55
from helpers._tns_lib import iosRuntimePath, \

‎tests/livesync_linux.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def test_013_LiveSync_Android_TnsModules_File(self):
126126
CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)
127127
Run(platform="android", path="TNS_App")
128128

129-
replace("TNS_App/app/tns_modules/application/application-common.js", "(\"globals\");", "(\"globals\"); // test")
129+
replace("TNS_App/node_modules/tns-core-modules/application/application-common.js", "(\"globals\");", "(\"globals\"); // test")
130130
LiveSync(platform="android", path="TNS_App")
131131

132132
output = catAppFile("android", "TNSApp", "app/tns_modules/application/application-common.js")
@@ -136,7 +136,7 @@ def test_014_LiveSync_Android_TnsModules_LICENSE(self):
136136
CreateProjectAndAddPlatform(projName="TNS_App", platform="android", frameworkPath=androidRuntimePath)
137137
Run(platform="android", path="TNS_App")
138138

139-
replace("TNS_App/app/tns_modules/LICENSE", "2015", "9999")
139+
replace("TNS_App/node_modules/tns-core-modules/LICENSE", "2015", "9999")
140140
LiveSync(platform="android", path="TNS_App")
141141

142142
output = catAppFile("android", "TNSApp", "app/tns_modules/LICENSE")

0 commit comments

Comments
 (0)