Merge pull request #31 from pyqa/compare_utility

Rest Api Tests with complete function coverage
pyqa · Feb 4, 2019 · d36846e · d36846e
2 parents 9e7b503 + 14614bd
commit d36846e
Show file tree

Hide file tree

Showing 17 changed files with 172 additions and 275 deletions.
diff --git a/Examples/FilesCompare/files_comparison_example.py b/Examples/FilesCompare/files_comparison_example.py
diff --git a/Examples/FilesCompare/first.json b/Examples/FilesCompare/first.json
diff --git a/Examples/FilesCompare/first.xlsx b/Examples/FilesCompare/first.xlsx
diff --git a/Examples/FilesCompare/fourth.json b/Examples/FilesCompare/fourth.json
diff --git a/Examples/FilesCompare/samplecomparisontest.py b/Examples/FilesCompare/samplecomparisontest.py
@@ -0,0 +1,42 @@
+"""Example for Comparison module."""
+from imgqa import Compare
+
+# Variable Stack / Data
+image1 = "highway.jpg"
+image2 = "highway_altered.jpg"
+source_xl = "source.xlsx"
+target_xl = "target.xlsx"
+source_csv = "source_csv.csv"
+target_csv = "target_csv.csv"
+source_json = "{'as': 1," \
+              "'a': {'b': {'cs':10, 'qqq': {'qwe':1}}," \
+              "'d': {'csd':30}}}"
+target_json = "{'as': 1," \
+              "'a': {'b': {'ds':10, 'qqq': {'qwe':11}}," \
+              "'d': {'dsd':40}}}"
+
+
+class TestCompareFiles(Compare):
+    """Sample Test Suite."""
+
+    def test_compare_images(self):
+        """Compare images."""
+        self.assertEqual(self.compare_images(image1, image1), 1.0)
+
+    def test_compare_jsons(self):
+        """Compare jsons."""
+        self.assertNotEqual(self.compare_json(source_json, target_json), '{}')
+
+    def test_compare_workbooks(self):
+        """Compare spreadsheet.
+
+        xl file will be generated with file difference.
+        """
+        self.compare_files(source_xl, target_xl)
+
+    def test_compare_files(self):
+        """Compare spreadsheet.
+
+        xl file will be generated with file difference.
+        """
+        self.compare_files(source_csv, target_csv)
diff --git a/Examples/FilesCompare/sea.jpg b/Examples/FilesCompare/sea.jpg
diff --git a/Examples/FilesCompare/second.json b/Examples/FilesCompare/second.json
diff --git a/Examples/FilesCompare/second.xlsx b/Examples/FilesCompare/second.xlsx
diff --git a/Examples/FilesCompare/source.xlsx b/Examples/FilesCompare/source.xlsx
diff --git a/Examples/FilesCompare/second.csv → Examples/FilesCompare/source_csv.csv b/Examples/FilesCompare/second.csv → Examples/FilesCompare/source_csv.csv
@@ -1,4 +1,3 @@
 Year,Industry_aggregation_NZSIOC,Industry_code_NZSIOC,Industry_name_NZSIOC,Units,Variable_code,Variable_name,Variable_category,Value,Industry_code_ANZSIC06
 2017,Level 4,AA111,Horticulture and Fruit Growing,Dollars (millions),H04,"Sales, government funding, grants and subsidies",Financial performance,3999,"ANZSIC06 groups A011, A012, and A013"
-2017,Level 4,AA111,Horticulture and Fruit Growing,Dollars (millions),H04,"Sales, government funding, grants and subsidies",Financial performance,3999,"ANZSIC06 groups A011, A012, and A013"
-
+2017,Level 4,AA111,Horticulture and Fruit Growing,Dollars (millions),H04,"Sales, government funding, grants and subsidies",Financial performance,3999,"ANZSIC06 groups A011, A012, and A013"
diff --git a/Examples/FilesCompare/target.xlsx b/Examples/FilesCompare/target.xlsx
diff --git a/Examples/FilesCompare/first.csv → Examples/FilesCompare/target_csv.csv b/Examples/FilesCompare/first.csv → Examples/FilesCompare/target_csv.csv
@@ -1,4 +1,3 @@
-Year,Industry_aggregation_NZSIOC,Industry_code_NZSIOC,Industry_name_NZSIOC,Units,Variable_code,Variable_name,Variable_category,Value,Industry_code_ANZSIC06
-2017,Level 4,AA111,Horticulture and Fruit Growing,Dollars (millions),H04,"Sales, government funding, grants and subsidies",Financial performance,3999,"ANZSIC06 groups A011, A012, and A013"
-2016,Level 3,AA111,Horticulture and Fruit Growing,Dollars (millions),H03,"Sales, government funding, grants and subsidies",Financial performance,3998,"ANZSIC06 groups A011, A012, and A014"
-
+Year,Industry_aggregation_NZSIOC,Industry_code_NZSIOC,Industry_name_NZSIOC,Units,Variable_code,Variable_name,Variable_category,Value,Industry_code_ANZSIC06
+2017,Level 4,AA111,Horticulture and Fruit Growing,Dollars (millions),H04,"Sales, government funding, grants and subsidies",Financial performance,3999,"ANZSIC06 groups A011, A012, and A013"
+2016,Level 3,AA111,Horticulture and Fruit Growing,Dollars (millions),H03,"Sales, government funding, grants and subsidies",Financial performance,3998,"ANZSIC06 groups A011, A012, and A014"
diff --git a/Examples/FilesCompare/third.json b/Examples/FilesCompare/third.json
diff --git a/Examples/samplerestapitest.py b/Examples/samplerestapitest.py
@@ -21,8 +21,14 @@ def test_get_users(self):
         """Get users from application."""
         users = self.apirequest(method="GET", url=uri)
         resp = json.loads(users.text)
-        logging.warning(resp)
-        self.assert_not_in_resp(resp=resp, member='Georg1e',
+        logging.info(resp)
+        self.assert_in_resp(resp=resp, member='orge',
+                            container='resp.data.0.first_name')
+        self.assert_equal_resp(resp=resp, member='George',
+                               container='resp.data.0.first_name')
+        self.assert_not_equal_resp(resp=resp, member='George1',
+                                   container='resp.data.0.first_name')
+        self.assert_not_in_resp(resp=resp, member='John',
                                 container='resp.data.0.first_name')
 
     def test_post_users(self):