Remove solr_assemble_specific_record_data fixtures

While revisiting the tests for the `api` app (in order to add
`shelflist` app tests for the `shelflistitems` API resources), I
realized that the `solr_assemble_specific_record_data` fixture
almost exactly duplicates the
SolrTestDataAssembler.load_static_test_data method. I removed this
fixture (and the parallel `shelflist` app fixture) from conftest.py and
updated the applicable tests.

Author: jthomale

django/sierra/conftest.py

@@ -292,26 +292,6 @@ def global_basic_solr_assembler(global_solr_data_assembler,
                                       tp.GENS, solr_profile_definitions)
 
 
-@pytest.fixture
-def solr_assemble_specific_record_data(basic_solr_assembler):
-    """
-    Pytest fixture. Uses the basic_solr_assembler fixture to generate and
-    load records into Solr to simulate particular records having
-    specific data.
-    """
-    def _solr_assemble_specific_record_data(rdicts, rtypes, assembler=None):
-        assembler = assembler or basic_solr_assembler
-        gens = assembler.gen_factory
-        for rdict in rdicts:
-            for rtype in rtypes:
-                assembler.make(rtype, 1,
-                    **{k: gens.static(v) for k, v in rdict.items()}
-                )
-        assembler.save_all()
-        return assembler
-    return _solr_assemble_specific_record_data
-
-
 @pytest.fixture
 def solr_search():
     """

django/sierra/export/tests/test_exporters.py

@@ -8,8 +8,7 @@
 # Fixtures used in the below tests can be found in
 # django/sierra/base/tests/conftest.py:
 #    sierra_records_by_recnum_range, sierra_full_object_set,
-#    record_sets, new_exporter, redis_obj
-#    solr_assemble_specific_record_data,
+#    record_sets, new_exporter, redis_obj, basic_solr_assembler,
 #    setattr_model_instance, derive_exporter_class,
 #    assert_all_exported_records_are_indexed,
 #    assert_deleted_records_are_not_indexed,
@@ -180,7 +179,7 @@ def test_allmdtosolr_export_get_deletions(batch_exporter_class, record_sets,
 def test_basic_tosolr_export_records(et_code, rset_code, rectypes, do_reindex,
                                      basic_exporter_class, record_sets,
                                      new_exporter, solr_conns, solr_search,
-                                     solr_assemble_specific_record_data,
+                                     basic_solr_assembler,
                                      assert_records_are_indexed,
                                      assert_records_are_not_indexed):
     """
@@ -203,9 +202,11 @@ def test_basic_tosolr_export_records(et_code, rset_code, rectypes, do_reindex,
     overlap_recs = records[0:num_existing]
     only_new_recs = records[num_existing:]
     old_rec_pks = [unicode(pk) for pk in range(99991,99995)]
-    only_old_rec_data = [{'django_id': pk} for pk in old_rec_pks]
-    data = only_old_rec_data + [{'django_id': r.pk} for r in overlap_recs]
-    assembler = solr_assemble_specific_record_data(data, rectypes)
+    only_old_rec_data = [(pk, {}) for pk in old_rec_pks]
+    data = only_old_rec_data + [(r.pk, {}) for r in overlap_recs]
+    for rtype in rectypes:
+        basic_solr_assembler.load_static_test_data(rtype, data,
+                                                   id_field='django_id')
 
     # Check the setup to make sure existing records are indexed and new
     # records are not.
@@ -265,8 +266,7 @@ def test_allmdtosolr_export_records(batch_exporter_class, record_sets,
 ])
 def test_basic_tosolr_delete_records(et_code, rset_code, rectypes,
                                      basic_exporter_class, record_sets,
-                                     new_exporter,
-                                     solr_assemble_specific_record_data,
+                                     new_exporter, basic_solr_assembler,
                                      assert_records_are_indexed,
                                      assert_deleted_records_are_not_indexed):
     """
@@ -275,8 +275,9 @@ def test_basic_tosolr_delete_records(et_code, rset_code, rectypes,
     appropriate index or indexes.
     """
     records = record_sets[rset_code]
