Fix android tests

Author: dtopuzov

core/tns/tns.py

@@ -348,13 +348,16 @@ def prepare_ios(attributes={}, assert_success=True, log_trace=False, tns_path=No
         return output
 
     @staticmethod
-    def build_android(attributes={}, assert_success=True, tns_path=None):
-        output = Tns.run_tns_command("build android", attributes=attributes, tns_path=tns_path)
+    def build_android(attributes={}, assert_success=True, tns_path=None, log_trace=False):
+        output = Tns.run_tns_command("build android", attributes=attributes, tns_path=tns_path, log_trace=log_trace)
         if assert_success:
             # Verify output of build command
-            assert "BUILD SUCCESSFUL" in output, "Build failed!" + os.linesep + output
             assert "Project successfully built" in output, "Build failed!" + os.linesep + output
             assert "NOT FOUND" not in output  # Test for https://github.com/NativeScript/android-runtime/issues/390
+            if log_trace:
+                assert "BUILD SUCCESSFUL" in output, "Build failed!" + os.linesep + output
+            else:
+                assert "BUILD SUCCESSFUL" not in output, "Native build out is displayed even without --log trace"
 
             # Verify apk packages
             app_name = Tns.__get_app_name_from_attributes(attributes=attributes)
@@ -397,6 +400,9 @@ def build_ios(attributes={}, assert_success=True, tns_path=None, log_trace=False
             if log_trace:
                 assert "BUILD SUCCEEDED" in output
                 assert "CodeSign" in output
+            else:
+                assert "BUILD SUCCEEDED" not in output, "Native build out is displayed even without --log trace"
+                assert "CodeSign" not in output, "Native build out is displayed even without --log trace"
 
             # Verify release/debug builds
             if "--release" in attributes.keys():
@@ -416,6 +422,9 @@ def build_ios(attributes={}, assert_success=True, tns_path=None, log_trace=False
                     assert "build/device/" + app_id + ".app" in output
                     assert "ARCHIVE SUCCEEDED" in output
                     assert "EXPORT SUCCEEDED" in output
+                else:
+                    assert "ARCHIVE SUCCEEDED" not in output, "Native build out is displayed even without --log trace"
+                    assert "EXPORT SUCCEEDED" not in output, "Native build out is displayed even without --log trace"
                 assert File.exists(device_folder + app_id + ".ipa"), "IPA file not found!"
                 bundle_content = File.read(device_folder + app_id + ".app/" + app_id)
                 xcode_project = Tns.__get_xcode_project_file(app_name)
@@ -427,6 +436,9 @@ def build_ios(attributes={}, assert_success=True, tns_path=None, log_trace=False
             else:
                 if log_trace:
                     assert "build/emulator/" + app_id + ".app" in output
+                else:
+                    assert "build/emulator/" + app_id + ".app" not in output, \
+                        "Native build out is displayed even without --log trace"
                 assert File.exists(app_name + "/platforms/ios/" + app_id + "/" + app_id + "-Prefix.pch")
                 assert File.exists(emu_folder + app_id + ".app")
                 bundle_content = File.read(emu_folder + app_id + ".app/" + app_id)

tests/build/android/build_android_tests.py

@@ -105,15 +105,15 @@ def test_002_build_android_release(self):
                                       "--keyStoreAlias": ANDROID_KEYSTORE_ALIAS,
                                       "--keyStoreAliasPassword": ANDROID_KEYSTORE_ALIAS_PASS,
                                       "--release": ""
-                                      })
+                                      }, log_trace=True)
 
         # Configs are respected
         assert 'release' in File.read(os.path.join(self.app_name, TnsAsserts.PLATFORM_ANDROID_APP_PATH, 'config.json'))
 
     def test_200_build_android_inside_project_folder(self):
         Folder.navigate_to(self.app_name)
         output = Tns.build_android(tns_path=os.path.join("..", TNS_PATH), attributes={"--path": self.app_name},
-                                   assert_success=False)
+                                   assert_success=False, log_trace=True)
         Folder.navigate_to(TEST_RUN_HOME, relative_from_current_folder=False)
         assert successfully_prepared in output
         assert build_successful in output
@@ -311,8 +311,8 @@ def test_390_build_project_with_foursquare_android_oauth(self):
         Tns.platform_add_android(attributes={"--path": self.app_name, "--frameworkPath": ANDROID_RUNTIME_PATH})
 
         # Add foursquare native library as dependency
-        source = os.path.join('data','issues','android-runtime-755','app.gradle')
-        target = os.path.join(self.app_name, 'app','App_Resources','Android','app.gradle')
+        source = os.path.join('data', 'issues', 'android-runtime-755', 'app.gradle')
+        target = os.path.join(self.app_name, 'app', 'App_Resources', 'Android', 'app.gradle')
         File.copy(src=source, dest=target)
 
         # Build the project

tests/device/run_ios_device_tests.py

@@ -232,7 +232,7 @@ def test_330_tns_run_ios_after_rebuild_of_native_project(self):
 
         # `tns run ios` and wait until app is deployed
         log = Tns.run_ios(attributes={'--path': self.app_name, '--device': self.DEVICE_ID}, wait=False,
-                          assert_success=False)
+                          assert_success=False, log_trace=True)
         strings = [self.DEVICE_ID, 'Successfully synced application']
         Tns.wait_for_log(log_file=log, string_list=strings, timeout=120, check_interval=10)