latest changes

Author: miroslavaivanova

data/sync/hello_world_js.py

@@ -153,7 +153,7 @@ def __sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=True,
 
 def preview_hello_world_js_ts(app_name, platform, device, bundle=True, hmr=True, instrumented=False,
                               click_open_alert=False):
-    result = Preview.run_app(app_name=app_name, bundle=bundle, hmr=hmr,
+    result = Preview.run_app(app_name=app_name, bundle=bundle, hmr=hmr, platform=platform,
                              device=device, instrumented=instrumented, click_open_alert=click_open_alert)
 
     # Verify app looks properly
@@ -191,8 +191,8 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit CSS file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=css_change)
-    strings = TnsLogs.preview_file_changed_messages(bundle=bundle, device=device,
-                                                    hmr=hmr, file_name='app.css', instrumented=instrumented)
+    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, device=device, hmr=hmr,
+                                                    file_name='app.css', instrumented=instrumented)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,
                              not_existing_string_list=not_existing_string_list)
@@ -202,8 +202,8 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit JS file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=js_change)
-    strings = TnsLogs.preview_file_changed_messages(bundle=bundle, hmr=hmr, device=device,
-                                                    file_name=js_file, instrumented=instrumented)
+    strings = TnsLogs.preview_file_changed_messages(bundle=bundle, hmr=hmr, device=device, file_name=js_file,
+                                                    instrumented=instrumented, platform=platform)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,
                              not_existing_string_list=not_existing_string_list)
@@ -213,7 +213,7 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit XML file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=xml_change)
-    strings = TnsLogs.preview_file_changed_messages(bundle=bundle, device=device,
+    strings = TnsLogs.preview_file_changed_messages(bundle=bundle, device=device, platform=platform,
                                                     hmr=hmr, file_name='main-page.xml', instrumented=instrumented)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,

data/sync/hello_world_ng.py

@@ -156,15 +156,16 @@ def preview_sync_hello_world_ng(app_name, platform, device, bundle=True, hmr=Tru
     # Edit TS file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=Changes.NGHelloWorld.TS)
     strings = TnsLogs.preview_file_changed_messages(platform=platform, run_type=RunType.INCREMENTAL, bundle=bundle,
-                                                    file_name='item.service.ts', hmr=hmr, instrumented=instrumented)
+                                                    file_name='item.service.ts', hmr=hmr, instrumented=instrumented,
+                                                    device=device)
     TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=180,
                          not_existing_string_list=not_existing_string_list)
     device.wait_for_text(text=Changes.NGHelloWorld.TS.new_text)
 
     # Edit HTML file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=Changes.NGHelloWorld.HTML)
     strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, file_name='items.component.html',
-                                                    hmr=hmr, instrumented=instrumented)
+                                                    hmr=hmr, instrumented=instrumented, device=device)
     TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=180,
                          not_existing_string_list=not_existing_string_list)
     if platform == Platform.IOS:
@@ -178,7 +179,7 @@ def preview_sync_hello_world_ng(app_name, platform, device, bundle=True, hmr=Tru
     # Edit CSS file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=Changes.NGHelloWorld.CSS)
     strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, file_name='app.css',
-                                                    hmr=hmr, instrumented=instrumented)
+                                                    hmr=hmr, instrumented=instrumented, device=device)
     TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=180,
                          not_existing_string_list=not_existing_string_list)
     device.wait_for_main_color(color=Changes.NGHelloWorld.CSS.new_color)

products/nativescript/preview_helpers.py

@@ -128,7 +128,7 @@ def dismiss_simulator_alert():
         run(command)
 
     @staticmethod
-    def run_app(app_name, device, bundle=True, hmr=True, instrumented=False, click_open_alert=False):
+    def run_app(app_name, platform, device, bundle=True, hmr=True, instrumented=False, click_open_alert=False):
         result = Tns.preview(app_name=app_name, bundle=bundle, hmr=hmr)
 
         # Read the log and extract the url to load the app on emulator
@@ -143,7 +143,7 @@ def run_app(app_name, device, bundle=True, hmr=True, instrumented=False, click_o
                     device.click("Open")
 
         # Verify logs
-        strings = TnsLogs.preview_initial_messages(device=device, hmr=hmr, bundle=bundle,
+        strings = TnsLogs.preview_initial_messages(platform=platform, device=device, hmr=hmr, bundle=bundle,
                                                    instrumented=instrumented)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=200)
         return result

products/nativescript/tns_assert.py

@@ -181,21 +181,17 @@ def test_initialized(app_name, framework, output):
             assert 'Run your tests using the' in output
 
     @staticmethod
-    def file_is_synced_once(log, platform, file_name):
+    def file_is_synced_once(log, device, file_name):
         """
         Assert file is synced once on livesync.
         :param log: log or part of log you want to check
         :param platform: The platform you are syncing on.
         :param file_name: name of the file you are syncing.
         """
-        if platform == Platform.ANDROID:
-            assert log.count('Start syncing changes for platform android') == 1, "File is synced more than once!"
-            assert log.count('hot-update.json for platform android') == 1, "File is synced more than once!"
-            assert file_name in log
-        else:
-            assert log.count('Start syncing changes for platform ios') == 1, "File is synced more than once!"
-            assert log.count('hot-update.json for platform ios') == 1, "File is synced more than once!"
-            assert file_name in log
+        assert log.count('Start syncing changes for device {0}'.format(str(device.model))) == 1, \
+            "File is synced more than once!"
+        # assert log.count('hot-update.json for device') == 1, "File is synced more than once!"
+        assert file_name in log
 
     @staticmethod
     def snapshot_skipped(snapshot, result, release):

products/nativescript/tns_logs.py

@@ -246,7 +246,7 @@ def __webpack_messages():
                 'Webpack build done!']
 
     @staticmethod
