Merge pull request #423 from NativeScript/release

dtopuzov · web-flow · commit 01673b5b4819 · 2019-11-05T13:13:20.000+02:00
core: merge release 6.2.0 in master
diff --git a/assets/runtime/android/files/android-runtime-1463-1459/analytics/gradle.properties b/assets/runtime/android/files/android-runtime-1463-1459/analytics/gradle.properties
@@ -0,0 +1 @@
+gatherAnalyticsData=true
diff --git a/assets/runtime/android/files/android-runtime-1463-1459/gradle.properties b/assets/runtime/android/files/android-runtime-1463-1459/gradle.properties
@@ -1 +1,2 @@
-useKotlin=true
+useKotlin=true
+gatherAnalyticsData=true
diff --git a/assets/runtime/android/files/android-runtime-1463-1459/no-analytics/gradle.properties b/assets/runtime/android/files/android-runtime-1463-1459/no-analytics/gradle.properties
@@ -0,0 +1 @@
+useKotlin=true
diff --git a/data/sync/blank_vue.py b/data/sync/blank_vue.py
@@ -4,6 +4,7 @@
 import os
 
 from core.enums.app_type import AppType
+from core.enums.os_type import OSType
 from core.log.log import Log
 from core.settings import Settings
 from core.utils.wait import Wait
@@ -47,7 +48,7 @@ def __workflow(preview, app_name, platform, device, bundle=True, hmr=True):
     device.get_screen(path=initial_state)
 
     # Verify that application is not restarted on file changes when hmr=true
-    if hmr:
+    if hmr and Settings.HOST_OS != OSType.WINDOWS:
         not_existing_string_list = ['Restarting application']
     else:
         not_existing_string_list = None
diff --git a/data/sync/hello_world_js.py b/data/sync/hello_world_js.py
@@ -83,7 +83,7 @@ def __sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=True,
         raise ValueError('Invalid app_type value.')
 
     # Verify that application is not restarted on file changes when hmr=true
-    if hmr:
+    if hmr and Settings.HOST_OS != OSType.WINDOWS:
         not_existing_string_list = ['Restarting application']
     else:
         not_existing_string_list = None
diff --git a/data/sync/hello_world_ng.py b/data/sync/hello_world_ng.py
@@ -7,6 +7,7 @@
 from core.enums.app_type import AppType
 from core.enums.device_type import DeviceType
 from core.enums.platform_type import Platform
+from core.enums.os_type import OSType
 from core.settings import Settings
 from data.changes import Changes, Sync
 from data.const import Colors
