Finish basic Exporter tests

Author: jthomale

django/sierra/conftest.py

@@ -16,13 +16,19 @@
 # Base app-related fixtures
 
 @pytest.fixture
-def records_by_recnum_range():
+def sierra_records_by_recnum_range():
     """
-    A pytest fixture that returns a set of objects based on the
+    Return Sierra records by record number range.
+
+    This is a pytest fixture that returns a set of objects based on the
     provided start and (optional) end record number. Uses the
-    appropriate model based on the type of record.
+    appropriate model based on the type of record, derived from the
+    first character of the record numbers (e.g., b is BibRecord).
+
+    Metadata about the filter used is added to an `info` attribute on
+    the object queryset that is returned.
     """
-    def _records_by_recnum_range(start, end=None):
+    def _sierra_records_by_recnum_range(start, end=None):
         rectype = start[0]
         filter_options = {'record_range_from': start, 
                           'record_range_to': end or start}
@@ -32,12 +38,36 @@ def _records_by_recnum_range(start, end=None):
         recset.info = {
             'filter_method': 'filter_by',
             'filter_args': ['record_range', filter_options],
-            'filter_kwargs': None,
+            'filter_kwargs': {},
             'export_filter_type': 'record_range',
             'export_filter_options': filter_options,
         }
         return recset
-    return _records_by_recnum_range
+    return _sierra_records_by_recnum_range
+
+
+@pytest.fixture
+def sierra_full_object_set():
+    """
+    Return a full set of objects from a Sierra (base) model.
+
+    This is a pytest fixture that returns a full set of model objects
+    based on the type of model provided.
+
+    Metadata about the filter used is added to an `info` attribute on
+    the object queryset that is returned.
+    """
+    def _sierra_full_object_set(model_name):
+        recset = getattr(bm, model_name).objects.all()
+        recset.info = {
+            'filter_method': 'all',
+            'filter_args': [],
+            'filter_kwargs': {},
+            'export_filter_type': 'full_export',
+            'export_filter_options': {}
+        }
+        return recset
+    return _sierra_full_object_set
 
 
 # Export app-related fixtures

django/sierra/export/tests/test_exporters.py

@@ -8,51 +8,88 @@
 # FIXTURES AND TEST DATA
 # Fixtures used in the below tests can be found in
 # django/sierra/base/tests/conftest.py:
-#    records_by_recnum_range, new_exporter, export_records,
-#    delete_records, solr_conn, solr_search
+#    sierra_records_by_recnum_range, sierra_full_object_set,
+#    new_exporter, export_records, delete_records, solr_conn,
+#    solr_search
 
 pytestmark = pytest.mark.django_db
 
 
 @pytest.fixture
-def solr_exporter_test_params(records_by_recnum_range):
-    bib_set = records_by_recnum_range('b4371446')
+def solr_exporter_test_params(sierra_records_by_recnum_range,
+                              sierra_full_object_set):
+    bib_set = sierra_records_by_recnum_range('b4371446')
+    eres_set = sierra_records_by_recnum_range('e1001249')
+    item_set = sierra_records_by_recnum_range('i4264281')
+    itype_set = sierra_full_object_set('ItypeProperty')
+    istatus_set = sierra_full_object_set('ItemStatusProperty')
+    location_set = sierra_full_object_set('Location')
+
     return {
         'BibsToSolr': {
             'record_set': bib_set,
-            'core_tests': {
-                'bibdata': { 'query': '*', 'result': 1 },
-                'marc': { 'query': '*', 'result': 1 }
-            }
+            'cores': ['bibdata', 'marc'],
+            'try_delete': True
+        },
+        'EResourcesToSolr': {
+            'record_set': eres_set,
+            'cores': ['haystack'],
+            'try_delete': True
+        },
+        'ItemsToSolr': {
+            'record_set': item_set,
+            'cores': ['haystack'],
+            'try_delete': True
+        },
+        'ItemStatusesToSolr': {
+            'record_set': istatus_set,
+            'cores': ['haystack'],
+            'try_delete': False
+        },
+        'ItypesToSolr': {
+            'record_set': itype_set,
+            'cores': ['haystack'],
+            'try_delete': False
+        },
+        'LocationsToSolr': {
+            'record_set': location_set,
+            'cores': ['haystack'],
+            'try_delete': False
         },
     }
 
 
 # TESTS
 
-@pytest.mark.parametrize('etype_code', ['BibsToSolr'])
+@pytest.mark.parametrize('etype_code', [
+    'BibsToSolr',
+    'EResourcesToSolr',
+    'ItemsToSolr',
+    'ItemStatusesToSolr',
+    'ItypesToSolr',
+    'LocationsToSolr'])
 def test_exports_to_solr(etype_code, solr_exporter_test_params, new_exporter,
                          export_records, delete_records, solr_conn,
                          solr_search):
     """
     For Exporter classes that load data into Solr, blah
     """
     record_set = solr_exporter_test_params[etype_code]['record_set']
-    core_tests = solr_exporter_test_params[etype_code]['core_tests']
-    cores = core_tests.keys()
+    cores = solr_exporter_test_params[etype_code]['cores']
+    try_delete = solr_exporter_test_params[etype_code]['try_delete']
     load_exporter = new_exporter(etype_code, 'full_export', 'waiting')
     conns = {c: solr_conn(c) for c in cores}
-    pre_results = {c: solr_search(conns[c], {'q': core_tests[c]['query']})
-                   for c in cores}
-    export_records(load_exporter, record_set )
-    load_results = {c: solr_search(conns[c], {'q': core_tests[c]['query']})
-                    for c in cores}
-    del_exporter = new_exporter(etype_code, 'full_export', 'waiting')
-    delete_records(del_exporter, record_set)
-    del_results = {c: solr_search(conns[c], {'q': core_tests[c]['query']})
-                   for c in cores}
+    pre_results = {c: solr_search(conns[c], {'q': '*'}) for c in cores}
+    export_records(load_exporter, record_set)
+    load_results = {c: solr_search(conns[c], {'q': '*'}) for c in cores}
+    del_results = {}
+    if try_delete:
+        del_exporter = new_exporter(etype_code, 'full_export', 'waiting')
+        delete_records(del_exporter, record_set)
+        del_results = {c: solr_search(conns[c], {'q': '*'}) for c in cores}
 
     for core in cores:
         assert len(pre_results[core]) == 0
-        assert len(load_results[core]) == core_tests[core]['result']
-        assert len(del_results[core]) == 0
+        assert len(load_results[core]) > 0
+        if try_delete:
+            assert len(del_results[core]) == 0