-    def preview_initial_messages(device, bundle=True, hmr=False, instrumented=False):
+    def preview_initial_messages(platform, device, bundle=True, hmr=False, instrumented=False):
         logs = ["Start sending initial files for device {0}".format(str(device.model)),
                 "Successfully sent initial files for device {0}".format(str(device.model))]
         if bundle or hmr:
@@ -256,7 +256,7 @@ def preview_initial_messages(device, bundle=True, hmr=False, instrumented=False)
         return logs
 
     @staticmethod
-    def preview_file_changed_messages(device, file_name, run_type=RunType.INCREMENTAL,
+    def preview_file_changed_messages(device, platform, file_name, run_type=RunType.INCREMENTAL,
                                       bundle=True, hmr=True, instrumented=False):
         logs = ["Start syncing changes for device {0}".format(str(device.model))]
         if bundle or hmr:

tests/cli/preview/templates/hello_word_js_tests.py

@@ -1,4 +1,5 @@
 import os
+import time
 import unittest
 
 from core.base_test.tns_run_test import TnsRunTest
@@ -31,7 +32,7 @@ def setUpClass(cls):
         cls.emu_API24 = DeviceManager.Emulator.ensure_available(Settings.Emulators.EMU_API_24)
 
         # Download Preview and Playground packages
-        # Preview.get_app_packages()
+        Preview.get_app_packages()
 
         # Install Preview and Playground
         Preview.install_preview_app(cls.emu, Platform.ANDROID)
@@ -96,19 +97,20 @@ def test_210_tns_preview_android_livesync_on_two_emulators(self):
         log = File.read(result.log_file)
         url = Preview.get_url(log)
         Preview.run_url(url=url, device=self.emu)
-        strings = TnsLogs.preview_initial_messages(device=self.emu)
+        strings = TnsLogs.preview_initial_messages(device=self.emu, platform=Platform.ANDROID)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
-        self.emu.wait_for_text(text=Changes.JSHelloWord.JS.old_text, timeout=90)
+        self.emu.wait_for_text(text=Changes.JSHelloWord.JS.old_text, timeout=120)
 
         # Click on TAP button on emulator
         Adb.click_element_by_text(self.emu.id, 'TAP', case_sensitive=True)
 
+        time.sleep(2)
         # Preview on second emulator
         Preview.run_url(url=url, device=self.emu_API24)
         # Here use bundle=False because on consecutive preview build is not executed again
         # and no bundle messages are displayed in log
-        strings = TnsLogs.preview_initial_messages(device=self.emu, bundle=False)
-        TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
+        strings = TnsLogs.preview_initial_messages(device=self.emu, platform=Platform.ANDROID)
+        TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=120)
         self.emu_API24.wait_for_text(text=Changes.JSHelloWord.JS.old_text)
 
         # Verify first emulator is not refreshed, state of app is preserved
@@ -136,7 +138,7 @@ def test_210_tns_preview_on_simulator_and_emulator_livesync(self):
         log = File.read(result.log_file)
         url = Preview.get_url(log)
         Preview.run_url(url=url, device=self.emu)
-        strings = TnsLogs.preview_initial_messages(device=self.emu)
+        strings = TnsLogs.preview_initial_messages(device=self.emu, platform=Platform.ANDROID)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
         self.emu.wait_for_text(text=Changes.JSHelloWord.JS.old_text)
 
@@ -145,7 +147,7 @@ def test_210_tns_preview_on_simulator_and_emulator_livesync(self):
 
         # Preview on simulator
         Preview.run_url(url=url, device=self.sim)
-        strings = TnsLogs.preview_initial_messages(device=self.sim)
+        strings = TnsLogs.preview_initial_messages(device=self.sim, platform=Platform.IOS)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
         self.sim.wait_for_text(text=Changes.JSHelloWord.JS.old_text)
 
@@ -162,8 +164,8 @@ def test_210_tns_preview_on_simulator_and_emulator_livesync(self):
         log = File.read(result.log_file)
         log = File.extract_part_of_text(log, '[VERIFIED]')
         # Verify files are synced once
-        TnsAssert.file_is_synced_once(log, Platform.ANDROID, 'main-view-model.js')
-        TnsAssert.file_is_synced_once(log, Platform.IOS, 'main-view-model.js')
+        TnsAssert.file_is_synced_once(log, device=self.emu, file_name='main-view-model.js')
+        TnsAssert.file_is_synced_once(log, device=self.sim, file_name='main-view-model.js')
         # Mark that part of the log as verified before next sync
         File.append(result.log_file, '[VERIFIED]')
 
@@ -177,8 +179,8 @@ def test_210_tns_preview_on_simulator_and_emulator_livesync(self):
         log = File.read(result.log_file)
         log = File.extract_part_of_text(log, '[VERIFIED]')
         # Verify files are synced once
-        TnsAssert.file_is_synced_once(log, Platform.ANDROID, 'main-page.xml')
-        TnsAssert.file_is_synced_once(log, Platform.IOS, 'main-page.xml')
+        TnsAssert.file_is_synced_once(log, device=self.emu, file_name='main-page.xml')
+        TnsAssert.file_is_synced_once(log, device=self.sim, file_name='main-page.xml')
 
     def test_240_tns_preview_android_verify_plugin_warnings(self):
         """

tests/cli/preview/templates/hello_word_ng_tests.py

@@ -2,6 +2,7 @@
 import unittest
 from core.base_test.tns_test import TnsTest
 from core.base_test.tns_run_test import TnsRunTest
+from core.enums.app_type import AppType
 from core.enums.os_type import OSType
 from core.enums.platform_type import Platform
 from core.settings import Settings