optimizing image methods

Author: nareshnavinash

.gitignore

@@ -11,4 +11,4 @@ __pycache__/
 .python-version
 
 # pytest reports
-#reports/
+reports/

Library/api.py

@@ -0,0 +1,34 @@
+import allure
+import requests
+from Library.variable import Var
+from Library.store import Store
+
+
+class Api:
+    URL = None
+    endpoint = None
+    params = None
+    response = None
+
+    def __init__(self, url):
+        Api.URL = url
+
+    @classmethod
+    def get(cls, **kwargs):
+        response = requests.get(Api.URL + Api.endpoint, Api.params, **kwargs)
+        allure.step("Response for Get with " + Api.endpoint)
+        allure.step("Get request Prams " + str(Api.params))
+        allure.step("Other get Args " + str(**kwargs))
+        allure.attach(response.status_code, name="Response Status Code")
+        allure.attach(response.headers, name="Response Headers")
+        allure.attach(response.text, name="Response Text")
+        allure.attach(response.json(), name="Response JSON")
+        Api.response = response
+
+    @classmethod
+    def set_end_point(cls, endpoint):
+        Api.endpoint = endpoint
+
+    @classmethod
+    def set_params(cls, params):
+        Api.params = params

Library/images.py

@@ -1,29 +1,46 @@
 import imgcompare
 import allure
 import os
+import diffimg
 from Library.variable import Var
 
 
 class Img:
 
     @staticmethod
     def is_equal(image1, image2):
-        image1_path = os.path.dirname(os.path.abspath(__file__)).replace("/Library", "") + "/Data/Images/" + image1
-        image2_path = os.path.dirname(os.path.abspath(__file__)).replace("/Library", "") + "/reports/images/" + image2
+        image1_path = Img.root_path() + "/Data/Images/" + image1
+        image2_path = Img.root_path() + "/reports/images/" + image2
         result = imgcompare.is_equal(image1_path, image2_path)
         allure.attach.file(image1_path, name=image1, attachment_type=allure.attachment_type.PNG)
         allure.attach.file(image2_path, name=image2, attachment_type=allure.attachment_type.PNG)
-        image_diff_percent = imgcompare.image_diff_percent(image1_path, image2_path)
-        allure.step("Difference Percentage for comparing images is" + image_diff_percent)
+        if not result:
+            image_diff_percent = imgcompare.image_diff_percent(image1_path, image2_path)
+            allure.step("Difference Percentage for comparing images is" + image_diff_percent)
+            diff_img_name = "diff_" + image1 + image2 + ".png"
+            diff_img_path = Img.root_path() + "/reports/images/" + diff_img_name
+            diffimg.diff(image1_path, image2_path, delete_diff_file=False,
+                         diff_img_file=diff_img_path, ignore_alpha=False)
+            allure.attach.file(diff_img_path, name=diff_img_name, attachment_type=allure.attachment_type.PNG)
         return result
 
     @staticmethod
     def is_equal_with_tolerance(image1, image2, tolerance=Var.current("tolerance")):
-        image1_path = os.path.dirname(os.path.abspath(__file__)).replace("/Library", "") + "/Data/Images/" + image1
-        image2_path = os.path.dirname(os.path.abspath(__file__)).replace("/Library", "") + "/reports/images/" + image2
+        image1_path = Img.root_path() + "/Data/Images/" + image1
+        image2_path = Img.root_path() + "/reports/images/" + image2
         result = imgcompare.is_equal(image1_path, image2_path, tolerance=tolerance)
         allure.attach.file(image1_path, name=image1, attachment_type=allure.attachment_type.PNG)
         allure.attach.file(image2_path, name=image2, attachment_type=allure.attachment_type.PNG)
-        image_diff_percent = imgcompare.image_diff_percent(image1_path, image2_path)
-        allure.step("Difference Percentage for comparing images is" + image_diff_percent)
+        if not result:
+            image_diff_percent = imgcompare.image_diff_percent(image1_path, image2_path)
+            allure.step("Difference Percentage for comparing images is" + image_diff_percent)
+            diff_img_name = "diff_" + image1 + image2 + ".png"
+            diff_img_path = Img.root_path() + "/reports/images/" + diff_img_name
+            diffimg.diff(image1_path, image2_path, delete_diff_file=False,
+                         diff_img_file=diff_img_path, ignore_alpha=False)
+            allure.attach.file(diff_img_path, name=diff_img_name, attachment_type=allure.attachment_type.PNG)
         return result
+
+    @staticmethod
+    def root_path():
+        return os.path.dirname(os.path.abspath(__file__)).replace("/Library", "")

Library/store.py

@@ -4,3 +4,4 @@ class Store:
     global_data_path = None
     dynamic_data_path = None
     static_data_path = None
+    current_response = None

a.png

@@ -1,4 +1,4 @@
-imgcompare
+requests==2.23.0
 pytest==5.3.2
 pytest-cov==2.8.1
 pytest-metadata==1.8
@@ -7,7 +7,8 @@ pytest-clarity==0.2.0a1
 pytest-xdist==1.31.0
 lxml==4.4.2
 allure-pytest==2.8.6
-ipdb == 0.12.3
-pyyaml == 5.3
-flake8 == 3.7.9
-imgcompare = 2.0.1
+ipdb==0.12.3
+pyyaml==5.3
+flake8==3.7.9
+imgcompare==2.0.1
+diffimg==0.2.3