Skip to content

Commit

Permalink
[#1692] coding standards: imports at top
Browse files Browse the repository at this point in the history
  • Loading branch information
@wardi
wardi committed May 1, 2014
1 parent 6ca20c7 commit 74dc38e
Showing 1 changed file with 12 additions and 47 deletions.
59 changes: 12 additions & 47 deletions ckan/new_tests/logic/test_validators.py
View file
Expand Up @@ -3,6 +3,9 @@
'''
import copy
import fractions
import decimal
import warnings

import mock
import nose.tools
Expand All @@ -14,7 +17,9 @@
# different places in the code) we have to either do this or introduce a shared
# test helper functions module (which we also don't want to do).
import ckan.new_tests.lib.navl.test_validators as t

import ckan.lib.navl.dictization_functions as df
import ckan.logic.validators as validators
import ckan.model as model

assert_equals = nose.tools.assert_equals

Expand Down Expand Up @@ -58,7 +63,6 @@ def call_validator(*args, **kwargs):
'''
def call_and_assert(*args, **kwargs):
import ckan.lib.navl.dictization_functions as df
nose.tools.assert_raises(df.Invalid, function, *args, **kwargs)
return call_and_assert

Expand Down Expand Up @@ -147,9 +151,6 @@ def test_name_validator_with_invalid_value(self):
'''If given an invalid value name_validator() should do raise Invalid.
'''
import ckan.logic.validators as validators
import ckan.model as model

invalid_values = [
# Non-string names aren't allowed as names.
13,
Expand Down Expand Up @@ -201,9 +202,6 @@ def test_name_validator_with_valid_value(self):
return the string.
'''
import ckan.logic.validators as validators
import ckan.model as model

valid_names = [
'fred',
'fred-flintstone',
Expand Down Expand Up @@ -232,8 +230,6 @@ def test_user_name_validator_with_non_string_value(self):
value.
'''
import ckan.logic.validators as validators

non_string_values = [
13,
23.7,
Expand Down Expand Up @@ -273,8 +269,6 @@ def test_user_name_validator_with_a_name_that_already_exists(self):
user name that already exists.
'''
import ckan.logic.validators as validators

# Mock ckan.model. model.User.get('user_name') will return another mock
# object rather than None, which will simulate an existing user with
# the same user name in the database.
Expand All @@ -296,9 +290,6 @@ def call_validator(*args, **kwargs):

def test_user_name_validator_successful(self):
'''user_name_validator() should do nothing if given a valid name.'''

import ckan.logic.validators as validators

data = factories.validator_data_dict()
key = ('name',)
data[key] = 'new_user_name'
Expand All @@ -322,19 +313,15 @@ def call_validator(*args, **kwargs):
# the context dict.

def test_if_empty_guess_format(self):

import ckan.logic.validators as validators
import ckan.lib.navl.dictization_functions as dictization_functions

data = {'name': 'package_name', 'resources': [
{'url': 'http://fakedomain/my.csv', 'format': ''},
{'url': 'http://fakedomain/my.pdf',
'format': dictization_functions.Missing},
'format': df.Missing},
{'url': 'http://fakedomain/my.pdf', 'format': 'pdf'},
{'url': 'http://fakedomain/my.pdf',
'id': 'fake_resource_id', 'format': ''}
]}
data = dictization_functions.flatten_dict(data)
data = df.flatten_dict(data)

@t.does_not_modify_errors_dict
def call_validator(*args, **kwargs):
Expand All @@ -361,8 +348,6 @@ def call_validator(*args, **kwargs):
assert new_data[('resources', 3, 'format')] == ''

def test_clean_format(self):
import ckan.logic.validators as validators

format = validators.clean_format('csv')
assert format == 'CSV'

Expand All @@ -376,9 +361,6 @@ def test_clean_format(self):
assert format == ''

def test_datasets_with_org_can_be_private_when_creating(self):

import ckan.logic.validators as validators

data = factories.validator_data_dict()
errors = factories.validator_errors_dict()

Expand All @@ -400,9 +382,6 @@ def call_validator(*args, **kwargs):
call_validator(key, data, errors, context={'model': mock_model})

def test_datasets_with_no_org_cannot_be_private_when_creating(self):

import ckan.logic.validators as validators

data = factories.validator_data_dict()
errors = factories.validator_errors_dict()

Expand All @@ -423,9 +402,6 @@ def call_validator(*args, **kwargs):
call_validator(key, data, errors, context={'model': mock_model})

def test_datasets_with_org_can_be_private_when_updating(self):

import ckan.logic.validators as validators

data = factories.validator_data_dict()
errors = factories.validator_errors_dict()

Expand All @@ -448,8 +424,6 @@ def call_validator(*args, **kwargs):
call_validator(key, data, errors, context={'model': mock_model})

def test_int_validator_idempotent(self):
import ckan.logic.validators as validators

unchanged_values = [
42,
0,
Expand All @@ -460,14 +434,10 @@ def test_int_validator_idempotent(self):
returns_arg(validators.int_validator)(v)

def test_int_validator_convert(self):
import ckan.logic.validators as validators
from fractions import Fraction
from decimal import Decimal

converted_values = [
(42.0, 42),
(Fraction(2, 1), 2),
(Decimal('19.00'), 19),
(fractions.Fraction(2, 1), 2),
(decimal.Decimal('19.00'), 19),
('528735648764587235684376', 528735648764587235684376),
('', None),
(' \n', None),
Expand All @@ -476,18 +446,13 @@ def test_int_validator_convert(self):
assert_equals(validators.int_validator(arg, None), result)

def test_int_validator_invalid(self):
import ckan.logic.validators as validators
from fractions import Fraction
from decimal import Decimal
import warnings

invalid_values = [
42.5,
'42.5',
'1e6',
'text',
Fraction(3, 2),
Decimal('19.99'),
fractions.Fraction(3, 2),
decimal.Decimal('19.99'),
1 + 1j,
1 + 0j, # int(complex) fails, so expect the same
]
Expand Down

0 comments on commit 74dc38e

Please sign in to comment.