@@ -48,7 +49,7 @@ def sync_hello_world_ng(app_name, platform, device, bundle=True, uglify=False, a
     result = run_hello_world_ng(app_name=app_name, platform=platform, device=device, uglify=uglify, aot=aot, hmr=hmr)
 
     # Verify that application is not restarted on file changes when hmr=true
-    if hmr:
+    if hmr and Settings.HOST_OS != OSType.WINDOWS:
         not_existing_string_list = ['Restarting application']
     else:
         not_existing_string_list = None
@@ -142,7 +143,7 @@ def preview_sync_hello_world_ng(app_name, platform, device, bundle=True, hmr=Tru
                                     instrumented=instrumented, click_open_alert=click_open_alert)
 
     # Verify that application is not restarted on file changes when hmr=true
-    if hmr:
+    if hmr and Settings.HOST_OS != OSType.WINDOWS:
         not_existing_string_list = ['Restarting application']
     else:
         not_existing_string_list = None
diff --git a/data/sync/master_detail_vue.py b/data/sync/master_detail_vue.py
@@ -7,6 +7,7 @@
 
 from core.enums.app_type import AppType
 from core.enums.platform_type import Platform
+from core.enums.os_type import OSType
 from core.settings import Settings
 from core.utils.appium.appium_driver import AppiumDriver
 from core.utils.wait import Wait
@@ -37,7 +38,7 @@ def sync_master_detail_vue(app_name, platform, device, bundle=True, hmr=True):
     device.get_screen(path=initial_state)
 
     # Verify that application is not restarted on file changes when hmr=true
-    if hmr:
+    if hmr and Settings.HOST_OS != OSType.WINDOWS:
         not_existing_string_list = ['Restarting application']
     else:
         not_existing_string_list = None
diff --git a/tests/cli/build/android_app_bundle_tests.py b/tests/cli/build/android_app_bundle_tests.py
@@ -85,7 +85,7 @@ def test_100_run_android_app_bundle_compile_snapshot(self):
 
         # Verify app can be deployed on emulator via nativescript
         # Verify app looks correct inside emulator
-        self.emu.wait_for_text(text='TAP')
+        self.emu.wait_for_text(text='TAP', timeout=240)
 
         # Verify that the correct .so file is included in the package
         File.unzip(path_to_apks, os.path.join(self.app_name, 'apks'))
diff --git a/tests/runtimes/android/android_plugins_tests.py b/tests/runtimes/android/android_plugins_tests.py
@@ -3,6 +3,7 @@
 """
 # pylint: disable=invalid-name
 import os
+import json
 
 from core.base_test.tns_test import TnsTest
 from core.utils.assertions import Assert
@@ -19,6 +20,7 @@
 PLATFORM_ANDROID_APK_DEBUG_PATH = os.path.join('platforms', 'android', 'app', 'build', 'outputs', 'apk', 'debug')
 APP_NAME = AppName.DEFAULT
 APK_DEBUG_PATH = os.path.join(TEST_RUN_HOME, APP_NAME, PLATFORM_ANDROID_APK_DEBUG_PATH, "app-debug.apk")
+ANALYTICS_FILE = os.path.join(TEST_RUN_HOME, APP_NAME, 'platforms', 'android', 'analytics', 'build-statistics.json')
 
 
 class AndroidRuntimePluginTests(TnsTest):
@@ -39,6 +41,14 @@ def tearDownClass(cls):
         TnsTest.tearDownClass()
         Folder.clean(os.path.join(TEST_RUN_HOME, APP_NAME))
 
+    @staticmethod
+    def assert_kotlin_is_working(emulator):
+        assert File.exists(APK_DEBUG_PATH)
+        assert File.is_file_in_zip(APK_DEBUG_PATH, os.path.join("kotlin")), "Kotlin is not working!"
+        Device.click(emulator, text="TAP", case_sensitive=True)
+        error_message = "Kotlin code is not executed correctly! Logs: "
+        assert "Kotlin is here!" in Adb.get_logcat(emulator.id), error_message + Adb.get_logcat(emulator.id)
+
     def test_308_native_package_in_plugin_include_gradle_with_compile(self):
         """
          Test native packages in plugin could be used with compile in include gradle
@@ -334,17 +344,8 @@ def test_451_support_external_buildscript_config_in_plugin(self):
         Tns.plugin_add(plugin_path, path=APP_NAME, verify=False)
 
         Tns.build_android(os.path.join(TEST_RUN_HOME, APP_NAME), verify=True)
-
         Tns.plugin_remove("sample-plugin-2", verify=False, path=APP_NAME)
 
-    @staticmethod
-    def assert_kotlin_is_working(emulator):
-        assert File.exists(APK_DEBUG_PATH)
-        assert File.is_file_in_zip(APK_DEBUG_PATH, os.path.join("kotlin")), "Kotlin is not working!"
-        Device.click(emulator, text="TAP", case_sensitive=True)
-        error_message = "Kotlin code is not executed correctly! Logs: "
-        assert "Kotlin is here!" in Adb.get_logcat(emulator.id), error_message + Adb.get_logcat(emulator.id)
-
     def test_452_support_gradle_properties_for_enable_Kotlin_with_jar(self):
         """
         Support gradle.properties file for enable Kotlin
@@ -371,22 +372,75 @@ def test_452_support_gradle_properties_for_enable_Kotlin_with_jar(self):
         strings = ['Project successfully built',
                    'Successfully installed on device with identifier', self.emulator.id,
                    'Successfully synced application']
-
         test_result = Wait.until(lambda: all(string in File.read(log.log_file) for string in strings), timeout=300,
                                  period=5)
         messages = "App with Kotlin enabled and kotlin jar not build correctly! Logs: "
         assert test_result, messages + File.read(log.log_file)
 
         self.assert_kotlin_is_working(self.emulator)
+        with open(ANALYTICS_FILE, "r") as read_file:
+            data = json.load(read_file)
+            error_message = "kotlinUsage->hasKotlinRuntimeClasses is not set to True! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasKotlinRuntimeClasses"] is True, error_message
+            error_message = "kotlinUsage->hasUseKotlinPropertyInApp is not set to True! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasUseKotlinPropertyInApp"] is True, error_message
+
+    def test_453_support_Kotlin_with_jar_without_use_kotlin(self):
+        """
+        Support gradle.properties file for enable Kotlin
+        https://github.com/NativeScript/android-runtime/issues/1459
+        https://github.com/NativeScript/android-runtime/issues/1463
+        """
+
+        source_app_gradle = os.path.join(TEST_RUN_HOME, 'assets', 'runtime', 'android', 'files',
+                                         'android-runtime-1463-1459', 'analytics', 'gradle.properties')
+        target_app_gradle = os.path.join(TEST_RUN_HOME, APP_NAME, 'app', 'App_Resources', 'Android')
+        File.copy(source=source_app_gradle, target=target_app_gradle, backup_files=True)
+        source_app_gradle = os.path.join(TEST_RUN_HOME, 'assets', 'runtime', 'android', 'files',
+                                         'android-runtime-1463-1459', 'test-jar-1.0-SNAPSHOT.jar')
+        target_app_gradle = os.path.join(TEST_RUN_HOME, APP_NAME, 'app', 'App_Resources', 'Android', 'libs')
+        Folder.create(target_app_gradle)
+        Tns.build_android(os.path.join(TEST_RUN_HOME, APP_NAME), verify=True)
+
+        with open(ANALYTICS_FILE, "r") as read_file:
+            data = json.load(read_file)
+            error_message = "kotlinUsage->hasKotlinRuntimeClasses is not set to False! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasKotlinRuntimeClasses"] is False, error_message
+            error_message = "kotlinUsage->hasUseKotlinPropertyInApp is not set to False! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasUseKotlinPropertyInApp"] is False, error_message
+
+        File.copy(source=source_app_gradle, target=target_app_gradle, backup_files=True)
+        # Not working https://github.com/NativeScript/android-runtime/issues/1522
+        # Tns.build_android(os.path.join(TEST_RUN_HOME, APP_NAME), verify=True).output
+        log = Tns.run_android(APP_NAME, device=self.emulator.id, wait=False, verify=False)
+        source_js = os.path.join(TEST_RUN_HOME, 'assets', 'runtime', 'android', 'files', 'android-runtime-1463-1459',
+                                 'main-view-model.js')
+        target_js = os.path.join(TEST_RUN_HOME, APP_NAME, 'app', 'main-view-model.js')
+        File.copy(source=source_js, target=target_js, backup_files=True)
+        log = Tns.run_android(APP_NAME, device=self.emulator.id, wait=False, verify=False)
 
-    def test_453_support_gradle_properties_for_enable_Kotlin_with_kotlin_file(self):
+        strings = ['Successfully synced application org.nativescript.TestApp on device ']
+        test_result = Wait.until(lambda: all(string in File.read(log.log_file) for string in strings), timeout=300,
+                                 period=5)
+        messages = "App with Kotlin enabled and kotlin jar not build correctly! Logs: "
+        assert test_result, messages + File.read(log.log_file)
+        self.assert_kotlin_is_working(self.emulator)
+        with open(ANALYTICS_FILE, "r") as read_file:
+            data = json.load(read_file)
+            error_message = "kotlinUsage->hasKotlinRuntimeClasses is not set to True! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasKotlinRuntimeClasses"] is True, error_message
+            error_message = "kotlinUsage->hasUseKotlinPropertyInApp is not set to False! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasUseKotlinPropertyInApp"] is False, error_message
+
+    def test_454_support_gradle_properties_for_enable_Kotlin_with_kotlin_file(self):
         """
         Support gradle.properties file for enable Kotlin
         https://github.com/NativeScript/android-runtime/issues/1459
         https://github.com/NativeScript/android-runtime/issues/1463
         """
-        Tns.platform_remove(APP_NAME, platform=Platform.ANDROID)
+        Tns.platform_remove(app_name=APP_NAME, platform=Platform.ANDROID)
         Tns.platform_add_android(APP_NAME, framework_path=Android.FRAMEWORK_PATH)
+
         Adb.clear_logcat(self.emulator.id)
         source_app_gradle = os.path.join(TEST_RUN_HOME, 'assets', 'runtime', 'android', 'files',
                                          'android-runtime-1463-1459', 'gradle.properties')
@@ -413,15 +467,41 @@ def test_453_support_gradle_properties_for_enable_Kotlin_with_kotlin_file(self):
         messages = "App with Kotlin enabled and kotlin jar not build correctly! Logs: "
         assert test_result, messages + File.read(log.log_file)
         self.assert_kotlin_is_working(self.emulator)
-
-    def test_454_support_Kotlin_with_jar_without_use_kotlin(self):
+        with open(ANALYTICS_FILE, "r") as read_file:
+            data = json.load(read_file)
+            error_message = "kotlinUsage->hasKotlinRuntimeClasses is not set to True! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasKotlinRuntimeClasses"] is True, error_message
+            error_message = "kotlinUsage->hasUseKotlinPropertyInApp is not set to True! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasUseKotlinPropertyInApp"] is True, error_message
+
+    def test_455_analytics_not_generated_when_not_set_as_property_for_enable_Kotlin_with_jar(self):
         """
         Support gradle.properties file for enable Kotlin
         https://github.com/NativeScript/android-runtime/issues/1459
         https://github.com/NativeScript/android-runtime/issues/1463
         """
-        Tns.plugin_remove("sample-plugin-2", verify=False, path=APP_NAME)
+        # caused by https://github.com/NativeScript/nativescript-cli/issues/5083
+        kotlin_file_in_src = os.path.join(TEST_RUN_HOME, APP_NAME, 'platforms', 'android', 'app', 'src', 'main', 'java',
+                                          'com',
+                                          'Test.kt')
+        kotlin_file_in_build = os.path.join(TEST_RUN_HOME, APP_NAME, 'platforms', 'android', 'app', 'build', 'tmp',
+                                            'kotlin-classes', 'debug', 'com',
+                                            'Test.class')
+        if File.exists(kotlin_file_in_src):
+            File.delete(kotlin_file_in_src)
+        if File.exists(kotlin_file_in_build):
+            File.delete(kotlin_file_in_build)
+        else:
+            assert False, "Temp gradle folder is missing for generated kotlin file!"
+
+        # bug ends here
+        if File.exists(ANALYTICS_FILE):
+            File.delete(ANALYTICS_FILE)
         Adb.clear_logcat(self.emulator.id)
+        source_app_gradle = os.path.join(TEST_RUN_HOME, 'assets', 'runtime', 'android', 'files',
+                                         'android-runtime-1463-1459', 'no-analytics', 'gradle.properties')
+        target_app_gradle = os.path.join(TEST_RUN_HOME, APP_NAME, 'app', 'App_Resources', 'Android')
+        File.copy(source=source_app_gradle, target=target_app_gradle, backup_files=True)
         source_app_gradle = os.path.join(TEST_RUN_HOME, 'assets', 'runtime', 'android', 'files',
                                          'android-runtime-1463-1459', 'test-jar-1.0-SNAPSHOT.jar')
         target_app_gradle = os.path.join(TEST_RUN_HOME, APP_NAME, 'app', 'App_Resources', 'Android', 'libs')
@@ -436,14 +516,44 @@ def test_454_support_Kotlin_with_jar_without_use_kotlin(self):
         strings = ['Project successfully built',
                    'Successfully installed on device with identifier', self.emulator.id,
                    'Successfully synced application']
-
         test_result = Wait.until(lambda: all(string in File.read(log.log_file) for string in strings), timeout=300,
                                  period=5)
         messages = "App with Kotlin enabled and kotlin jar not build correctly! Logs: "
         assert test_result, messages + File.read(log.log_file)
-        self.assert_kotlin_is_working(self.emulator)
+        error_message = "Analytics data should NOT be generated when gatherAnalyticsData is not set!"
+        assert not File.exists(ANALYTICS_FILE), error_message
 
-    def test_455_gradle_hooks(self):
+    def test_456_analytics_working_correct_when_property_is_set_without_Kotlin(self):
+        """
+        Support gradle.properties file for enable Kotlin
+        https://github.com/NativeScript/android-runtime/issues/1459
+        https://github.com/NativeScript/android-runtime/issues/1463
+        """
+        Adb.clear_logcat(self.emulator.id)
+        source_app_gradle = os.path.join(TEST_RUN_HOME, 'assets', 'runtime', 'android', 'files',
+                                         'android-runtime-1463-1459', 'analytics', 'gradle.properties')
+        target_app_gradle = os.path.join(TEST_RUN_HOME, APP_NAME, 'app', 'App_Resources', 'Android')
+        File.copy(source=source_app_gradle, target=target_app_gradle, backup_files=True)
+
+        log = Tns.run_android(APP_NAME, device=self.emulator.id, wait=False, verify=False)
+
+        strings = ['Project successfully built',
+                   'Successfully installed on device with identifier', self.emulator.id,
+                   'Successfully synced application']
+        test_result = Wait.until(lambda: all(string in File.read(log.log_file) for string in strings), timeout=300,
+                                 period=5)
+        messages = "App with Kotlin enabled and kotlin jar not build correctly! Logs: "
+        assert test_result, messages + File.read(log.log_file)
+        error_message = "Analytics data should be generated when gatherAnalyticsData is set!"
+        assert File.exists(ANALYTICS_FILE), error_message
+        with open(ANALYTICS_FILE, "r") as read_file:
+            data = json.load(read_file)
+            error_message = "kotlinUsage->hasKotlinRuntimeClasses is not set to False! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasKotlinRuntimeClasses"] is False, error_message
+            error_message = "kotlinUsage->hasUseKotlinPropertyInApp is not set to False! Analytics is not correct!"
+            assert data["kotlinUsage"]["hasUseKotlinPropertyInApp"] is False, error_message
+
+    def test_457_gradle_hooks(self):
         """
         Test gradle hooks works correctly
         https://docs.nativescript.org/core-concepts/android-runtime/advanced-topics/gradle-hooks
diff --git a/tests/runtimes/android/android_runtime_tests.py b/tests/runtimes/android/android_runtime_tests.py
diff --git a/tests/runtimes/android/error_activity_tests.py b/tests/runtimes/android/error_activity_tests.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-useKotlin=true`
	`1`	`+useKotlin=true`
	`2`	`+gatherAnalyticsData=true`