Skip to content

Commit

Permalink
tests: change custom test objects prefixes to silence py.test warnigns
Browse files Browse the repository at this point in the history
  • Loading branch information
swistakm committed Nov 8, 2016
1 parent fa30455 commit dd74e9a
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 47 deletions.
50 changes: 25 additions & 25 deletions tests/test_generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def resource_handler(*args, **kwargs):
return resource_handler


class TestSerializer(BaseSerializer):
class ExampleSerializer(BaseSerializer):
writable = RawField("testing writable field")
readonly = RawField("testing readonly field", read_only=True)
unsigned = IntField(
Expand All @@ -55,16 +55,16 @@ def __init__(self, storage=None):
self.storage = storage or []


class TestRetrieveAPI(RetrieveAPI, StoredResource):
serializer = TestSerializer()
class ExampleRetrieveAPI(RetrieveAPI, StoredResource):
serializer = ExampleSerializer()

@index_error_as_404
def retrieve(self, params, meta, index, **kwargs):
return self.storage[int(index)]


class TestRetrieveUpdateAPI(RetrieveUpdateAPI, StoredResource):
serializer = TestSerializer()
class ExampleRetrieveUpdateAPI(RetrieveUpdateAPI, StoredResource):
serializer = ExampleSerializer()

@index_error_as_404
def retrieve(self, params, meta, index, **kwargs):
Expand All @@ -76,8 +76,8 @@ def update(self, params, meta, index, validated, **kwargs):
return validated


class TestRetrieveUpdateDeleteAPI(RetrieveUpdateDeleteAPI, StoredResource):
serializer = TestSerializer()
class ExampleRetrieveUpdateDeleteAPI(RetrieveUpdateDeleteAPI, StoredResource):
serializer = ExampleSerializer()

@index_error_as_404
def retrieve(self, params, meta, index, **kwargs):
Expand All @@ -93,22 +93,22 @@ def delete(self, params, meta, index, **kwargs):
self.storage.pop(int(index))


class TestListAPI(ListAPI, StoredResource):
serializer = TestSerializer()
class ExampleListAPI(ListAPI, StoredResource):
serializer = ExampleSerializer()

def list(self, params, meta, **kwargs):
return self.storage


class TestListWithUriVariableAPI(ListAPI, StoredResource):
serializer = TestSerializer()
class ExampleListWithUriVariableAPI(ListAPI, StoredResource):
serializer = ExampleSerializer()

def list(self, params, meta, uri_template_variable, **kwargs):
return self.storage


class TestListCreateAPI(ListCreateAPI, StoredResource):
serializer = TestSerializer()
class ExampleListCreateAPI(ListCreateAPI, StoredResource):
serializer = ExampleSerializer()

def list(self, params, meta, **kwargs):
return self.storage
Expand All @@ -118,17 +118,17 @@ def create(self, params, meta, validated, **kwargs):
return validated


class TestPaginatedListAPI(PaginatedListAPI, StoredResource):
serializer = TestSerializer()
class ExamplePaginatedListAPI(PaginatedListAPI, StoredResource):
serializer = ExampleSerializer()

def list(self, params, meta, **kwargs):
start = params['page_size'] * (params['page'])
end = params['page_size'] * (params['page'] + 1)
return self.storage[start:end]


class TestPaginatedListCreateAPI(PaginatedListCreateAPI, StoredResource):
serializer = TestSerializer()
class ExamplePaginatedListCreateAPI(PaginatedListCreateAPI, StoredResource):
serializer = ExampleSerializer()

def list(self, params, meta, **kwargs):
start = params['page_size'] * (params['page'])
Expand Down Expand Up @@ -398,7 +398,7 @@ def setUp(self):
super(RetrieveTestCase, self).setUp()
self.api.add_route(
self.uri_template,
TestRetrieveAPI(self.storage)
ExampleRetrieveAPI(self.storage)
)


Expand All @@ -411,7 +411,7 @@ def setUp(self):
super(RetrieveUpdateTestCase, self).setUp()
self.api.add_route(
self.uri_template,
TestRetrieveUpdateAPI(self.storage)
ExampleRetrieveUpdateAPI(self.storage)
)


Expand All @@ -425,7 +425,7 @@ def setUp(self):
super(RetrieveUpdateDeleteTestCase, self).setUp()
self.api.add_route(
self.uri_template,
TestRetrieveUpdateDeleteAPI(self.storage)
ExampleRetrieveUpdateDeleteAPI(self.storage)
)


Expand All @@ -437,7 +437,7 @@ def setUp(self):
super(ListTestCase, self).setUp()
self.api.add_route(
self.uri_template,
TestListAPI(self.storage)
ExampleListAPI(self.storage)
)


Expand All @@ -453,7 +453,7 @@ def setUp(self):
super(ListWithUriVariableTestCase, self).setUp()
self.api.add_route(
self.uri_template,
TestListWithUriVariableAPI(self.storage),
ExampleListWithUriVariableAPI(self.storage),
)


Expand All @@ -466,7 +466,7 @@ def setUp(self):
super(ListCreateTestCase, self).setUp()
self.api.add_route(
self.uri_template,
TestListCreateAPI(self.storage)
ExampleListCreateAPI(self.storage)
)


Expand All @@ -479,7 +479,7 @@ def setUp(self):
super(PaginatedListTestCase, self).setUp()
self.api.add_route(
self.uri_template,
TestPaginatedListAPI(self.storage)
ExamplePaginatedListAPI(self.storage)
)


Expand All @@ -493,5 +493,5 @@ def setUp(self):
super(PaginatedListCreateTestCase, self).setUp()
self.api.add_route(
self.uri_template,
TestPaginatedListCreateAPI(self.storage)
ExamplePaginatedListCreateAPI(self.storage)
)
12 changes: 6 additions & 6 deletions tests/test_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from graceful.validators import min_validator, max_validator


class TestParam(BaseParam):
class ExampleParam(BaseParam):
"""Example testing param class that returns raw value
"""
type = "string"
Expand All @@ -31,7 +31,7 @@ def value(self, raw_value):


def test_parameter_description():
param = TestParam(details="details", required=False)
param = ExampleParam(details="details", required=False)

description = param.describe()
assert 'label' in description
Expand All @@ -42,7 +42,7 @@ def test_parameter_description():


def test_parameter_value():
param = TestParam('label', "details", required=False)
param = ExampleParam('label', "details", required=False)
value = "something passed in qs"

# simple API existence check
Expand All @@ -60,15 +60,15 @@ def test_implementation_hooks():

def test_param_default_value():
# this should pass
TestParam(details="details", default="foo")
ExampleParam(details="details", default="foo")

# anything other than str should raise TypeError
with pytest.raises(TypeError):
TestParam(details="details", default=123)
ExampleParam(details="details", default=123)

# test using required and default at the same time has no sense
with pytest.raises(ValueError):
TestParam(details="details", default="foo", required=True)
ExampleParam(details="details", default="foo", required=True)


def test_string_param():
Expand Down
32 changes: 16 additions & 16 deletions tests/test_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from graceful.serializers import BaseSerializer


class TestField(BaseField):
class ExampleField(BaseField):
""" This is basic field for usage in tests that has raw data representation
(same as internal)
"""
Expand All @@ -24,10 +24,10 @@ def test_simple_serializer_definition():
Test if serializers can be defined in declarative way
"""
class TestSimpleSerializer(BaseSerializer):
foo = TestField(
foo = ExampleField(
details="first field for testing"
)
bar = TestField(
bar = ExampleField(
details="second field for testing"
)

Expand All @@ -53,15 +53,15 @@ class TestEmptySerializer(BaseSerializer):

def test_serializer_inheritance():
class TestParentSerializer(BaseSerializer):
foo = TestField(
foo = ExampleField(
details="first field for testing"
)
bar = TestField(
bar = ExampleField(
details="second field for testing"
)

class TestDerivedSerializer(TestParentSerializer):
baz = TestField(
baz = ExampleField(
details="this is additional field added as an extension"
)
pass
Expand All @@ -83,11 +83,11 @@ def test_serializer_field_overriding():
parent_label = "parent"

class TestParentSerializer(BaseSerializer):
foo = TestField(label=parent_label, details="parent foo field")
bar = TestField(label=parent_label, details="parent bar field")
foo = ExampleField(label=parent_label, details="parent foo field")
bar = ExampleField(label=parent_label, details="parent bar field")

class TestOverridingSerializer(TestParentSerializer):
foo = TestField(label=override_label, details='overriden foo field')
foo = ExampleField(label=override_label, details='overriden foo field')

serializer = TestOverridingSerializer()
# make sure there are only two fields
Expand All @@ -101,8 +101,8 @@ class TestOverridingSerializer(TestParentSerializer):

def test_serialiser_simple_representation():
class SomeConcreteSerializer(BaseSerializer):
name = TestField(details="name of instance object")
address = TestField(details="instance address")
name = ExampleField(details="name of instance object")
address = ExampleField(details="instance address")

object_instance = {
"name": "John",
Expand All @@ -129,11 +129,11 @@ def test_serialiser_sources_representation():
"""

class SomeConcreteSerializer(BaseSerializer):
name = TestField(
name = ExampleField(
details="name of instance object (taken from _name)",
source="_name",
)
address = TestField(
address = ExampleField(
details="address of instace object (taken from _address)",
source="_address"
)
Expand Down Expand Up @@ -208,7 +208,7 @@ def test_serializer_source_wildcard():

def test_serializer_source_field_with_wildcard():
class ExampleSerializer(BaseSerializer):
instance = TestField(
instance = ExampleField(
details='whole object instance goes here',
source='*',
)
Expand All @@ -223,8 +223,8 @@ def test_serializer_describe():
""" Test that serializers are self-describing
"""
class ExampleSerializer(BaseSerializer):
foo = TestField(label='foo', details='foo foo')
bar = TestField(label='bar', details='bar bar')
foo = ExampleField(label='foo', details='foo foo')
bar = ExampleField(label='bar', details='bar bar')

serializer = ExampleSerializer()

Expand Down

0 comments on commit dd74e9a

Please sign in to comment.