Added few test cases.

Author: Abhilash Joseph C

py3resttest/binding.py

@@ -10,7 +10,7 @@
 
 class Context(object):
     """ Manages binding of variables & generators, with both variable name and generator name being strings """
-
+    # variables = {}
     def __init__(self):
         self.variables = {}  # Maps variable name to current value
         self.generators = {}  # Maps generator name to generator function
@@ -21,6 +21,7 @@ def bind_variable(self, variable_name, variable_value):
             This allows for passing in variables in testing """
         str_name = str(variable_name)
         prev = self.variables.get(str_name)
+
         if prev != variable_value:
             self.variables[str(variable_name)] = variable_value
             self.mod_count = self.mod_count + 1

py3resttest/testcase.py

@@ -86,7 +86,7 @@ def __init__(self):
     def parse(self, base_url: str, testcase_list: List, test_file=None, working_directory=None, variable_dict=None):
 
         if working_directory is None:
-            working_directory = os.path.abspath(os.getcwd())
+            working_directory = Path(os.path.abspath(os.getcwd()))
         else:
             working_directory = Path(working_directory)
         if variable_dict is None:
@@ -116,11 +116,12 @@ def parse(self, base_url: str, testcase_list: List, test_file=None, working_dire
                                 self.parse(base_url, import_testcase_list, variable_dict=variable_dict)
                 elif key == YamlKeyWords.IMPORT:
                     if sub_testcase_node not in self.__testcase_file:
-                        testcase_file_path = os.path.dirname(os.path.realpath(sub_testcase_node))
+                        testcase_file_path = sub_testcase_node
                         logger.debug("Importing testcase from %s", testcase_file_path)
+                        testcase_file_path = working_directory.joinpath("%s" % testcase_file_path).resolve()
                         self.__testcase_file.add(sub_testcase_node)
                         import_testcase_list = read_testcase_file(testcase_file_path)
-                        with ChangeDir(testcase_file_path):
+                        with ChangeDir(working_directory):
                             self.parse(base_url, import_testcase_list, variable_dict=variable_dict)
                 elif key == YamlKeyWords.URL:
                     __group_name = TestCaseGroup.DEFAULT_GROUP
@@ -368,6 +369,8 @@ def url(self):
             val = self.__url
         if not self.__abs_url:
             val = urljoin(self.__base_url, val)
+        if isinstance(val, dict):
+            logger.warning("URL is not applied template values.")
         return val
 
     @url.setter
@@ -490,8 +493,10 @@ def body(self, value):
         if value:
             if isinstance(value, bytes):
                 self.__body = ContentHandler.parse_content(value.decode())
-            else:
+            elif isinstance(value, str):
                 self.__body = ContentHandler.parse_content(value)
+            else:
+                self.__body = value
         else:
             self.__body = value
 
@@ -500,7 +505,7 @@ def failures(self):
         return self.__failure_list
 
     def realize_template(self, variable_name, context):
-        if context is None or self.templates is None or variable_name not in self.templates:
+        if (context or self.templates) is None or (variable_name not in self.templates):
             return None
         if not context.get_values():
             return None

tests/content-test-include.yaml

@@ -0,0 +1,2 @@
+- include:
+    - tests.content-test

tests/test_binding.py

@@ -19,6 +19,7 @@ def test_variables(self):
         """ Test bind/return of variables """
 
         context = Context()
+        context.variables = {}
         self.assertTrue(context.get_value('foo') is None)
         self.assertEqual(0, context.mod_count)
 

tests/test_testcase.py

@@ -115,6 +115,31 @@ def test_config(self):
             }
         ]
         self.assertRaises(TypeError, config_object.parse, config_list)
+        test_case = TestCase('https://api.github.com', None, None)
+        testcase_list = [
+            {'name': 'Get github user abihijo89-to'},
+            {'url': '/search/users?q=abhijo89-to'},
+            {'method': 'GET'},
+            {'headers': {'Content-Type': 'application/json'}},
+
+        ]
+
+        test_case.parse(testcase_list)
+        test_case.run()
+        self.assertTrue(test_case.is_passed)
+
+    def test_include(self):
+        with open("%s/content-test-include.yaml" % current_module_path.parent, 'r') as f:
+            test_dict_list = yaml.safe_load(f.read())
+
+            ts = TestSet()
+            ts.parse('', test_dict_list)
+            self.assertEqual(1, len(ts.test_group_list_dict))
+            ts.parse('', [{'url': 'http://google.com'}])
+            self.assertEqual(1, len(ts.test_group_list_dict))
+            ts.parse('', [{'import': 'tests/content-test.yaml'}])
+            self.assertEqual(1, len(ts.test_group_list_dict))
+
 
-        if __name__ == '__main__':
-            unittest.main()
+if __name__ == '__main__':
+    unittest.main()

tests/test_tests.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
-
+import string
 import unittest
 
-from py3resttest.exception import BindError, HttpMethodError, ValidatorError
-from py3resttest.validators import ComparatorValidator, ExtractTestValidator
 from pytest import fail
 
 from py3resttest import generators
 from py3resttest.binding import Context
+from py3resttest.contenthandling import ContentHandler
+from py3resttest.exception import BindError, HttpMethodError, ValidatorError
 from py3resttest.testcase import TestCase
+from py3resttest.validators import ComparatorValidator, ExtractTestValidator
 
 
 class TestsTest(unittest.TestCase):
@@ -210,18 +211,18 @@ def test_parse_extractor_bind(self):
         test = TestCase('', None, None, context)
         test.parse(test_config)
         test.pre_update(context)
-        # self.assertTrue(test.extract_binds)
-        # self.assertEqual(2, len(test.extract_binds))
-        # self.assertTrue('id' in test.extract_binds)
-        # self.assertTrue('name' in test.extract_binds)
+        self.assertTrue(test.extract_binds)
+        self.assertEqual(2, len(test.extract_binds))
+        self.assertTrue('id' in test.extract_binds)
+        self.assertTrue('name' in test.extract_binds)
         #
-        # # Test extractors config'd correctly for extraction
-        # myjson = '{"idfield": 3, "firstname": "bob"}'
-        # extracted = test.extract_binds['id'].extract(myjson)
-        # self.assertEqual(3, extracted)
+        # Test extractors config'd correctly for extraction
+        myjson = '{"idfield": 3, "firstname": "bob"}'
+        extracted = test.extract_binds['id'].extract(myjson)
+        self.assertEqual(3, extracted)
         #
-        # extracted = test.extract_binds['name'].extract(myjson)
-        # self.assertEqual('bob', extracted)
+        extracted = test.extract_binds['name'].extract(myjson)
+        self.assertEqual('bob', extracted)
 
     def test_parse_extractor_errors(self):
         """ Test that expected errors are thrown on parsing """
@@ -292,9 +293,11 @@ def test_parse_validator_extract_test(self):
     def test_variable_binding(self):
         """ Test that tests successfully bind variables """
         element = 3
-        test_config = [{"url": "/ping"}, {"name": "cheese"},
-                 {"expected_status": ["200", 204, "202"]}]
-        test_config.append({"variable_binds": {'var': 'value'}})
+        test_config = [
+            {"url": "/ping"}, {"name": "cheese"},
+            {"expected_status": ["200", 204, "202"]},
+            {"variable_binds": {'var': 'value'}}
+        ]
         context = Context()
         test = TestCase('', None, context)
         test.parse(test_config)
@@ -307,59 +310,38 @@ def test_variable_binding(self):
         test.pre_update(context)
         self.assertEqual('value', context.get_value('var'))
 
+    def test_url_templating(self):
+        context = Context()
+        test = TestCase('', None, None, context)
+        test.url = {'template': "$cheese"}
+        self.assertTrue(test.is_dynamic())
+        self.assertEqual({'template': '$cheese'}, test.url)
+        self.assertTrue(test.templates['url'])
+        context.bind_variable('cheese', 'liquid_cheese')
+        self.assertEqual('liquid_cheese', test.url)
+
+    def test_test_content_templating(self):
+        context = Context()
+        test = TestCase('', None, None, context)
+        handler = ContentHandler()
+        handler.is_template_content = True
+        handler.content = '{"first_name": "Gaius","id": "$id","last_name": "Baltar","login": "$login"}'
+        context.bind_variables({'id': 9, 'login': 'username'})
+        test.body = handler
+        test.pre_update(context=context)
+        self.assertEqual(string.Template(handler.content).safe_substitute(context.get_values()),
+                         test.body)
+
+    def test_header_templating(self):
+        context = Context()
+        test = TestCase('', None, None, context)
+        head_templated = {'x': {'template': "$val"}}
 
-    # def test_test_url_templating(self):
-    #     test = Test()
-    #     test.set_url('$cheese', isTemplate=True)
-    #     self.assertTrue(test.is_dynamic())
-    #     self.assertEqual('$cheese', test.get_url())
-    #     self.assertTrue(test.templates['url'])
-    #
-    #     context = Context()
-    #     context.bind_variable('cheese', 'stilton')
-    #     self.assertEqual('stilton', test.get_url(context=context))
-    #
-    #     realized = test.realize(context)
-    #     self.assertEqual('stilton', realized.url)
-
-    # def test_test_content_templating(self):
-    #     test = Test()
-    #     handler = ContentHandler()
-    #     handler.is_template_content = True
-    #     handler.content = '{"first_name": "Gaius","id": "$id","last_name": "Baltar","login": "$login"}'
-    #     context = Context()
-    #     context.bind_variables({'id': 9, 'login': 'kvothe'})
-    #     test.set_body(handler)
-    #
-    #     templated = test.realize(context=context)
-    #     self.assertEqual(string.Template(handler.content).safe_substitute(context.get_values()),
-    #                      templated.body)
-
-    # def test_header_templating(self):
-    #     test = Test()
-    #     head_templated = {'$key': "$val"}
-    #     context = Context()
-    #     context.bind_variables({'key': 'cheese', 'val': 'gouda'})
-    #
-    #     # No templating applied
-    #     test.headers = head_templated
-    #     head = test.get_headers()
-    #     self.assertEqual(1, len(head))
-    #     self.assertEqual('$val', head['$key'])
-    #
-    #     test.set_headers(head_templated, is_template=True)
-    #     self.assertTrue(test.templates)
-    #     self.assertTrue(test.NAME_HEADERS in test.templates)
-    #
-    #     # No context, no templating
-    #     head = test.headers
-    #     self.assertEqual(1, len(head))
-    #     self.assertEqual('$val', head['$key'])
-    #
-    #     # Templated with context
-    #     head = test.get_headers(context=context)
-    #     self.assertEqual(1, len(head))
-    #     self.assertEqual('gouda', head['cheese'])
+        context.bind_variables({'val': 'gouda'})
+        # No templating applied
+        test.headers = head_templated
+        self.assertEqual(1, len(test.headers))
+        self.assertEqual('gouda', test.headers['x'])
 
     def test_update_context_variables(self):
         variable_binds = {'foo': 'correct', 'test': 'value'}