fix: use TestNativeScriptActivity and TestNativeScriptApplication whe…

…re necessary
NativeScript · Jan 7, 2024 · 869f046 · 869f046
1 parent 74beb80
commit 869f046
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,6 @@ thumbs.db
 android-runtime.iml
 test-app/build-tools/*.log
 test-app/analytics/build-statistics.json
-package-lock.json
+package-lock.json
+test-app/build-tools/jsparser/tests/cases/*/internal/livesync.js
+test-app/build-tools/*.jar
diff --git a/build.gradle b/build.gradle
@@ -252,8 +252,8 @@ task copyFilesToProjectTemeplate {
         copy {
             from "$TEST_APP_PATH/app/src/main/java/com/tns/"
             include "*.java"
-            exclude "NativeScriptApplication.java"
-            exclude "NativeScriptActivity.java"
+            exclude "TestNativeScriptApplication.java"
+            exclude "TestNativeScriptActivity.java"
             into "$DIST_FRAMEWORK_PATH/app/src/main/java/com/tns"
         }
         copy {

diff --git a/test-app/.gitignore b/test-app/.gitignore
@@ -21,6 +21,4 @@ app/app.iml
 treeNodeStream.dat
 treeStringsStream.dat
 treeValueStream.dat
-NativeScriptActivity.java
-NativeScriptApplication.java
 **/com/tns/gen
diff --git a/test-app/app/src/main/assets/app/MyActivity.js b/test-app/app/src/main/assets/app/MyActivity.js
@@ -12,7 +12,7 @@
 		}
 	}
 
-	@JavaProxy("com.tns.NativeScriptActivity")
+	@JavaProxy("com.tns.TestNativeScriptActivity")
 	class MyActivity extends android.app.Activity
 	{
 		onCreate(bundle: android.os.Bundle)

diff --git a/...ing-generator/src/test/java/org/nativescript/staticbindinggenerator/test/DataRowTest.java b/...ing-generator/src/test/java/org/nativescript/staticbindinggenerator/test/DataRowTest.java
@@ -37,7 +37,7 @@ public void testParseNamedExtend() throws IOException {
         Assert.assertEquals(row.getColumn(), "");
         Assert.assertEquals(row.getNewClassName(), "");
         Assert.assertEquals(row.getMethods()[0], "toString");
-        Assert.assertEquals(row.getFilename(), "com.tns.NativeScriptActivity");
+        Assert.assertEquals(row.getFilename(), "com.tns.TestNativeScriptActivity");
         Assert.assertEquals(row.getJsFilename(), "MyActivity.js");
         Assert.assertEquals(row.getInterfaces()[0], "");
     }

diff --git a/.../src/test/resources/org/nativescript/staticbindinggenerator/test/datarow-named-extend.txt b/.../src/test/resources/org/nativescript/staticbindinggenerator/test/datarow-named-extend.txt
@@ -1 +1 @@
-java.lang.Object*****toString*com.tns.NativeScriptActivity*MyActivity.js*
+java.lang.Object*****toString*com.tns.TestNativeScriptActivity*MyActivity.js*
diff --git a/test-app/runtests.gradle b/test-app/runtests.gradle
@@ -80,9 +80,9 @@ task startInstalledApk(type: Exec) {
         println "Starting test application"
 
         if (isWinOs) {
-            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"
+            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"
         } else {
-            commandLine "adb", runOnDeviceOrEmulator, "-e", "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.NativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
+            commandLine "adb", runOnDeviceOrEmulator, "-e", "shell", "am", "start", "-n", "com.tns.testapplication/com.tns.TestNativeScriptActivity", "-a", "android.intent.action.MAIN", "-c", "android.intent.category.LAUNCHER"
         }
     }
 }