-    data = ({'id': r.id, 'record_number': r.get_iii_recnum()} for r in records)
-    assembler = solr_assemble_specific_record_data(data, rectypes)
+    data = [(r.id, {'record_number': r.get_iii_recnum()}) for r in records]
+    for rtype in rectypes:
+        basic_solr_assembler.load_static_test_data(rtype, data)
 
     expclass = basic_exporter_class(et_code)
     exporter = new_exporter(expclass, 'full_export', 'waiting')
@@ -356,8 +357,7 @@ def test_attached_solr_export_records(et_code, rset_code, basic_exporter_class,
 ])
 def test_attached_solr_delete_records(et_code, rset_code, rectypes,
                                       basic_exporter_class, record_sets,
-                                      new_exporter,
-                                      solr_assemble_specific_record_data,
+                                      new_exporter, basic_solr_assembler,
                                       assert_records_are_indexed,
                                       assert_deleted_records_are_not_indexed):
     """
@@ -366,8 +366,9 @@ def test_attached_solr_delete_records(et_code, rset_code, rectypes,
     index or indexes.
     """
     records = record_sets[rset_code]
-    data = ({'id': r.id, 'record_number': r.get_iii_recnum()} for r in records)
-    assembler = solr_assemble_specific_record_data(data, rectypes)
+    data = [(r.id, {'record_number': r.get_iii_recnum()}) for r in records]
+    for rtype in rectypes:
+        basic_solr_assembler.load_static_test_data(rtype, data)
 
     expclass = basic_exporter_class(et_code)
     exporter = new_exporter(expclass, 'full_export', 'waiting')

django/sierra/shelflist/tests/conftest.py

@@ -22,17 +22,3 @@ def shelflist_solr_assembler(solr_data_assembler, solr_profile_definitions):
     }
     return solr_data_assembler(tp.SOLR_TYPES, tp.GLOBAL_UNIQUE_FIELDS,
                                tp.GENS, profile_def)
-
-
-@pytest.fixture(scope='function')
-def solr_assemble_shelflist_record_data(solr_assemble_specific_record_data,
-                                        shelflist_solr_assembler):
-    """
-    Pytest fixture. Assembles specific record data to load into Solr
-    for the shelflistitem profile.
-    """
-    def _solr_assemble_shelflist_record_data(rdicts):
-        return solr_assemble_specific_record_data(rdicts, ('shelflistitem',),
-                                                  shelflist_solr_assembler)
-    return _solr_assemble_shelflist_record_data
-

django/sierra/shelflist/tests/test_exporters.py

@@ -17,7 +17,7 @@
 #    assert_deleted_records_are_not_indexed
 #
 # django/sierra/shelflist/tests/conftest.py:
-#    solr_assemble_shelflist_record_data
+#    shelflist_solr_assembler
 
 pytestmark = pytest.mark.django_db
 
