From c1036c17533a3091401ff90f825571f0e6125eca Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 3 Sep 2014 16:34:09 +0100 Subject: More test passing --- tests/test_serializers.py | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'tests/test_serializers.py') diff --git a/tests/test_serializers.py b/tests/test_serializers.py index 31c41730..0a105e8e 100644 --- a/tests/test_serializers.py +++ b/tests/test_serializers.py @@ -1,31 +1,31 @@ -from django.test import TestCase -from django.utils import six -from rest_framework.serializers import _resolve_model -from tests.models import BasicModel +# from django.test import TestCase +# from django.utils import six +# from rest_framework.serializers import _resolve_model +# from tests.models import BasicModel -class ResolveModelTests(TestCase): - """ - `_resolve_model` should return a Django model class given the - provided argument is a Django model class itself, or a properly - formatted string representation of one. - """ - def test_resolve_django_model(self): - resolved_model = _resolve_model(BasicModel) - self.assertEqual(resolved_model, BasicModel) +# class ResolveModelTests(TestCase): +# """ +# `_resolve_model` should return a Django model class given the +# provided argument is a Django model class itself, or a properly +# formatted string representation of one. +# """ +# def test_resolve_django_model(self): +# resolved_model = _resolve_model(BasicModel) +# self.assertEqual(resolved_model, BasicModel) - def test_resolve_string_representation(self): - resolved_model = _resolve_model('tests.BasicModel') - self.assertEqual(resolved_model, BasicModel) +# def test_resolve_string_representation(self): +# resolved_model = _resolve_model('tests.BasicModel') +# self.assertEqual(resolved_model, BasicModel) - def test_resolve_unicode_representation(self): - resolved_model = _resolve_model(six.text_type('tests.BasicModel')) - self.assertEqual(resolved_model, BasicModel) +# def test_resolve_unicode_representation(self): +# resolved_model = _resolve_model(six.text_type('tests.BasicModel')) +# self.assertEqual(resolved_model, BasicModel) - def test_resolve_non_django_model(self): - with self.assertRaises(ValueError): - _resolve_model(TestCase) +# def test_resolve_non_django_model(self): +# with self.assertRaises(ValueError): +# _resolve_model(TestCase) - def test_resolve_improper_string_representation(self): - with self.assertRaises(ValueError): - _resolve_model('BasicModel') +# def test_resolve_improper_string_representation(self): +# with self.assertRaises(ValueError): +# _resolve_model('BasicModel') -- cgit v1.2.3 From 21980b800d04a1d82a6003823abfdf4ab80ae979 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 8 Sep 2014 14:24:05 +0100 Subject: More test sorting --- tests/test_serializers.py | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'tests/test_serializers.py') diff --git a/tests/test_serializers.py b/tests/test_serializers.py index 0a105e8e..31c41730 100644 --- a/tests/test_serializers.py +++ b/tests/test_serializers.py @@ -1,31 +1,31 @@ -# from django.test import TestCase -# from django.utils import six -# from rest_framework.serializers import _resolve_model -# from tests.models import BasicModel +from django.test import TestCase +from django.utils import six +from rest_framework.serializers import _resolve_model +from tests.models import BasicModel -# class ResolveModelTests(TestCase): -# """ -# `_resolve_model` should return a Django model class given the -# provided argument is a Django model class itself, or a properly -# formatted string representation of one. -# """ -# def test_resolve_django_model(self): -# resolved_model = _resolve_model(BasicModel) -# self.assertEqual(resolved_model, BasicModel) +class ResolveModelTests(TestCase): + """ + `_resolve_model` should return a Django model class given the + provided argument is a Django model class itself, or a properly + formatted string representation of one. + """ + def test_resolve_django_model(self): + resolved_model = _resolve_model(BasicModel) + self.assertEqual(resolved_model, BasicModel) -# def test_resolve_string_representation(self): -# resolved_model = _resolve_model('tests.BasicModel') -# self.assertEqual(resolved_model, BasicModel) + def test_resolve_string_representation(self): + resolved_model = _resolve_model('tests.BasicModel') + self.assertEqual(resolved_model, BasicModel) -# def test_resolve_unicode_representation(self): -# resolved_model = _resolve_model(six.text_type('tests.BasicModel')) -# self.assertEqual(resolved_model, BasicModel) + def test_resolve_unicode_representation(self): + resolved_model = _resolve_model(six.text_type('tests.BasicModel')) + self.assertEqual(resolved_model, BasicModel) -# def test_resolve_non_django_model(self): -# with self.assertRaises(ValueError): -# _resolve_model(TestCase) + def test_resolve_non_django_model(self): + with self.assertRaises(ValueError): + _resolve_model(TestCase) -# def test_resolve_improper_string_representation(self): -# with self.assertRaises(ValueError): -# _resolve_model('BasicModel') + def test_resolve_improper_string_representation(self): + with self.assertRaises(ValueError): + _resolve_model('BasicModel') -- cgit v1.2.3 From b1c07670ca65084c5fef2bbb63d1f4163763014b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 9 Sep 2014 17:46:28 +0100 Subject: Fleshing out serializer fields --- tests/test_serializers.py | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 tests/test_serializers.py (limited to 'tests/test_serializers.py') diff --git a/tests/test_serializers.py b/tests/test_serializers.py deleted file mode 100644 index 31c41730..00000000 --- a/tests/test_serializers.py +++ /dev/null @@ -1,31 +0,0 @@ -from django.test import TestCase -from django.utils import six -from rest_framework.serializers import _resolve_model -from tests.models import BasicModel - - -class ResolveModelTests(TestCase): - """ - `_resolve_model` should return a Django model class given the - provided argument is a Django model class itself, or a properly - formatted string representation of one. - """ - def test_resolve_django_model(self): - resolved_model = _resolve_model(BasicModel) - self.assertEqual(resolved_model, BasicModel) - - def test_resolve_string_representation(self): - resolved_model = _resolve_model('tests.BasicModel') - self.assertEqual(resolved_model, BasicModel) - - def test_resolve_unicode_representation(self): - resolved_model = _resolve_model(six.text_type('tests.BasicModel')) - self.assertEqual(resolved_model, BasicModel) - - def test_resolve_non_django_model(self): - with self.assertRaises(ValueError): - _resolve_model(TestCase) - - def test_resolve_improper_string_representation(self): - with self.assertRaises(ValueError): - _resolve_model('BasicModel') -- cgit v1.2.3