diff --git a/tests/all/integration/api/helpers/test_utilities.py b/tests/all/integration/api/helpers/test_utilities.py deleted file mode 100644 index b71fe0cb7f..0000000000 --- a/tests/all/integration/api/helpers/test_utilities.py +++ /dev/null @@ -1,66 +0,0 @@ -import unittest -import string -import datetime - -from app import current_app as app -from app.api.helpers.exceptions import UnprocessableEntity -from tests.all.integration.utils import OpenEventTestCase -from app.api.helpers.utilities import dasherize, require_relationship, string_empty, str_generator, monthdelta, represents_int -from tests.all.integration.setup_database import Setup - - -class TestUtilitiesHelperValidation(OpenEventTestCase): - def setUp(self): - self.app = Setup.create_app() - - def test_dasherize(self): - """Method to test whether an attribute dasherizes or not""" - - with app.test_request_context(): - field = "starts_at" - dasherized_field = "starts-at" - result = dasherize(field) - self.assertEqual(result, dasherized_field) - - def test_require_relationship(self): - """Method to test relationship in request data""" - - with self.assertRaises(UnprocessableEntity): - data = ['event'] - require_relationship(['sponsor', 'event'], data) - - def test_monthdelta(self): - """Method to test difference in months result""" - - with app.test_request_context(): - test_date = datetime.datetime(2000, 6, 18) - test_future_date = monthdelta(test_date, 3) - self.assertEqual(test_future_date, datetime.datetime(2000, 9, 18)) - - def test_represents_int(self): - """Method to test representation of int""" - - with app.test_request_context(): - self.assertTrue(represents_int(4)) - self.assertFalse(represents_int('test')) - - def test_str_generator(self): - """Method to test str_generator.""" - - with app.test_request_context(): - generated_string = str_generator() - self.assertEqual(len(generated_string), 6) - self.assertRegex(generated_string, r'^[A-Z0-9]+$') - self.assertNotRegex(generated_string, r'^[a-z]+$') - - generated_string = str_generator(8, chars=string.ascii_lowercase) - self.assertEqual(len(generated_string), 8) - self.assertRegex(generated_string, r'^[a-z]+$') - self.assertNotRegex(generated_string, r'^[A-Z0-9]+$') - - generated_string = str_generator(chars='ABC253') - self.assertRegex(generated_string, r'^[ABC253]+$') - - -if __name__ == '__main__': - unittest.main() diff --git a/tests/all/unit/api/helpers/test_utilities.py b/tests/all/unit/api/helpers/test_utilities.py index 3b5d95cfc5..6f6211d36c 100644 --- a/tests/all/unit/api/helpers/test_utilities.py +++ b/tests/all/unit/api/helpers/test_utilities.py @@ -1,6 +1,13 @@ import unittest +import string +import datetime + + +from app.api.helpers.exceptions import UnprocessableEntity from app.api.helpers.utilities import get_filename_from_cd -from app.api.helpers.utilities import string_empty +from app.api.helpers.utilities import string_empty, dasherize, represents_int, str_generator, \ + require_relationship, monthdelta + class TestUtilitiesHelperValidation(unittest.TestCase): def test_get_filename_from_cd(self): @@ -17,6 +24,21 @@ def test_get_filename_from_cd(self): self.assertEqual(expected_response_first, response_first) self.assertEqual(expected_response_none, response_none) + def test_dasherize(self): + """Method to test whether an attribute dasherizes or not""" + + field = "starts_at" + dasherized_field = "starts-at" + result = dasherize(field) + self.assertEqual(result, dasherized_field) + + def test_represents_int(self): + """Method to test representation of int""" + + self.assertTrue(represents_int(4)) + self.assertFalse(represents_int('test')) + + def test_string_empty(self): """Method to test whether an empty string is correctly identified.""" @@ -31,6 +53,36 @@ def test_string_empty(self): self.assertFalse(string_empty([])) self.assertFalse(string_empty(False)) + def test_str_generator(self): + """Method to test str_generator.""" + + generated_string = str_generator() + self.assertEqual(len(generated_string), 6) + self.assertRegex(generated_string, r'^[A-Z0-9]+$') + self.assertNotRegex(generated_string, r'^[a-z]+$') + + generated_string = str_generator(8, chars=string.ascii_lowercase) + self.assertEqual(len(generated_string), 8) + self.assertRegex(generated_string, r'^[a-z]+$') + self.assertNotRegex(generated_string, r'^[A-Z0-9]+$') + + generated_string = str_generator(chars='ABC253') + self.assertRegex(generated_string, r'^[ABC253]+$') + + def test_require_relationship(self): + """Method to test relationship in request data""" + + with self.assertRaises(UnprocessableEntity): + data = ['event'] + require_relationship(['sponsor', 'event'], data) + + def test_monthdelta(self): + """Method to test difference in months result""" + + test_date = datetime.datetime(2000, 6, 18) + test_future_date = monthdelta(test_date, 3) + self.assertEqual(test_future_date, datetime.datetime(2000, 9, 18)) + if __name__ == '__main__': unittest.main()