Fix android ng tests

Author: dtopuzov

core/tns/angular_helper.py

@@ -221,6 +221,10 @@ def create_app_ng(app_name, attributes={}, log_trace=False, assert_success=True,
             if Npm.version() < 5:
                 assert "nativescript-angular" in output
             assert File.exists(os.path.join(app_name, 'node_modules', 'nativescript-theme-core'))
+            package_json = File.read(os.path.join(app_name, 'package.json'))
+            assert "tns-core-modules" in package_json
+            assert "nativescript-angular" in package_json
+            assert "nativescript-dev-typescript" in package_json
 
         return output
 

core/tns/tns.py

@@ -1,13 +1,10 @@
 import os
 
 from core.base_class.BaseClass import BaseClass
-from core.osutils.file import File
 from core.osutils.folder import Folder
 from core.settings.settings import ANDROID_RUNTIME_PATH, \
     ANDROID_KEYSTORE_PASS, ANDROID_KEYSTORE_ALIAS, ANDROID_KEYSTORE_PATH, ANDROID_KEYSTORE_ALIAS_PASS
 from core.tns.tns import Tns
-from core.tns import angular_helper as angular
-from core.settings.strings import *
 
 
 class BuildAndroidNGTests(BaseClass):
@@ -25,21 +22,13 @@ def tearDownClass(cls):
         Folder.cleanup(cls.app_name)
 
     def test_001_build_android_ng_project(self):
-        angular.assert_angular_project(self.app_name)
         Tns.build_android(attributes={"--path": self.app_name})
-        assert File.exists(os.path.join(self.app_name, debug_apk_path))
 
     def test_200_build_android_ng_project_release(self):
-        print ANDROID_KEYSTORE_PATH
-        output = Tns.build_android(attributes={"--keyStorePath": ANDROID_KEYSTORE_PATH,
-                                               "--keyStorePassword": ANDROID_KEYSTORE_PASS,
-                                               "--keyStoreAlias": ANDROID_KEYSTORE_ALIAS,
-                                               "--keyStoreAliasPassword": ANDROID_KEYSTORE_ALIAS_PASS,
-                                               "--release": "",
-                                               "--path": self.app_name
-                                               })
-        assert successfully_prepared in output
-        assert build_successful in output
-
-        assert successfully_built in output
-        assert File.exists(os.path.join(self.app_name, release_apk_path))
+        Tns.build_android(attributes={"--keyStorePath": ANDROID_KEYSTORE_PATH,
+                                      "--keyStorePassword": ANDROID_KEYSTORE_PASS,
+                                      "--keyStoreAlias": ANDROID_KEYSTORE_ALIAS,
+                                      "--keyStoreAliasPassword": ANDROID_KEYSTORE_ALIAS_PASS,
+                                      "--release": "",
+                                      "--path": self.app_name
+                                      })

tests/build/android/build_android_ng_tests.py

@@ -130,7 +130,7 @@ def test_201_build_android_with_additional_prepare(self):
     def test_202_build_android_with_log_trace_and_platform_not_added_or_empty(self):
         """'tns build android' with log trace options should output more logs."""
         Tns.create_app(self.app_no_platform)
-        output = Tns.build_android(attributes={"--path": self.app_no_platform, "--log trace": ""})
+        output = Tns.build_android(attributes={"--path": self.app_no_platform}, log_trace=True)
 
         # Assert log trace show gradle logs
         assert "[DEBUG]" in output