Update test_200_calling_custom_generated_classes_declared_in_manifest

Author: dtopuzov

core/device/helpers/adb.py

@@ -68,7 +68,7 @@ def get_logcat(device_id):
         Dump the log and then exit (don't block).
         :param device_id: Device id.
         """
-        Adb.run(command='logcat -d', device_id=device_id)
+        return Adb.run(command='logcat -d', device_id=device_id)
 
     @staticmethod
     def clear_logcat(device_id):

data/apps/sbg-test-app.tgz

@@ -129,6 +129,14 @@ def test_310_prepare_should_flatten_scoped_dependencies(self):
         ng_path = os.path.join(self.app_name, TnsAsserts.PLATFORM_ANDROID_NPM_MODULES_PATH, '@angular', 'core')
         assert File.exists(ng_path), "Scoped dependencies are flattened, please see #1783!"
 
+    def test_320_unmet_peer_dependencies_do_not_stop_prepare(self):
+        Tns.create_app_ng(self.app_name, update_modules=False)
+        # Cleanup node_modules and let CLI install npm dependencies
+        Folder.cleanup(os.path.join(TEST_RUN_HOME, self.app_name, 'node_modules'))
+        output = Tns.prepare_android(attributes={"--path": self.app_name})
+        assert "requires a peer of tns-core-modules" in output, "No npm warning for unmet peer dependencies."
+        assert "but none was installed" in output, "No npm warning for unmet peer dependencies."
+
     def test_400_prepare_missing_or_missing_platform(self):
         Tns.create_app(self.app_name, update_modules=False)
 

data/apps/sbg-test-app/App_Resources/Android/AndroidManifest.xml

@@ -2,17 +2,25 @@
 Test for specific needs of Android runtime.
 """
 import os
+import subprocess
+import threading
 from time import sleep
 
 from core.base_class.BaseClass import BaseClass
 from core.device.emulator import Emulator
+from core.device.helpers.adb import ADB_PATH, Adb
 from core.osutils.file import File
 from core.osutils.folder import Folder
 from core.settings.settings import ANDROID_RUNTIME_PATH, EMULATOR_ID
 from core.tns.tns import Tns
 
 
 class RuntimeTests(BaseClass):
+    custom_js_file = os.path.join(BaseClass.app_name, "app", "my-custom-class.js")
+    tns_folder = os.path.join(BaseClass.app_name, "platforms", "android", "src", "main", "java", "com", "tns")
+    gen_folder = os.path.join(tns_folder, "gen")
+    generated_java_file = os.path.join(tns_folder, "MyJavaClass.java")
+
     @classmethod
     def setUpClass(cls):
         logfile = os.path.join("out", cls.__name__ + ".txt")
@@ -25,6 +33,22 @@ def tearDownClass(cls):
         BaseClass.tearDownClass()
         Folder.cleanup(cls.app_name)
 
+    def test_200_calling_custom_generated_classes_declared_in_manifest(self):
+        Tns.create_app(self.app_name, attributes={"--template": os.path.join("data", "apps", "sbg-test-app.tgz")})
+        Tns.platform_add_android(attributes={"--frameworkPath": ANDROID_RUNTIME_PATH, "--path": self.app_name})
+        Adb.clear_logcat(device_id=EMULATOR_ID)
+        Tns.run_android(attributes={"--path": self.app_name, "--device": EMULATOR_ID, "--justlaunch": ""})
+        sleep(10)
+        output = Adb.get_logcat(device_id=EMULATOR_ID)
+
+        # make sure app hasn't crashed
+        assert "Displayed org.nativescript.TNSApp/com.tns.ErrorReportActivity" not in output, \
+            "App crashed with error activity"
+        # check if we got called from custom activity that overrides the default one
+        assert "we got called from onCreate of custom-nativescript-activity.js" in output, "Expected output not found"
+        # make sure we called custom activity declared in manifest
+        assert "we got called from onCreate of my-custom-class.js" in output, "Expected output not found"
+
     def test_300_verbose_log_android(self):
         Tns.create_app(self.app_name,
                        attributes={"--template": os.path.join("data", "apps", "verbose-hello-world.tgz")})