@@ -113,16 +113,17 @@ def test_itemstosolr_records_to_solr(exporter_class, record_sets, new_exporter,
 @pytest.mark.deletions
 @pytest.mark.do_export
 def test_itemstosolr_delete_records(exporter_class, record_sets, new_exporter,
-                                    solr_assemble_shelflist_record_data,
+                                    shelflist_solr_assembler,
                                     assert_records_are_indexed,
                                     assert_deleted_records_are_not_indexed):
     """
     The shelflist app ItemsToSolr `delete_records` method should delete
     records from the appropriate index or indexes.
     """
     records = record_sets['item_del_set']
-    data = ({'id': r.id, 'record_number': r.get_iii_recnum()} for r in records)
-    assembler = solr_assemble_shelflist_record_data(data)
+    data = [(r.id, {'record_number': r.get_iii_recnum()}) for r in records]
+    shelflist_solr_assembler.load_static_test_data('shelflistitem', data,
+                                                   id_field='id')
 
     expclass = exporter_class('ItemsToSolr')
     exporter = new_exporter(expclass, 'full_export', 'waiting')
@@ -137,7 +138,7 @@ def test_itemstosolr_delete_records(exporter_class, record_sets, new_exporter,
 @pytest.mark.exports
 @pytest.mark.do_export
 def test_itemstosolr_exps_keep_user_fields(exporter_class, new_exporter,
-                                           solr_assemble_shelflist_record_data,
+                                           shelflist_solr_assembler,
                                            sierra_full_object_set,
                                            get_records_from_index):
     """
@@ -149,9 +150,9 @@ def test_itemstosolr_exps_keep_user_fields(exporter_class, new_exporter,
     """
     ufields = ['inventory_date', 'shelf_status', 'flags', 'inventory_notes']
     records = sierra_full_object_set('ItemRecord').order_by('pk')[0:6]
-    data = [{'id': r.pk, 'record_number': None} for r in records]
-    assembler = solr_assemble_shelflist_record_data(data)
-
+    data = [(r.pk, {'record_number': i}) for i, r in enumerate(records)]
+    shelflist_solr_assembler.load_static_test_data('shelflistitem', data,
+                                                   id_field='id')
     expclass = exporter_class('ItemsToSolr')
     exporter = new_exporter(expclass, 'full_export', 'waiting')
 
@@ -170,7 +171,7 @@ def test_itemstosolr_exps_keep_user_fields(exporter_class, new_exporter,
         pre_result = pre_results[record.pk]
         post_result = post_results[record.pk]
         recnum = record.record_metadata.get_iii_recnum(True)
-        assert 'record_number' not in pre_result
+        assert pre_result['record_number'] != post_result['record_number']
         assert post_result['record_number'] == recnum
         for uf in ufields:
             assert pre_result.get(uf, None) == post_result.get(uf, None)
@@ -205,10 +206,9 @@ def test_itemstosolr_export_returns_lcodes(exporter_class,
 @pytest.mark.shelflist
 @pytest.mark.deletions
 @pytest.mark.return_vals
-def test_itemstosolr_del_returns_lcodes(exporter_class,
-                                        sierra_full_object_set,
+def test_itemstosolr_del_returns_lcodes(exporter_class, sierra_full_object_set,
                                         new_exporter,
-                                        solr_assemble_shelflist_record_data):
+                                        shelflist_solr_assembler):
     """
     The shelflist app ItemsToSolr `delete_records` method should return
     a vals structure containing a `seen_lcodes` list, or list of unique
@@ -222,9 +222,10 @@ def test_itemstosolr_del_returns_lcodes(exporter_class,
     for rec in records:
         lcode = random.choice(lcode_opts)
         expected_lcodes.add(lcode)
-        data.append({'id': rec.id, 'record_number': rec.get_iii_recnum(),
-                     'location_code': lcode})
-    assembler = solr_assemble_shelflist_record_data(data)
+        data.append((rec.id, {'record_number': rec.get_iii_recnum(),
+                     'location_code': lcode}))
+    shelflist_solr_assembler.load_static_test_data('shelflistitem', data,
+                                                   id_field='id')
 
     expclass = exporter_class('ItemsToSolr')
     exporter = new_exporter(expclass, 'full_export', 'waiting')
@@ -259,8 +260,7 @@ def test_itemstosolr_compile_vals(results, expected, exporter_class,
 @pytest.mark.shelflist
 @pytest.mark.callback
 def test_itemstosolr_shelflist_manifests(exporter_class, new_exporter,
-                                         solr_assemble_shelflist_record_data,
-                                         redis_obj):
+                                         shelflist_solr_assembler, redis_obj):
     """
     The shelflist app ItemsToSolr `final_callback` method should build
     or rebuild the shelflist manifest for each location provided in the
@@ -313,10 +313,11 @@ def test_itemstosolr_shelflist_manifests(exporter_class, new_exporter,
     solr_data = []
     for lcode, slist in updated_shelflists.items():
         for pk, cn, vol, copy in slist:
-            solr_data.append({'id': pk, 'location_code': lcode,
+            solr_data.append((pk, {'location_code': lcode,
                              'call_number_sort': cn, 'volume_sort': vol,
-                             'copy_number': copy, 'call_number_type': 'lc'})
-    assembler = solr_assemble_shelflist_record_data(solr_data)
+                             'copy_number': copy, 'call_number_type': 'lc'}))
+    shelflist_solr_assembler.load_static_test_data('shelflistitem', solr_data,
+                                                   id_field='id')
 
     # Run `final_callback`, passing the appropriate location codes to
     # update shelflistitem manifests for via vals['seen_lcodes'].