Simplify 'Post' filtersets

Author: Ryan P Kilby

tests/filters.py

@@ -57,15 +57,10 @@ class Meta:
         model = Note
 
 
-class PostFilterWithRelated(FilterSet):
-    note = RelatedFilter(NoteFilterWithRelatedAll, name='note')
-
-    class Meta:
-        model = Post
-
-
-class PostFilterWithMethod(FilterSet):
+class PostFilter(FilterSet):
+    # Used for Related filter and MethodFilter tests
     note = RelatedFilter(NoteFilterWithRelatedAll, name='note')
+    date_published = filters.AllLookupsFilter()
     is_published = filters.MethodFilter()
 
     class Meta:
@@ -92,23 +87,23 @@ def filter_is_published(self, name, qs, value):
 
 class CoverFilterWithRelatedMethodFilter(FilterSet):
     comment = filters.CharFilter(name='comment')
-    post = RelatedFilter(PostFilterWithMethod, name='post')
+    post = RelatedFilter(PostFilter, name='post')
 
     class Meta:
         model = Cover
 
 
 class CoverFilterWithRelated(FilterSet):
     comment = filters.CharFilter(name='comment')
-    post = RelatedFilter(PostFilterWithRelated, name='post')
+    post = RelatedFilter(PostFilter, name='post')
 
     class Meta:
         model = Cover
 
 
 class PageFilterWithRelated(FilterSet):
     title = filters.CharFilter(name='title')
-    previous_page = RelatedFilter(PostFilterWithRelated, name='previous_page')
+    previous_page = RelatedFilter(PostFilter, name='previous_page')
 
     class Meta:
         model = Page

tests/test_filterset.py

@@ -20,8 +20,7 @@
     NoteFilterWithRelated,
     NoteFilterWithRelatedAll,
     NoteFilterWithRelatedAllDifferentFilterName,
-    PostFilterWithRelated,
-    PostFilterWithMethod,
+    PostFilter,
     CoverFilterWithRelatedMethodFilter,
     CoverFilterWithRelated,
     # PageFilterWithRelated,
@@ -256,7 +255,7 @@ def test_double_relation_filter(self):
         GET = {
             'note__author__username__endswith': 'user2'
         }
-        f = PostFilterWithRelated(GET, queryset=Post.objects.all())
+        f = PostFilter(GET, queryset=Post.objects.all())
         self.assertEqual(len(list(f)), 1)
         post = list(f)[0]
         self.assertEqual(post.content, "Test content in post 3")
@@ -320,7 +319,7 @@ def test_get_filterset_subset(self):
 class MethodFilterTests(TestCase):
 
     @classmethod
-    def generateTestData(cls):
+    def setUpTestData(cls):
         user = User.objects.create(username="user1", email="user1@example.org")
 
         note1 = Note.objects.create(title="Test 1", content="Test content 1", author=user)
@@ -336,7 +335,7 @@ def test_method_filter(self):
         GET = {
             'is_published': 'true'
         }
-        filterset = PostFilterWithMethod(GET, queryset=Post.objects.all())
+        filterset = PostFilter(GET, queryset=Post.objects.all())
         results = list(filterset)
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0].content, "Test content in post 2")