fix: update tests - output message assertions

Author: Natalia-Hristova

core/tns/tns.py

@@ -343,7 +343,7 @@ def platform_clean(platform=Platform.NONE, attributes={}, assert_success=True, l
                 assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID))
             if platform is Platform.IOS:
                 assert File.exists(os.path.join(app_name, TnsAsserts.PLATFORM_IOS))
-            assert "Project successfully created" in output
+            assert "Platform {0} successfully added".format(platform_string) in output
         return output
 
     @staticmethod
@@ -664,7 +664,7 @@ def init(attributes={}, assert_success=True, tns_path=None):
     def install(attributes={}, assert_success=True, tns_path=None):
         output = Tns.run_tns_command("install", attributes=attributes, tns_path=tns_path)
         if assert_success:
-            assert "Project successfully created" in output
+            assert "Platform android successfully added" in output or "Platform ios successfully added" in output
         return output
 
     @staticmethod

core/tns/tns_verifications.py

@@ -153,7 +153,7 @@ def platform_added(app_name, platform=Platform.NONE, output=None):
             if platform is Platform.ANDROID:
                 assert 'Platform android successfully added' in output
             if platform is Platform.IOS:
-                assert 'Platform ios successfully added.' in output
+                assert 'Platform ios successfully added' in output
             assert 'Project successfully created.' not in output
 
         # This is to handle test for app with space.
@@ -284,12 +284,11 @@ def _full_prepare():
                 assert 'Project successfully created' not in output
             if prepare is Prepare.FIRST_TIME:
                 _full_prepare()
-                assert 'Installing' in output
-                assert 'Project successfully created' in output
                 if platform is Platform.ANDROID or platform is Platform.BOTH:
-                    assert 'tns-android' in output
+                    assert 'Platform android successfully added' in output
                 if platform is Platform.IOS or platform is Platform.BOTH:
-                    assert 'tns-ios' in output
+                    assert 'Platform ios successfully added' in output
+                assert 'Project successfully created' not in output
 
         if platform is Platform.ANDROID or platform is Platform.BOTH:
             app_path = os.path.join(app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH)

tests/build/android/platform_android_tests.py

@@ -93,7 +93,7 @@ def verify_update(self, output):
         assert "Platform android successfully removed" in output
         assert "Successfully removed plugin tns-core-modules" in output
         assert "Successfully removed plugin tns-core-modules-widgets" in output
-        assert "Project successfully created" in output
+        assert "Platform android successfully added" in output
         assert "Successfully installed plugin tns-core-modules" in output
 
     @unittest.skipIf(Java.version() != "1.8", "Run only if Java version is 8.")
@@ -170,12 +170,11 @@ def test_420_platform_add_existing_platform(self):
         assert "Platform android already added" in output
 
     def test_421_platform_add_android_wrong_option(self):
-
         # frameworkPath point to missing file
         output = Tns.platform_add_android(attributes={"--path": self.app_name, "--frameworkPath": "invalidFile.tgz"},
                                           assert_success=False)
-        assert "npm ERR!" in output or "exit code" in output
-        assert "invalidFile.tgz" in output
+        assert "Invalid frameworkPath: invalidFile.tgz" in output
+        assert "Please ensure the specified frameworkPath exists." in output
 
         # Wrong frameworkPath option
         output = Tns.platform_add_android(attributes={"--path": self.app_name, "--" + invalid: "tns-android.tgz"},
@@ -188,7 +187,6 @@ def test_421_platform_add_android_wrong_option(self):
         assert "Usage" in output
 
     def test_430_platform_remove_missing_invalid_or_empty_platform(self):
-
         output = Tns.platform_remove(platform=Platform.ANDROID, attributes={"--path": self.app_name},
                                      assert_success=False)
         assert "The platform android is not added to this project"

tests/build/common/logtrace_tests.py

@@ -42,4 +42,4 @@ def test_102_platform_add_log_trace(self):
         assert "Package: " + self.app_id in output
         assert "Installed Android Targets" in output
         assert "Using Android SDK" in output
-        assert "Platform android successfully added." in output
+        assert "Platform android successfully added" in output

tests/build/ios/platform_ios_tests.py

@@ -8,7 +8,6 @@
 from core.osutils.folder import Folder
 from core.settings.settings import IOS_PACKAGE, \
     CURRENT_OS, OSType, ANDROID_PACKAGE
-from core.settings.strings import *
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
 from core.tns.tns_verifications import TnsAsserts
@@ -83,7 +82,7 @@ def test_320_platform_add_ios_custom_bundle_id(self):
     def test_330_platform_update_ios_platform_not_added(self):
         Tns.create_app(self.app_name)
         output = Tns.platform_update(platform="ios", attributes={"--path": self.app_name}, assert_success=False)
-        assert successfully_created in output
+        assert "Platform ios successfully added" in output
         assert not Folder.is_empty(self.app_name + "/platforms/ios/internal/metadata-generator")
 
     def test_390_LSApplicationQueriesSchemes_merged(self):

tests/device/deploy_android_tests.py

@@ -2,13 +2,10 @@
 Tests for deploy command
 """
 import os
-import unittest
 
 from core.base_class.BaseClass import BaseClass
 from core.device.device import Device
 from core.device.emulator import Emulator
-from core.java.java import Java
-from core.osutils.file import File
 from core.osutils.folder import Folder
 from core.settings.settings import ANDROID_PACKAGE, TNS_PATH, ANDROID_KEYSTORE_PASS, ANDROID_KEYSTORE_PATH, \
     ANDROID_KEYSTORE_ALIAS, ANDROID_KEYSTORE_ALIAS_PASS, EMULATOR_ID
@@ -98,7 +95,7 @@ def test_300_deploy_android_platform_not_added(self):
 
         # It is brand new project and we need a prepare for first run
         assert copy_template_files in output
-        assert "Installing tns-android" in output
+        assert "Platform android successfully added" in output
         assert successfully_prepared in output
 
         device_ids = Device.get_ids(platform=Platform.ANDROID)

tests/device/deploy_ios_tests.py

@@ -44,6 +44,6 @@ def test_300_deploy_ios_platform_not_added(self):
         Tns.create_app(app_name=self.app_name)
         output = Tns.deploy_ios(attributes={"--path": self.app_name, "--justlaunch": ""}, timeout=180)
         assert copy_template_files in output
-        assert "Installing tns-ios" in output
+        assert "Platform ios successfully added" in output
         # This is the first time we build the project -> we need a prepare
         assert successfully_prepared in output