refactor(cl): convert PeopleTestCase to a mixin

Author: florean

cl/citations/tests.py

@@ -62,7 +62,7 @@
 from cl.citations.utils import (
     make_get_citations_kwargs,
 )
-from cl.lib.test_helpers import PeopleTestCase, SearchTestCase
+from cl.lib.test_helpers import SearchTestCase
 from cl.search.documents import ParentheticalGroupDocument
 from cl.search.factories import (
     CitationWithParentsFactory,
@@ -90,7 +90,7 @@
     TestCase,
     TransactionTestCase,
 )
-from cl.tests.mixins import CourtMixin
+from cl.tests.mixins import CourtMixin, PeopleMixin
 from cl.users.factories import UserProfileWithParentsFactory
 
 HYPERSCAN_TOKENIZER = HyperscanTokenizer(cache_dir=".hyperscan")
@@ -1584,7 +1584,7 @@ def test_citation_count_not_updated(self) -> None:
 
 
 class CitationFeedTest(
-    TestCase, ESIndexTestCase, CourtMixin, PeopleTestCase, SearchTestCase
+    TestCase, ESIndexTestCase, CourtMixin, PeopleMixin, SearchTestCase
 ):
     @classmethod
     def setUpTestData(cls) -> None:
@@ -2348,16 +2348,14 @@ def test_get_graph_component(self):
     "cl.api.utils.CitationCountRateThrottle.get_cache_key_for_citations",
     return_value="citations_tests",
 )
-class CitationLookUpApiTest(
-    TestCase, CourtMixin, PeopleTestCase, SearchTestCase
-):
+class CitationLookUpApiTest(TestCase, CourtMixin, PeopleMixin, SearchTestCase):
     @classmethod
     def setUpTestData(cls) -> None:
+        super().setUpTestData()
         UserProfileWithParentsFactory.create(
             user__username="citation-user",
             user__password=make_password("password"),
         )
-        super().setUpTestData()
 
     @async_to_sync
     async def setUp(self) -> None:

cl/lib/test_helpers.py

@@ -15,18 +15,12 @@
 from cl.audio.models import Audio
 from cl.lib.utils import deepgetattr
 from cl.people_db.factories import (
-    ABARatingFactory,
     AttorneyFactory,
     AttorneyOrganizationFactory,
-    EducationFactory,
     PartyFactory,
     PartyTypeFactory,
     PersonFactory,
-    PoliticalAffiliationFactory,
-    PositionFactory,
-    SchoolFactory,
 )
-from cl.people_db.models import Race
 from cl.search.constants import o_type_index_map
 from cl.search.docket_sources import DocketSources
 from cl.search.documents import DocketDocument
@@ -791,152 +785,6 @@ def midnight_pt_test(d: datetime.date) -> datetime.datetime:
 )
 
 
