Add test for NativeScript/nativescript-cli#2446

Author: dtopuzov

core/settings/strings.py

@@ -52,7 +52,6 @@
 installed_on_device = "Successfully installed on device with identifier '{0}'"
 copy_template_files = "Copying template files..."
 "Installing tns-android"
-cannot_resolve_device = "Cannot resolve the specified connected device"
 deployed_on_device = "Successfully deployed on device"
 installed_plugin = "Successfully installed plugin {0}"
 tns_plugin = "tns-plugin"
@@ -76,8 +75,8 @@
 invalid_value = "The value '{0}' is not valid."
 no_platform = "No platform specified"
 "and neither was a --path specified."
-no_such_device = "Cannot find device with name: "
 cannot_resolve_device = "Could not find device by specified identifier"
+list_devices = "To list currently connected devices and verify that the specified identifier exists, run 'tns device'"
 invalid_version = "{0} is not a valid version."
 no_platform_installed = "No installed platforms found. Use $ tns platform add"
 

tests/emulator/run_android_tests.py

@@ -28,6 +28,7 @@
 from core.osutils.process import Process
 from core.settings.settings import ANDROID_RUNTIME_PATH, ANDROID_KEYSTORE_PATH, ANDROID_KEYSTORE_PASS, \
     ANDROID_KEYSTORE_ALIAS, ANDROID_KEYSTORE_ALIAS_PASS, EMULATOR_ID, EMULATOR_NAME, CURRENT_OS
+from core.settings.strings import cannot_resolve_device, list_devices
 from core.tns.replace_helper import ReplaceHelper
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
@@ -95,7 +96,8 @@ def test_001_tns_run_android_js_css_xml_manifest(self):
         Tns.wait_for_log(log_file=log, string_list=strings)
 
         # Verify application looks correct
-        Device.screen_match(device_name=EMULATOR_NAME, device_id=EMULATOR_ID, expected_image='livesync-hello-world_js_css_xml')
+        Device.screen_match(device_name=EMULATOR_NAME, device_id=EMULATOR_ID,
+                            expected_image='livesync-hello-world_js_css_xml')
 
         # Rollback all the changes
         ReplaceHelper.rollback(self.app_name, ReplaceHelper.CHANGE_JS, sleep=10)
@@ -483,3 +485,9 @@ def test_401_tns_run_android_should_not_continue_on_build_failure(self):
         assert "successfully built" not in output
         assert "installed" not in output
         assert "synced" not in output
+
+    def test_404_run_on_invalid_device_id(self):
+        output = Tns.run_android(attributes={'--path': self.app_name, '--device': 'fakeId', '--justlaunch': ''},
+                                 assert_success=False)
+        assert cannot_resolve_device in output
+        assert list_devices in output

tests/simulator/run_ios_tests.py

@@ -24,6 +24,7 @@
 from core.osutils.folder import Folder
 from core.osutils.process import Process
 from core.settings.settings import IOS_RUNTIME_PATH, SIMULATOR_NAME, TEST_RUN_HOME
+from core.settings.strings import cannot_resolve_device, list_devices
 from core.tns.replace_helper import ReplaceHelper
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
@@ -321,3 +322,9 @@ def test_400_tns_run_on_folder_with_spaces(self):
         output = Tns.run_ios(attributes={'--path': "\"" + destination_path + "\"", '--justlaunch': ''})
         assert "Multiple errors were thrown" not in output
         assert "fail" not in output
+
+    def test_404_run_on_invalid_device_id(self):
+        output = Tns.run_ios(attributes={'--path': self.app_name, '--device': 'fakeId', '--justlaunch': ''},
+                             assert_success=False)
+        assert cannot_resolve_device in output
+        assert list_devices in output