PC-2018.1.4 <vhristov@vhristov Merge branch 'master'

Author: vhristov5555

core/tns/tns.py

@@ -219,7 +219,7 @@ def create_app(app_name, attributes={}, log_trace=False, assert_success=True, up
             attributes_to_string = "".join("{0} {1}".format(k, v))
         attr = {}
         if not any(s in attributes_to_string for s in ("--ng", "--template", "--tsc")):
-            if BRANCH is "master":
+            if BRANCH == "master":
                 attr = {"--template": SUT_FOLDER + os.path.sep + "tns-template-hello-world.tgz"}
             else:
                 attr = {"--template": "tns-template-hello-world"}

tests/build/common/resources_generate_tests.py

@@ -8,20 +8,32 @@
 from core.osutils.folder import Folder
 from core.osutils.image_utils import ImageUtils
 from core.osutils.os_type import OSType
-from core.settings.settings import CURRENT_OS
+from core.settings.settings import CURRENT_OS, TEST_RUN_HOME
 from core.tns.tns import Tns
 
 
 class ResourcesGenerateTests(BaseClass):
-    image_path = os.path.join(os.getcwd(), "data", "images", "resources_generate", "star.png")
-    expected_images = os.path.join(os.getcwd(), "data", "images", "resources_generate")
-    expected_images_android = os.path.join(os.getcwd(), expected_images, "Android")
-    expected_images_ios = os.path.join(os.getcwd(), expected_images, "iOS")
+    image_path = os.path.join(TEST_RUN_HOME, "data", "images", "resources_generate", "star.png")
+
+    expected_images = os.path.join(TEST_RUN_HOME, "data", "images", "resources_generate")
+    expected_images_android = os.path.join(TEST_RUN_HOME, expected_images, "Android")
+    expected_images_ios = os.path.join(TEST_RUN_HOME, expected_images, "iOS")
+
+    app_resources = os.path.join("app", "App_Resources", "Android", "src", "main", "res")
+    app_resources_old = os.path.join("app", "App_Resources", "Android")
+    assets_base = os.path.join("app", "App_Resources", "iOS", "Assets.xcassets")
+    assets_icons = os.path.join(assets_base, "AppIcon.appiconset")
+
+    drawable_folders = ["drawable-hdpi", "drawable-ldpi", "drawable-mdpi", "drawable-xhdpi", "drawable-xxhdpi",
+                        "drawable-xxxhdpi"]
+
+    app_based_on_old_template = "TestApp40"
 
     @classmethod
     def setUpClass(cls):
         BaseClass.setUpClass(cls.__name__)
         Tns.create_app(cls.app_name)
+        Tns.create_app(cls.app_based_on_old_template, attributes={"--template": "[email protected]"})
 
     def setUp(self):
         BaseClass.setUp(self)
@@ -32,71 +44,48 @@ def tearDown(self):
     @classmethod
     def tearDownClass(cls):
         BaseClass.tearDownClass()
-        Folder.cleanup("Test App")
+        Folder.cleanup(cls.app_based_on_old_template)
         Folder.cleanup("temp_ios_resources")
 
-    def test_001_tns_resources_generate_icons(self):
-        app_resources_android = os.path.join(os.getcwd(), self.app_name, "app", "App_Resources", "Android")
-        app_resources_ios = os.path.join(os.getcwd(), self.app_name, "app", "App_Resources", "iOS", "Assets.xcassets",
-                                         "AppIcon.appiconset")
-
-        output = run("tns resources generate icons \"" + self.image_path + "\"" + " --path " + self.app_name)
-        assert "Generating icons" in output
-        assert "Icons generation completed" in output
-
-        # Android
-        folders = ["drawable-hdpi", "drawable-ldpi", "drawable-mdpi", "drawable-xhdpi", "drawable-xxhdpi",
-                   "drawable-xxxhdpi"]
-
-        for folder in folders:
+    @staticmethod
+    def check_icons(app_resources_android, app_resources_ios):
+        for folder in ResourcesGenerateTests.drawable_folders:
             actual_icon = os.path.join(app_resources_android, folder, "icon.png")
-            expected_icon = os.path.join(self.expected_images_android, folder, "icon.png")
+            expected_icon = os.path.join(ResourcesGenerateTests.expected_images_android, folder, "icon.png")
             result = ImageUtils.image_match(actual_icon, expected_icon, 0.1)
 
             if str(result[0]) is "False":
                 assert False, "Images: \n{0} and \n{1} \nhas diff: {2}".format(actual_icon, expected_icon,
                                                                                str(result[1]))
         # iOS
         if CURRENT_OS == OSType.OSX:
-            icons = ["icon-29.png", "[email protected]", "[email protected]", "icon-40.png", "[email protected]", "[email protected]",
+            icons = ["icon-29.png", "[email protected]", "[email protected]", "icon-40.png", "[email protected]",
+                     "[email protected]",
                      "[email protected]", "[email protected]", "icon-76.png", "[email protected]", "[email protected]",
                      "icon-1024.png"]
 
             for icon in icons:
                 actual_icon = os.path.join(app_resources_ios, icon)
-                expected_icon = os.path.join(self.expected_images_ios, icon)
+                expected_icon = os.path.join(ResourcesGenerateTests.expected_images_ios, icon)
                 result = ImageUtils.image_match(actual_icon, expected_icon, 0.1)
 
                 if str(result[0]) is "False":
                     assert False, "Images: \n{0} and \n{1} \nhas diff: {2}".format(actual_icon, expected_icon,
                                                                                    str(result[1]))
 
-        assert True
-
-    def test_002_tns_resources_generate_spalshes(self):
-        app_resources_android = os.path.join(os.getcwd(), self.app_name, "app", "App_Resources", "Android")
-        app_resources_ios = os.path.join(os.getcwd(), self.app_name, "app", "App_Resources", "iOS", "Assets.xcassets")
-
-        output = run("tns resources generate splashes \"" + self.image_path + "\"" + " --background green --path "
-                     + self.app_name)
-        assert "Generating splash screens" in output
-        assert "Splash screens generation completed" in output
-
-        # Android
-        folders = ["drawable-hdpi", "drawable-ldpi", "drawable-mdpi", "drawable-xhdpi", "drawable-xxhdpi",
-                   "drawable-xxxhdpi"]
-
-        for folder in folders:
+    @staticmethod
+    def check_splashes(app_resources_android, app_resources_ios):
+        for folder in ResourcesGenerateTests.drawable_folders:
             actual_logo = os.path.join(app_resources_android, folder, "logo.png")
-            expected_logo = os.path.join(self.expected_images_android, folder, "logo.png")
+            expected_logo = os.path.join(ResourcesGenerateTests.expected_images_android, folder, "logo.png")
             result = ImageUtils.image_match(actual_logo, expected_logo, 0.1)
 
             if str(result[0]) is "False":
                 assert False, "Images: \n{0} and \n{1} \nhas diff: {2}".format(actual_logo, expected_logo,
                                                                                str(result[1]))
 
             actual_background = os.path.join(app_resources_android, folder, "background.png")
-            expected_background = os.path.join(self.expected_images_android, folder, "background.png")
+            expected_background = os.path.join(ResourcesGenerateTests.expected_images_android, folder, "background.png")
             result = ImageUtils.image_match(actual_background, expected_background, 0.1)
 
             if str(result[0]) is "False":
@@ -125,10 +114,41 @@ def test_002_tns_resources_generate_spalshes(self):
 
             for image in ios_images:
                 actual_image = os.path.join(os.getcwd(), "temp_ios_resources", image)
-                expected_image = os.path.join(self.expected_images_ios, image)
+                expected_image = os.path.join(ResourcesGenerateTests.expected_images_ios, image)
                 result = ImageUtils.image_match(actual_image, expected_image, 0.1)
 
                 if str(result[0]) is "False":
                     assert False, "Images: \n{0} and \n{1} \nhas diff: {2}".format(actual_image, expected_image,
                                                                                    str(result[1]))
-        assert True
+
+    def test_001_tns_resources_generate_icons(self):
+        app_resources_android = os.path.join(TEST_RUN_HOME, self.app_name, self.app_resources)
+        app_resources_ios = os.path.join(TEST_RUN_HOME, self.app_name, self.assets_icons)
+
+        output = run("tns resources generate icons \"" + self.image_path + "\"" + " --path " + self.app_name)
+        assert "Generating icons" in output
+        assert "Icons generation completed" in output
+
+        ResourcesGenerateTests.check_icons(app_resources_android, app_resources_ios)
+
+    def test_002_tns_resources_generate_splashes(self):
+        app_resources_android = os.path.join(TEST_RUN_HOME, self.app_name, self.app_resources)
+        app_resources_ios = os.path.join(TEST_RUN_HOME, self.app_name, self.assets_base)
+
+        output = run("tns resources generate splashes \"" + self.image_path + "\"" + " --background green --path "
+                     + self.app_name)
+        assert "Generating splash screens" in output
+        assert "Splash screens generation completed" in output
+
+        ResourcesGenerateTests.check_splashes(app_resources_android, app_resources_ios)
+
+    def test_100_tns_resources_generate_icons_old_template_structure(self):
+        app_resources_android = os.path.join(TEST_RUN_HOME, self.app_based_on_old_template, self.app_resources_old)
+        app_resources_ios = os.path.join(TEST_RUN_HOME, self.app_based_on_old_template, self.assets_icons)
+
+        output = run(
+            "tns resources generate icons \"" + self.image_path + "\"" + " --path " + self.app_based_on_old_template)
+        assert "Generating icons" in output
+        assert "Icons generation completed" in output
+
+        ResourcesGenerateTests.check_icons(app_resources_android, app_resources_ios)