-class PeopleTestCase(TestCase):
-    """People test case factories"""
-
-    @classmethod
-    def setUpTestData(cls):
-        cls.w_race, _ = Race.objects.get_or_create(race="w")
-        cls.b_race, _ = Race.objects.get_or_create(race="b")
-        cls.person_1 = PersonFactory.create(
-            gender="m",
-            name_first="Bill",
-            name_last="Clinton",
-        )
-        cls.person_1.race.add(cls.w_race)
-
-        cls.person_2 = PersonFactory.create(
-            gender="f",
-            name_first="Judith",
-            name_last="Sheindlin",
-            name_suffix="2",
-            date_dob=datetime.date(1942, 10, 21),
-            date_dod=datetime.date(2020, 11, 25),
-            date_granularity_dob="%Y-%m-%d",
-            date_granularity_dod="%Y-%m-%d",
-            name_middle="Susan",
-            dob_city="Brookyln",
-            dob_state="NY",
-            fjc_id=19832,
-        )
-        cls.person_2.race.add(cls.w_race)
-        cls.person_2.race.add(cls.b_race)
-
-        cls.person_3 = PersonFactory.create(
-            gender="f",
-            name_first="Sheindlin",
-            name_last="Judith",
-            date_dob=datetime.date(1945, 11, 20),
-            date_granularity_dob="%Y-%m-%d",
-            name_middle="Olivia",
-            dob_city="Queens",
-            dob_state="NY",
-        )
-        cls.person_3.race.add(cls.w_race)
-
-        cls.position_1 = PositionFactory.create(
-            date_granularity_start="%Y-%m-%d",
-            date_start=datetime.date(1993, 1, 20),
-            date_retirement=datetime.date(2001, 1, 20),
-            termination_reason="retire_mand",
-            position_type="pres",
-            person=cls.person_1,
-            how_selected="e_part",
-        )
-        cls.position_2 = PositionFactory.create(
-            date_granularity_start="%Y-%m-%d",
-            court=cls.court_1,
-            date_start=datetime.date(2015, 12, 14),
-            predecessor=cls.person_2,
-            appointer=cls.position_1,
-            judicial_committee_action="no_rep",
-            termination_reason="retire_mand",
-            position_type="c-jud",
-            person=cls.person_2,
-            how_selected="e_part",
-            nomination_process="fed_senate",
-            date_elected=datetime.date(2015, 11, 12),
-            date_confirmation=datetime.date(2015, 11, 14),
-            date_termination=datetime.date(2018, 10, 14),
-            date_granularity_termination="%Y-%m-%d",
-            date_hearing=datetime.date(2021, 10, 14),
-            date_judicial_committee_action=datetime.date(2022, 10, 14),
-            date_recess_appointment=datetime.date(2013, 10, 14),
-            date_referred_to_judicial_committee=datetime.date(2010, 10, 14),
-            date_retirement=datetime.date(2023, 10, 14),
-        )
-        cls.position_3 = PositionFactory.create(
-            date_granularity_start="%Y-%m-%d",
-            date_start=datetime.date(2015, 12, 14),
-            organization_name="Pants, Inc.",
-            job_title="Corporate Lawyer",
-            position_type=None,
-            person=cls.person_2,
-        )
-        cls.position_4 = PositionFactory.create(
-            date_granularity_start="%Y-%m-%d",
-            court=cls.court_2,
-            date_start=datetime.date(2020, 12, 14),
-            predecessor=cls.person_3,
-            appointer=cls.position_1,
-            judicial_committee_action="no_rep",
-            termination_reason="retire_mand",
-            position_type="c-jud",
-            person=cls.person_3,
-            how_selected="a_legis",
-            nomination_process="fed_senate",
-        )
-
-        cls.school_1 = SchoolFactory(name="New York Law School")
-        cls.school_2 = SchoolFactory(name="American University")
-
-        cls.education_1 = EducationFactory(
-            degree_level="jd",
-            person=cls.person_2,
-            degree_year=1965,
-            school=cls.school_1,
-        )
-        cls.education_2 = EducationFactory(
-            degree_level="ba",
-            person=cls.person_2,
-            school=cls.school_2,
-        )
-        cls.education_3 = EducationFactory(
-            degree_level="ba",
-            person=cls.person_3,
-            school=cls.school_1,
-        )
-
-        cls.political_affiliation_1 = PoliticalAffiliationFactory.create(
-            political_party="d",
-            source="b",
-            date_start=datetime.date(1993, 1, 1),
-            person=cls.person_1,
-            date_granularity_start="%Y",
-        )
-        cls.political_affiliation_2 = PoliticalAffiliationFactory.create(
-            political_party="d",
-            source="b",
-            date_start=datetime.date(2015, 12, 14),
-            person=cls.person_2,
-            date_granularity_start="%Y-%m-%d",
-        )
-        cls.political_affiliation_3 = PoliticalAffiliationFactory.create(
-            political_party="i",
-            source="b",
-            date_start=datetime.date(2015, 12, 14),
-            person=cls.person_3,
-            date_granularity_start="%Y-%m-%d",
-        )
-
-        cls.aba_rating_1 = ABARatingFactory(
-            rating="nq",
-            person=cls.person_2,
-            year_rated="2015",
-        )
-        super().setUpTestData()
-
-
 class SearchTestCase(TestCase):
     """Search test case factories"""
 

cl/opinion_page/tests.py

@@ -31,7 +31,6 @@
 from cl.lib.redis_utils import get_redis_interface
 from cl.lib.storage import clobbering_get_name
 from cl.lib.test_helpers import (
-    PeopleTestCase,
     SearchTestCase,
     SimpleUserDataMixin,
     SitemapTest,
@@ -89,7 +88,7 @@
 )
 from cl.sitemaps_infinite.sitemap_generator import generate_urls_chunk
 from cl.tests.cases import ESIndexTestCase, TestCase
-from cl.tests.mixins import CourtMixin
+from cl.tests.mixins import CourtMixin, PeopleMixin
 from cl.tests.providers import fake
 from cl.users.factories import UserFactory, UserProfileWithParentsFactory
 
@@ -122,7 +121,7 @@ class OpinionPageLoadTest(
     TestCase,
     ESIndexTestCase,
     CourtMixin,
-    PeopleTestCase,
+    PeopleMixin,
     SearchTestCase,
 ):
     @classmethod

cl/search/tests/tests.py

@@ -34,7 +34,6 @@
 from cl.lib.indexing_utils import log_last_document_indexed
 from cl.lib.redis_utils import get_redis_interface
 from cl.lib.storage import clobbering_get_name
-from cl.lib.test_helpers import PeopleTestCase
 from cl.lib.utils import (
     cleanup_main_query,
     get_child_court_ids_for_parents,
@@ -91,7 +90,7 @@
 from cl.search.types import EventTable
 from cl.tests.base import SELENIUM_TIMEOUT, BaseSeleniumTest
 from cl.tests.cases import ESIndexTestCase, TestCase
-from cl.tests.mixins import CourtMixin
+from cl.tests.mixins import CourtMixin, PeopleMixin
 from cl.tests.utils import get_with_wait
 from cl.users.factories import UserProfileWithParentsFactory
 
@@ -2770,7 +2769,7 @@ def test_get_unique_oldest_date_range_rows(self) -> None:
     return_value="es_sweep_indexer:log_test",
 )
 class SweepIndexerCommandTest(
-    TestCase, CourtMixin, PeopleTestCase, ESIndexTestCase
+    TestCase, CourtMixin, PeopleMixin, ESIndexTestCase
 ):
     """sweep_indexer command tests for Elasticsearch"""
 

