From 234265855847e650d5a76297cb90418d9ed8b190 Mon Sep 17 00:00:00 2001
From: Vasil Chimev <Vasil.Chimev@telerik.com>
Date: Thu, 24 Mar 2016 17:33:04 +0200
Subject: [PATCH] Add angular/ng template tests

---
 core/tns/tns.py                 | 11 ++---
 tests/build/build_android_ng.py | 53 ++++++++++++++++++++++
 tests/build/build_ios_ng.py     | 56 +++++++++++++++++++++++
 tests/build/create_ng.py        | 63 ++++++++++++++++++++++++++
 tests/build/prepare_android.py  | 55 ++++++++++++++---------
 tests/build/prepare_ios.py      | 79 ++++++++++++++++++++-------------
 tns_tests_runner.py             | 14 ++++++
 7 files changed, 274 insertions(+), 57 deletions(-)
 create mode 100644 tests/build/build_android_ng.py
 create mode 100644 tests/build/build_ios_ng.py
 create mode 100644 tests/build/create_ng.py

diff --git a/core/tns/tns.py b/core/tns/tns.py
index 3e65ebc2..0cd5a9be 100644
--- a/core/tns/tns.py
+++ b/core/tns/tns.py
@@ -36,11 +36,12 @@ def create_app(app_name, path=None, app_id=None, copy_from=None, template=None,
         if app_id is not None:
             command += " --appid " + app_id
 
-        # By default --copy-from template-hello-world
-        if copy_from is not None:
-            command += " --copy-from " + copy_from
-        else:
-            command += " --copy-from " + SUT_ROOT_FOLDER + os.path.sep + "template-hello-world"
+        if template is None:
+            # By default --copy-from template-hello-world
+            if copy_from is not None:
+                command += " --copy-from " + copy_from
+            else:
+                command += " --copy-from " + SUT_ROOT_FOLDER + os.path.sep + "template-hello-world"
 
         if template is not None:
             command += " --template " + template
diff --git a/tests/build/build_android_ng.py b/tests/build/build_android_ng.py
new file mode 100644
index 00000000..ba477c65
--- /dev/null
+++ b/tests/build/build_android_ng.py
@@ -0,0 +1,53 @@
+import unittest
+
+from core.osutils.command import run
+from core.osutils.file import File
+from core.osutils.folder import Folder
+from core.settings.settings import ANDROID_RUNTIME_PATH, TNS_PATH, \
+    ANDROID_KEYSTORE_PASS, ANDROID_KEYSTORE_ALIAS, ANDROID_KEYSTORE_PATH, ANDROID_KEYSTORE_ALIAS_PASS
+from core.tns.tns import Tns
+
+
+class BuildAndroidNG(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        Folder.cleanup('./TNS_App')
+        output = run(TNS_PATH + " create TNS_App --ng")
+        assert "successfully created" in output
+        Tns.platform_add(
+            platform="android",
+            path="TNS_App",
+            framework_path=ANDROID_RUNTIME_PATH)
+
+    def setUp(self):
+
+        print ""
+        print "#####"
+        print self.id()
+        print "#####"
+        print ""
+
+    def tearDown(self):
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        Folder.cleanup('./TNS_App')
+
+    def test_010_build_android_ng_project(self):
+        Tns.build(platform="android", path="TNS_App")
+        assert File.exists("TNS_App/platforms/android/build/outputs/apk/TNSApp-debug.apk")
+
+    def test_210_build_android_ng_project(self):
+        output = run(TNS_PATH + " build android --keyStorePath " + ANDROID_KEYSTORE_PATH +
+                     " --keyStorePassword " + ANDROID_KEYSTORE_PASS +
+                     " --keyStoreAlias " + ANDROID_KEYSTORE_ALIAS +
+                     " --keyStoreAliasPassword " + ANDROID_KEYSTORE_ALIAS_PASS +
+                     " --release --path TNS_App")
+
+        assert "Project successfully prepared" in output
+        assert "BUILD SUCCESSFUL" in output
+
+        assert "Project successfully built" in output
+        assert File.exists("TNS_App/platforms/android/build/outputs/apk/TNSApp-release.apk")
diff --git a/tests/build/build_ios_ng.py b/tests/build/build_ios_ng.py
new file mode 100644
index 00000000..6cba770b
--- /dev/null
+++ b/tests/build/build_ios_ng.py
@@ -0,0 +1,56 @@
+import unittest
+
+from core.osutils.command import run
+from core.osutils.file import File
+from core.osutils.folder import Folder
+from core.settings.settings import IOS_RUNTIME_SYMLINK_PATH, TNS_PATH
+from core.tns.tns import Tns
+from core.xcode.xcode import Xcode
+
+
+class BuildiOSNG(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        Xcode.cleanup_cache()
+        Folder.cleanup('./TNS_App')
+
+        output = run(TNS_PATH + " create TNS_App --ng")
+        assert "successfully created" in output
+        Tns.platform_add(
+            platform="ios",
+            path="TNS_App",
+            framework_path=IOS_RUNTIME_SYMLINK_PATH, symlink=True)
+
+    def setUp(self):
+        print ""
+        print "#####"
+        print self.id()
+        print "#####"
+        print ""
+
+    def tearDown(self):
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        Folder.cleanup('./TNS_App')
+
+    def test_010_build_ios_ng_project(self):
+        output = run(TNS_PATH + " build ios --path TNS_App")
+        assert "Project successfully prepared" in output
+        assert "build/emulator/TNSApp.app" in output
+        assert "** BUILD SUCCEEDED **" in output
+        assert "Project successfully built" in output
+        assert File.exists("TNS_App/platforms/ios/build/emulator/TNSApp.app")
+
+    def test_210_build_ios_ng_project_release_fordevice(self):
+        output = run(TNS_PATH +
+                     " build ios --path TNS_App --for-device --release")
+        assert "Project successfully prepared" in output
+        assert "CONFIGURATION Release" in output
+        assert "CodeSign" in output
+        assert "build/device/TNSApp.app" in output
+        assert "** BUILD SUCCEEDED **" in output
+        assert "Project successfully built" in output
+        assert File.exists("TNS_App/platforms/ios/build/device/TNSApp.ipa")
diff --git a/tests/build/create_ng.py b/tests/build/create_ng.py
new file mode 100644
index 00000000..3e00b36f
--- /dev/null
+++ b/tests/build/create_ng.py
@@ -0,0 +1,63 @@
+import unittest
+
+from nose_parameterized import parameterized
+
+from core.osutils.command import run
+from core.osutils.folder import Folder
+from core.settings.settings import TNS_PATH
+from core.tns.tns import Tns
+
+
+class CreateNG(unittest.TestCase):
+
+    def setUp(self):
+        print ""
+        print "#####"
+        print self.id()
+        print "#####"
+        print ""
+
+        Folder.cleanup('./TNS_App')
+
+    def tearDown(self):
+        Folder.cleanup('./TNS_App')
+
+    def assert_angular_project(self):
+        output = run("cat TNS_App/package.json")
+        assert "angular2" in output
+        assert "nativescript-angular" in output
+        assert "tns-core-modules" in output
+        assert "nativescript-dev-typescript" in output
+
+        assert Folder.exists("TNS_App/node_modules/angular2")
+        assert Folder.exists("TNS_App/node_modules/nativescript-angular")
+        assert Folder.exists("TNS_App/node_modules/nativescript-dev-typescript")
+        assert Folder.exists("TNS_App/node_modules/tns-core-modules")
+
+        assert Folder.exists("TNS_App/hooks")
+        assert Folder.exists("TNS_App/app/App_Resources")
+
+    def test_101_create_ng_project(self):
+        output = run(TNS_PATH + " create TNS_App --ng")
+        assert "successfully created" in output
+        self.assert_angular_project()
+
+    @parameterized.expand([
+        "tns-template-hello-world-ng",
+        "https://github.com/NativeScript/template-hello-world-ng.git",
+        "angular",
+        "ng",
+    ])
+    def test_102_create_project_with_template_ng(self, template_source):
+        Tns.create_app(app_name="TNS_App", template=template_source)
+        self.assert_angular_project()
+
+    def test_401_create_project_with_template_no_value(self):
+        output = run(TNS_PATH + " create TNS_App --template")
+        assert "successfully created" not in output
+        assert "requires non-empty value" in output
+
+    def test_402_create_project_with_template_and_ng(self):
+        output = run(TNS_PATH + " create TNS_App --template --ng")
+        assert "successfully created" not in output
+        assert "requires non-empty value" in output
diff --git a/tests/build/prepare_android.py b/tests/build/prepare_android.py
index 951710cc..144ce642 100644
--- a/tests/build/prepare_android.py
+++ b/tests/build/prepare_android.py
@@ -12,6 +12,7 @@
 
 
 class PrepareAndroid(unittest.TestCase):
+
     def setUp(self):
         print ""
         print "#####"
@@ -66,7 +67,40 @@ def test_002_prepare_android_inside_project(self):
         assert not File.exists(
                 'TNS_App/platforms/android/src/main/assets/app/tns_modules/application/application.ios.js')
 
-    def test_010_prepare_android_tns_core_modules(self):
+    def test_010_prepare_android_ng_project(self):
+        output = run(TNS_PATH + " create TNS_App --ng")
+        assert "successfully created" in output
+        Tns.platform_add(
+            platform="android",
+            path="TNS_App",
+            framework_path=ANDROID_RUNTIME_PATH)
+        Tns.prepare(platform="android", path="TNS_App")
+
+        assert Folder.exists(
+            'TNS_App/platforms/android/src/main/assets/app/tns_modules/angular2')
+        assert Folder.exists(
+            'TNS_App/platforms/android/src/main/assets/app/tns_modules/nativescript-angular')
+
+    def test_200_prepare_android_patform_not_added(self):
+        Tns.create_app(app_name="TNS_App")
+        output = run(TNS_PATH + " prepare android --path TNS_App")
+        assert "Copying template files..." in output
+        assert "Project successfully created." in output
+        assert "Project successfully prepared" in output
+        assert File.exists(
+                'TNS_App/platforms/android/src/main/assets/app/tns_modules/xml/xml.js')
+
+    def test_201_prepare_xml_error(self):
+        Tns.create_app(app_name="TNS_App")
+        File.replace("TNS_App/app/main-page.xml", "</Page>", "</Page")
+        output = run(TNS_PATH + " prepare android --path TNS_App")
+        assert "Copying template files..." in output
+        assert "Project successfully created." in output
+        assert "Project successfully prepared" in output
+        assert "main-page.xml has syntax errors." in output
+        assert "unclosed xml attribute" in output
+
+    def test_210_prepare_android_tns_core_modules(self):
         Tns.create_app(
                 app_name="TNS_App",
                 copy_from=SUT_ROOT_FOLDER + "/QA-TestApps/tns-modules-app/app")
@@ -108,25 +142,6 @@ def test_010_prepare_android_tns_core_modules(self):
                     "tns_modules/application/application-common.js")
             assert "require(\"globals\"); // test" in output
 
-    def test_200_prepare_android_patform_not_added(self):
-        Tns.create_app(app_name="TNS_App")
-        output = run(TNS_PATH + " prepare android --path TNS_App")
-        assert "Copying template files..." in output
-        assert "Project successfully created." in output
-        assert "Project successfully prepared" in output
-        assert File.exists(
-                'TNS_App/platforms/android/src/main/assets/app/tns_modules/xml/xml.js')
-
-    def test_201_prepare_xml_error(self):
-        Tns.create_app(app_name="TNS_App")
-        File.replace("TNS_App/app/main-page.xml", "</Page>", "</Page")
-        output = run(TNS_PATH + " prepare android --path TNS_App")
-        assert "Copying template files..." in output
-        assert "Project successfully created." in output
-        assert "Project successfully prepared" in output
-        assert "main-page.xml has syntax errors." in output
-        assert "unclosed xml attribute" in output
-
     def test_300_prepare_android_remove_old_files(self):
         Tns.create_app_platform_add(
                 app_name="TNS_App",
diff --git a/tests/build/prepare_ios.py b/tests/build/prepare_ios.py
index 50a38fcc..15507b47 100644
--- a/tests/build/prepare_ios.py
+++ b/tests/build/prepare_ios.py
@@ -12,6 +12,7 @@
 
 
 class PrepareiOS(unittest.TestCase):
+
     @classmethod
     def setUpClass(cls):
         if CURRENT_OS != OSType.OSX:
@@ -28,7 +29,7 @@ def setUp(self):
         Folder.cleanup('./TNS_App')
 
     def tearDown(self):
-        pass
+        Folder.cleanup('./TNS_App')
 
     def test_001_prepare_ios(self):
         Tns.create_app_platform_add(app_name="TNS_App", platform="ios",
@@ -47,38 +48,19 @@ def test_001_prepare_ios(self):
         assert not File.exists(
                 'TNS_App/platforms/ios/TNSApp/app/tns_modules/application/application.ios.js')
 
-    def test_010_prepare_ios_tns_core_modules(self):
-        Tns.create_app(app_name="TNS_App", copy_from="data/projects/helloworld-1.2.1/app")
-        Tns.platform_add(platform="ios", path="TNS_App",
-                         framework_path=IOS_RUNTIME_SYMLINK_PATH, symlink=True)
-
-        # Make a change in tns-core-modules to verify they are not overwritten.
-        File.replace("TNS_App/node_modules/tns-core-modules/application/application-common.js",
-                     "(\"globals\");",
-                     "(\"globals\"); // test")
-
-        # Verify tns-core-modules are copied to the native project, not app's tns_modules.
-        for i in range(1, 3):
-            print "prepare number: " + str(i)
-
-            output = run(TNS_PATH + " prepare ios --path TNS_App")
-            assert "You have tns_modules dir in your app folder" in output
-            assert "Project successfully prepared" in output
-
-            output = run("cat TNS_App/app/tns_modules/package.json")
-            assert "\"version\": \"1.2.1\"," in output
-
-            output = run("cat TNS_App/node_modules/tns-core-modules/package.json")
-            assert "\"version\": \"1.2.1\"," not in output
-            output = run("cat TNS_App/node_modules/" +
-                         "tns-core-modules/application/application-common.js")
-            assert "require(\"globals\"); // test" in output
+    def test_010_prepare_android_ng_project(self):
+        output = run(TNS_PATH + " create TNS_App --ng")
+        assert "successfully created" in output
+        Tns.platform_add(
+            platform="ios",
+            path="TNS_App",
+            framework_path=IOS_RUNTIME_SYMLINK_PATH, symlink=True)
+        Tns.prepare(platform="ios", path="TNS_App")
 
-            output = run("cat TNS_App/platforms/ios/TNSApp/app/tns_modules/package.json")
-            assert "\"version\": \"1.2.1\"," not in output
-            output = run("cat TNS_App/platforms/ios/" +
-                         "TNSApp/app/tns_modules/application/application-common.js")
-            assert "require(\"globals\"); // test" in output
+        assert Folder.exists(
+            'TNS_App/platforms/ios/TNSApp/app/tns_modules/angular2')
+        assert Folder.exists(
+            'TNS_App/platforms/ios/TNSApp/app/tns_modules/nativescript-angular')
 
     def test_200_prepare_additional_appresources(self):
         Tns.create_app_platform_add(app_name="TNS_App", platform="ios",
@@ -119,6 +101,39 @@ def test_201_prepare_ios_platform_not_added(self):
         assert File.exists(
                 'TNS_App/platforms/ios/TNSApp/app/tns_modules/application/application.js')
 
+    def test_210_prepare_ios_tns_core_modules(self):
+        Tns.create_app(app_name="TNS_App", copy_from="data/projects/helloworld-1.2.1/app")
+        Tns.platform_add(platform="ios", path="TNS_App",
+                         framework_path=IOS_RUNTIME_SYMLINK_PATH, symlink=True)
+
+        # Make a change in tns-core-modules to verify they are not overwritten.
+        File.replace("TNS_App/node_modules/tns-core-modules/application/application-common.js",
+                     "(\"globals\");",
+                     "(\"globals\"); // test")
+
+        # Verify tns-core-modules are copied to the native project, not app's tns_modules.
+        for i in range(1, 3):
+            print "prepare number: " + str(i)
+
+            output = run(TNS_PATH + " prepare ios --path TNS_App")
+            assert "You have tns_modules dir in your app folder" in output
+            assert "Project successfully prepared" in output
+
+            output = run("cat TNS_App/app/tns_modules/package.json")
+            assert "\"version\": \"1.2.1\"," in output
+
+            output = run("cat TNS_App/node_modules/tns-core-modules/package.json")
+            assert "\"version\": \"1.2.1\"," not in output
+            output = run("cat TNS_App/node_modules/" +
+                         "tns-core-modules/application/application-common.js")
+            assert "require(\"globals\"); // test" in output
+
+            output = run("cat TNS_App/platforms/ios/TNSApp/app/tns_modules/package.json")
+            assert "\"version\": \"1.2.1\"," not in output
+            output = run("cat TNS_App/platforms/ios/" +
+                         "TNSApp/app/tns_modules/application/application-common.js")
+            assert "require(\"globals\"); // test" in output
+
     def test_300_prepare_ios_preserve_case(self):
         Tns.create_app_platform_add(app_name="TNS_App", platform="ios",
                                     framework_path=IOS_RUNTIME_SYMLINK_PATH, symlink=True)
diff --git a/tns_tests_runner.py b/tns_tests_runner.py
index b3d3cdfa..176b367d 100644
--- a/tns_tests_runner.py
+++ b/tns_tests_runner.py
@@ -6,8 +6,11 @@
 from core.settings.settings import CURRENT_OS, OSType
 from core.tns.tns import Tns
 from tests.build.build_android import BuildAndroid
+from tests.build.build_android_ng import BuildAndroidNG
 from tests.build.build_ios import BuildiOS
+from tests.build.build_ios_ng import BuildiOSNG
 from tests.build.create import Create
+from tests.build.create_ng import CreateNG
 from tests.build.initinstall import InitAndInstall
 from tests.build.platform_android import PlatformAndroid
 from tests.build.platform_ios import PlatformiOS
@@ -75,6 +78,7 @@ def suite_build():
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Output_STRERR))
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Doctor))
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(Create))
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(CreateNG))
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(PlatformAndroid))
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(PrepareAndroid))
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(BuildAndroid))
@@ -150,6 +154,14 @@ def suite_debug():
     return suite
 
 
+def suite_angular():
+    suite = unittest.TestSuite()
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(BuildAndroidNG))
+    if CURRENT_OS == OSType.OSX:
+        suite.addTests(unittest.TestLoader().loadTestsFromTestCase(BuildiOSNG))
+    return suite
+
+
 def run_tests():
     print "Platform : " + platform.platform()
 
@@ -170,6 +182,8 @@ def run_tests():
         suite = suite_livesync()
     elif 'DEBUG' in os.environ['TEST_RUN']:
         suite = suite_debug()
+    elif 'ANGULAR' in os.environ['TEST_RUN']:
+        suite = suite_angular()
 
     with open("Report.html", "w") as report:
         descr = "Platform : {0}; NativeScript CLI build version : {1}; Test Suite : {2}".format(