Skip to content

Commit 869f046

Browse files
committed
fix: use TestNativeScriptActivity and TestNativeScriptApplication where necessary
1 parent 74beb80 commit 869f046

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ thumbs.db
2424
android-runtime.iml
2525
test-app/build-tools/*.log
2626
test-app/analytics/build-statistics.json
27-
package-lock.json
27+
package-lock.json
28+
test-app/build-tools/jsparser/tests/cases/*/internal/livesync.js
29+
test-app/build-tools/*.jar

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ task copyFilesToProjectTemeplate {
252252
copy {
253253
from "$TEST_APP_PATH/app/src/main/java/com/tns/"
254254
include "*.java"
255-
exclude "NativeScriptApplication.java"
256-
exclude "NativeScriptActivity.java"
255+
exclude "TestNativeScriptApplication.java"
256+
exclude "TestNativeScriptActivity.java"
257257
into "$DIST_FRAMEWORK_PATH/app/src/main/java/com/tns"
258258
}
259259
copy {

test-app/.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,4 @@ app/app.iml
2121
treeNodeStream.dat
2222
treeStringsStream.dat
2323
treeValueStream.dat
24-
NativeScriptActivity.java
25-
NativeScriptApplication.java
2624
**/com/tns/gen

test-app/app/src/main/assets/app/MyActivity.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
}
1414
15-
@JavaProxy("com.tns.NativeScriptActivity")
15+
@JavaProxy("com.tns.TestNativeScriptActivity")
1616
class MyActivity extends android.app.Activity
1717
{
1818
onCreate(bundle: android.os.Bundle)

test-app/build-tools/static-binding-generator/src/test/java/org/nativescript/staticbindinggenerator/test/DataRowTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void testParseNamedExtend() throws IOException {
3737
Assert.assertEquals(row.getColumn(), "");
3838
Assert.assertEquals(row.getNewClassName(), "");
3939
Assert.assertEquals(row.getMethods()[0], "toString");
40-
Assert.assertEquals(row.getFilename(), "com.tns.NativeScriptActivity");
40+
Assert.assertEquals(row.getFilename(), "com.tns.TestNativeScriptActivity");
4141
Assert.assertEquals(row.getJsFilename(), "MyActivity.js");
4242
Assert.assertEquals(row.getInterfaces()[0], "");
4343
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java.lang.Object*****toString*com.tns.NativeScriptActivity*MyActivity.js*
1+
java.lang.Object*****toString*com.tns.TestNativeScriptActivity*MyActivity.js*

test-app/runtests.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ task startInstalledApk(type: Exec) {
8080
println "Starting test application"
8181

8282
if (isWinOs) {
83-
commandLine "cmd", "/c", "adb", runOnDeviceOrEmulator, "-e", "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.NativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
83+
commandLine "cmd", "/c", "adb", runOnDeviceOrEmulator, "-e", "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.TestNativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
8484
} else {
85-
commandLine "adb", runOnDeviceOrEmulator, "-e", "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.NativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
85+
commandLine "adb", runOnDeviceOrEmulator, "-e", "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.TestNativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
8686
}
8787
}
8888
}

0 commit comments

Comments
 (0)