cl/search/tests/tests_es_opinion.py

@@ -26,7 +26,6 @@
 from cl.lib.elasticsearch_utils import do_es_api_query
 from cl.lib.redis_utils import get_redis_interface
 from cl.lib.test_helpers import (
-    PeopleTestCase,
     SearchTestCase,
     opinion_document_v4_api_keys,
     opinion_v3_search_api_keys,
@@ -78,12 +77,12 @@
     TransactionTestCase,
     V4SearchAPIAssertions,
 )
-from cl.tests.mixins import CourtMixin
+from cl.tests.mixins import CourtMixin, PeopleMixin
 from cl.users.factories import UserProfileWithParentsFactory
 
 
 class OpinionSearchAPICommonTests(
-    TestCase, CourtMixin, PeopleTestCase, SearchTestCase
+    TestCase, CourtMixin, PeopleMixin, SearchTestCase
 ):
     version_api = "v3"
     skip_common_tests = True
@@ -1216,7 +1215,7 @@ def test_verify_empty_lists_type_fields_after_partial_update(self):
 
 
 class OpinionsESSearchTest(
-    TestCase, ESIndexTestCase, CourtMixin, PeopleTestCase, SearchTestCase
+    TestCase, ESIndexTestCase, CourtMixin, PeopleMixin, SearchTestCase
 ):
     @classmethod
     def setUpTestData(cls):
@@ -2573,7 +2572,7 @@ def test_relevancy_decay_scoring_v3_api(self) -> None:
 
 @override_settings(RELATED_MLT_MINTF=1)
 class RelatedSearchTest(
-    TestCase, ESIndexTestCase, CourtMixin, PeopleTestCase, SearchTestCase
+    TestCase, ESIndexTestCase, CourtMixin, PeopleMixin, SearchTestCase
 ):
     @classmethod
     def setUpTestData(cls) -> None:
@@ -3030,15 +3029,14 @@ async def test_es_get_citing_and_related_clusters_cache_timeout(
 
 
 class IndexOpinionDocumentsCommandTest(
-    TestCase, ESIndexTestCase, CourtMixin, PeopleTestCase, SearchTestCase
+    TestCase, ESIndexTestCase, CourtMixin, PeopleMixin, SearchTestCase
 ):
     """cl_index_parent_and_child_docs command tests for Elasticsearch"""
 
     @classmethod
     def setUpTestData(cls):
         super().setUpTestData()
         cls.rebuild_index("search.OpinionCluster")
-        super().setUpTestData()
         cls.delete_index("search.OpinionCluster")
         cls.create_index("search.OpinionCluster")
 
@@ -4055,7 +4053,7 @@ def test_remove_control_chars_on_text_indexing(self) -> None:
 
 
 class OpinionFeedTest(
-    TestCase, ESIndexTestCase, CourtMixin, PeopleTestCase, SearchTestCase
+    TestCase, ESIndexTestCase, CourtMixin, PeopleMixin, SearchTestCase
 ):
     """Tests for Opinion Search Feed"""
 

cl/search/tests/tests_es_person.py

@@ -14,7 +14,6 @@
 from cl.lib.elasticsearch_utils import build_es_base_query, build_es_main_query
 from cl.lib.search_index_utils import extract_field_values
 from cl.lib.test_helpers import (
-    PeopleTestCase,
     people_v4_fields,
     position_v4_fields,
     skip_if_common_tests_skipped,
@@ -41,10 +40,10 @@
     TransactionTestCase,
     V4SearchAPIAssertions,
 )
-from cl.tests.mixins import CourtMixin
+from cl.tests.mixins import CourtMixin, PeopleMixin
 
 
-class PeopleSearchAPICommonTests(TestCase, CourtMixin, PeopleTestCase):
+class PeopleSearchAPICommonTests(TestCase, CourtMixin, PeopleMixin):
     version_api = "v3"
     skip_common_tests = True
 
@@ -1259,7 +1258,7 @@ def test_people_cursor_api_pagination_count(self) -> None:
 
 
 class PeopleSearchTestElasticSearch(
-    TestCase, CourtMixin, PeopleTestCase, ESIndexTestCase
+    TestCase, CourtMixin, PeopleMixin, ESIndexTestCase
 ):
     """People search tests for Elasticsearch"""
 
@@ -1999,7 +1998,7 @@ def test_frontend_judges_count(self) -> None:
 
 
 class IndexJudgesPositionsCommandTest(
-    TestCase, CourtMixin, PeopleTestCase, ESIndexTestCase
+    TestCase, CourtMixin, PeopleMixin, ESIndexTestCase
 ):
     """test_cl_index_parent_and_child_docs_command tests for Elasticsearch"""