diff --git a/ckan/new_tests/factories.py b/ckan/new_tests/factories.py index e338c1caa1b..b68fa7789f7 100644 --- a/ckan/new_tests/factories.py +++ b/ckan/new_tests/factories.py @@ -78,3 +78,19 @@ def _create(cls, target_class, *args, **kwargs): assert False, "Positional args aren't supported, use keyword args." user_dict = helpers.call_action('user_create', **kwargs) return user_dict + + +def validator_data_dict(): + '''Return a data dict with some arbitrary data in it, suitable to be passed + to validator functions for testing. + + ''' + return {('other key',): 'other value'} + + +def validator_errors_dict(): + '''Return an errors dict with some arbitrary errors in it, suitable to be + passed to validator functions for testing. + + ''' + return {('other key',): ['other error']} diff --git a/ckan/new_tests/logic/test_validators.py b/ckan/new_tests/logic/test_validators.py index 712f3787672..20347575db0 100644 --- a/ckan/new_tests/logic/test_validators.py +++ b/ckan/new_tests/logic/test_validators.py @@ -8,7 +8,7 @@ import nose.tools import ckan.new_tests.helpers as helpers -import ckan.new_tests.data as test_data +import ckan.new_tests.factories as factories class TestValidators(object): @@ -133,9 +133,9 @@ def test_user_name_validator_with_non_string_value(self): key = ('name',) for non_string_value in non_string_values: - data = test_data.validator_data_dict() + data = factories.validator_data_dict() data[key] = non_string_value - errors = test_data.validator_errors_dict() + errors = factories.validator_errors_dict() errors[key] = [] # Make copies of the data and errors dicts for asserting later. @@ -164,10 +164,10 @@ def test_user_name_validator_with_a_name_that_already_exists(self): # the same user name in the database. mock_model = mock.MagicMock() - data = test_data.validator_data_dict() + data = factories.validator_data_dict() key = ('name',) data[key] = 'user_name' - errors = test_data.validator_errors_dict() + errors = factories.validator_errors_dict() errors[key] = [] # Make copies of the data and errors dicts for asserting later. @@ -199,10 +199,10 @@ def test_user_name_validator_successful(self): import ckan.logic.validators as validators - data = test_data.validator_data_dict() + data = factories.validator_data_dict() key = ('name',) data[key] = 'new_user_name' - errors = test_data.validator_errors_dict() + errors = factories.validator_errors_dict() errors[key] = [] # Mock ckan.model.