From 6f38bc394f3fc5d0c81cdfff95587998146fc2ff Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Thu, 28 Mar 2013 22:59:20 +0100 Subject: [PATCH] Whitespaces and spelling. --- tests/field_tests.py | 6 +++--- tests/filter_tests.py | 20 ++++++++++---------- tests/filtering_tests.py | 40 ++++++++++++++++++++-------------------- tests/filterset_tests.py | 18 +++++++++--------- tests/widget_tests.py | 4 ++-- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/tests/field_tests.py b/tests/field_tests.py index e48eac187..6074e0f56 100644 --- a/tests/field_tests.py +++ b/tests/field_tests.py @@ -18,7 +18,7 @@ def to_d(float_value): class RangeFieldTests(TestCase): - + def test_field(self): f = RangeField() self.assertEqual(len(f.fields), 2) @@ -26,14 +26,14 @@ def test_field(self): def test_clean(self): w = RangeWidget() f = RangeField(widget=w) - + self.assertEqual( f.clean(['12.34', '55']), slice(to_d(12.34), to_d(55))) class LookupTypeFieldTests(TestCase): - + def test_field(self): inner = forms.DecimalField() f = LookupTypeField(inner, [('gt', 'gt'), ('lt', 'lt')]) diff --git a/tests/filter_tests.py b/tests/filter_tests.py index a5493d8df..4320e6856 100644 --- a/tests/filter_tests.py +++ b/tests/filter_tests.py @@ -27,7 +27,7 @@ class FilterTests(TestCase): - + def test_creation(self): f = Filter() self.assertEqual(f.lookup_type, 'exact') @@ -202,7 +202,7 @@ def test_filtering_requires_name(self): f = MultipleChoiceFilter() with self.assertRaises(TypeError): f.filter(qs, ['value']) - + def test_filtering(self): qs = mock.Mock(spec=['filter']) f = MultipleChoiceFilter(name='somefield') @@ -211,7 +211,7 @@ def test_filtering(self): mockQclass.side_effect = [mockQ1, mockQ2] f.filter(qs, ['value']) - + self.assertEqual(mockQclass.call_args_list, [mock.call(), mock.call(somefield='value')]) mockQ1.__ior__.assert_called_once_with(mockQ2) @@ -242,7 +242,7 @@ def test_filtering_skipped_with_empty_list_value_and_some_choices(self): class DateFilterTests(TestCase): - + def test_default_field(self): f = DateFilter() field = f.field @@ -250,7 +250,7 @@ def test_default_field(self): class DateTimeFilterTests(TestCase): - + def test_default_field(self): f = DateTimeFilter() field = f.field @@ -258,7 +258,7 @@ def test_default_field(self): class TimeFilterTests(TestCase): - + def test_default_field(self): f = TimeFilter() field = f.field @@ -266,7 +266,7 @@ def test_default_field(self): class ModelChoiceFilterTests(TestCase): - + def test_default_field_without_queryset(self): f = ModelChoiceFilter() with self.assertRaises(TypeError): @@ -281,7 +281,7 @@ def test_default_field_with_queryset(self): class ModelMultipleChoiceFilterTests(TestCase): - + def test_default_field_without_queryset(self): f = ModelMultipleChoiceFilter() with self.assertRaises(TypeError): @@ -296,7 +296,7 @@ def test_default_field_with_queryset(self): class NumberFilterTests(TestCase): - + def test_default_field(self): f = NumberFilter() field = f.field @@ -410,7 +410,7 @@ def test_filtering_for_today(self): class AllValuesFilterTests(TestCase): - + def test_default_field_without_assigning_model(self): f = AllValuesFilter() with self.assertRaises(AttributeError): diff --git a/tests/filtering_tests.py b/tests/filtering_tests.py index d3e37f2a1..5e44de146 100644 --- a/tests/filtering_tests.py +++ b/tests/filtering_tests.py @@ -73,16 +73,16 @@ class Meta: fields = ['is_active'] qs = User.objects.all() - + # '2' and '3' are how the field expects the data from the browser f = F({'is_active': '2'}, queryset=qs) self.assertQuerysetEqual(f.qs, ['jacob'], lambda o: o.username, False) - + f = F({'is_active': '3'}, queryset=qs) self.assertQuerysetEqual(f.qs, ['alex', 'aaron'], lambda o: o.username, False) - + f = F({'is_active': '1'}, queryset=qs) self.assertQuerysetEqual(f.qs, ['alex', 'aaron', 'jacob'], @@ -141,7 +141,7 @@ class Meta: f = F({'status': ['0']}, queryset=qs) self.assertQuerysetEqual( f.qs, ['carl'], lambda o: o.username) - + f = F({'status': ['0', '1']}, queryset=qs) self.assertQuerysetEqual( f.qs, ['alex', 'carl'], lambda o: o.username) @@ -280,10 +280,10 @@ class Meta: qs = User.objects.all().order_by('username') f = F({'favorite_books': ['1']}, queryset=qs) self.assertQuerysetEqual(f.qs, ['aaron', 'alex'], lambda o: o.username) - + f = F({'favorite_books': ['1', '3']}, queryset=qs) self.assertQuerysetEqual(f.qs, ['aaron', 'alex'], lambda o: o.username) - + f = F({'favorite_books': ['2']}, queryset=qs) self.assertQuerysetEqual(f.qs, ['alex'], lambda o: o.username) @@ -404,7 +404,7 @@ class F(FilterSet): class Meta: model = Comment fields = ['date'] - + f = F({'date': '4'}) # this year self.assertQuerysetEqual(f.qs, [1, 3, 4, 5], lambda o: o.pk, False) @@ -415,7 +415,7 @@ class F(FilterSet): class Meta: model = Comment fields = ['date'] - + f = F({'date': '3'}) # this month self.assertQuerysetEqual(f.qs, [1, 3, 4], lambda o: o.pk, False) @@ -623,7 +623,7 @@ def test_fk_relation_attribute(self): alex = User.objects.create(username='alex') jacob = User.objects.create(username='jacob') User.objects.create(username='aaron') - + Article.objects.create(author=alex, published=now_dt) Article.objects.create(author=jacob, published=now_dt) Article.objects.create(author=alex, published=now_dt) @@ -632,7 +632,7 @@ class F(FilterSet): class Meta: model = Article fields = ['author__username'] - + self.assertEqual(list(F.base_filters), ['author__username']) self.assertEqual(F({'author__username': 'alex'}).qs.count(), 2) self.assertEqual(F({'author__username': 'jacob'}).qs.count(), 1) @@ -725,10 +725,10 @@ class Meta: qs = User.objects.all().order_by('username') f = F({'favorite_books': ['1']}, queryset=qs) self.assertQuerysetEqual(f.qs, ['aaron', 'alex'], lambda o: o.username) - + f = F({'favorite_books': ['1', '3']}, queryset=qs) self.assertQuerysetEqual(f.qs, ['aaron', 'alex'], lambda o: o.username) - + f = F({'favorite_books': ['2']}, queryset=qs) self.assertQuerysetEqual(f.qs, ['alex'], lambda o: o.username) @@ -766,7 +766,7 @@ class Meta: qs = User.objects.all().order_by('username') f = F({'favorite_books__title': "Ender's Game"}, queryset=qs) self.assertQuerysetEqual(f.qs, ['aaron', 'alex'], lambda o: o.username) - + f = F({'favorite_books__title': 'Rainbow Six'}, queryset=qs) self.assertQuerysetEqual(f.qs, ['alex'], lambda o: o.username) @@ -776,7 +776,7 @@ class F(FilterSet): class Meta: model = User fields = ['favorite_books__title'] - + f = F() self.assertEqual( len(f.filters['favorite_books__title'].field.choices), 0) @@ -805,7 +805,7 @@ class Meta: f = F({'lovers__username': "alex"}, queryset=qs) self.assertQuerysetEqual( f.qs, ["Ender's Game", "Rainbow Six"], lambda o: o.title) - + f = F({'lovers__username': 'jacob'}, queryset=qs) self.assertQuerysetEqual(f.qs, [], lambda o: o.title) @@ -815,7 +815,7 @@ class F(FilterSet): class Meta: model = Book fields = ['lovers__username'] - + f = F() self.assertEqual( len(f.filters['lovers__username'].field.choices), 0) @@ -848,7 +848,7 @@ class Meta: 'favorite_books__average_rating': 4.0}, queryset=qs) self.assertQuerysetEqual(f.qs, ['aaron'], lambda o: o.username) - + f = F({'favorite_books__price': "3.00", 'favorite_books__average_rating': 4.0}, queryset=qs) @@ -865,7 +865,7 @@ class Meta: f = F({'lovers__status': 1, 'lovers__username': "alex"}, queryset=qs) self.assertQuerysetEqual( f.qs, ["Ender's Game", "Rainbow Six"], lambda o: o.title) - + f = F({'lovers__status': 1, 'lovers__username': 'jacob'}, queryset=qs) self.assertQuerysetEqual(f.qs, [], lambda o: o.title) @@ -963,7 +963,7 @@ class Meta: fields = ['status', 'username'] qs = User.objects.all() - + f = F({'username': 'alex', 'status': '1'}, queryset=qs) self.assertQuerysetEqual(f.qs, ['alex'], lambda o: o.username) @@ -997,7 +997,7 @@ class Meta: f = F({'status': 0}, queryset=qs) self.assertQuerysetEqual(f.qs, ['carl'], lambda o: o.username) - + def test_qs_count(self): class F(FilterSet): class Meta: diff --git a/tests/filterset_tests.py b/tests/filterset_tests.py index 4faf72887..424bffa3b 100644 --- a/tests/filterset_tests.py +++ b/tests/filterset_tests.py @@ -311,7 +311,7 @@ class G(F): class F(FilterSet): other = CharFilter - + class Meta: model = Book @@ -354,7 +354,7 @@ def test_filterset_for_proxy_model(self): class F(FilterSet): class Meta: model = User - + class ProxyF(FilterSet): class Meta: model = AdminUser @@ -366,7 +366,7 @@ def test_filterset_for_mti_model(self): class F(FilterSet): class Meta: model = Account - + class FtiF(FilterSet): class Meta: model = BankAccount @@ -431,7 +431,7 @@ class Meta: model = User fields = ['username', 'status'] order_by = ['status'] - + f = F(queryset=self.qs) self.assertQuerysetEqual( f.qs, ['alex', 'jacob', 'aaron', 'carl'], lambda o: o.username) @@ -442,7 +442,7 @@ class Meta: model = User fields = ['username', 'status'] order_by = ['status'] - + f = F({'o': 'status'}, queryset=self.qs) self.assertQuerysetEqual( f.qs, ['carl', 'alex', 'jacob', 'aaron'], lambda o: o.username) @@ -453,18 +453,18 @@ class Meta: model = User fields = ['username', 'status'] order_by = ['status'] - + f = F({'o': 'username'}, queryset=self.qs) self.assertQuerysetEqual( f.qs, ['alex', 'jacob', 'aaron', 'carl'], lambda o: o.username) - def test_ordering_on_differnt_field(self): + def test_ordering_on_different_field(self): class F(FilterSet): class Meta: model = User fields = ['username', 'status'] order_by = True - + f = F({'o': 'username'}, queryset=self.qs) self.assertQuerysetEqual( f.qs, ['aaron', 'alex', 'carl', 'jacob'], lambda o: o.username) @@ -478,7 +478,7 @@ class Meta: model = User fields = ['account', 'status'] order_by = True - + f = F({'o': 'username'}, queryset=self.qs) self.assertQuerysetEqual( f.qs, ['aaron', 'alex', 'carl', 'jacob'], lambda o: o.username) diff --git a/tests/widget_tests.py b/tests/widget_tests.py index 9412e2410..9bc1114fe 100644 --- a/tests/widget_tests.py +++ b/tests/widget_tests.py @@ -10,7 +10,7 @@ class LookupTypeWidgetTests(TestCase): - + def test_widget_requires_field(self): with self.assertRaises(TypeError): LookupTypeWidget() @@ -41,7 +41,7 @@ def test_widget_render(self): class LinkWidgetTests(TestCase): - + def test_widget_without_choices(self): w = LinkWidget() self.assertEqual(len(w.choices), 0)