tests: re-use constant ELEMENT_DIFF_FIELD_NAME for import tests

Signed-off-by: David Wallace <[email protected]>
rdmorganiser · Mar 8, 2024 · 079194e · 079194e
1 parent 2da0ca8
commit 079194e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/rdmo/management/tests/test_import_conditions.py b/rdmo/management/tests/test_import_conditions.py
@@ -3,6 +3,7 @@
 import pytest
 
 from rdmo.conditions.models import Condition
+from rdmo.core.imports import ELEMENT_DIFF_FIELD_NAME
 from rdmo.management.imports import import_elements
 
 from .helpers_import_elements import (
@@ -53,7 +54,7 @@ def test_update_conditions_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_legacy_conditions(db, settings):

diff --git a/rdmo/management/tests/test_import_domain.py b/rdmo/management/tests/test_import_domain.py
@@ -2,6 +2,7 @@
 
 import pytest
 
+from rdmo.core.imports import ELEMENT_DIFF_FIELD_NAME
 from rdmo.domain.models import Attribute
 from rdmo.management.imports import import_elements
 
@@ -53,7 +54,7 @@ def test_update_attributes_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_legacy_domain(db, settings):

diff --git a/rdmo/management/tests/test_import_options.py b/rdmo/management/tests/test_import_options.py
@@ -60,7 +60,7 @@ def test_update_optionsets_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_update_optionsets_from_changed_xml(db, settings):
@@ -156,7 +156,7 @@ def test_update_options_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 

diff --git a/rdmo/management/tests/test_import_questions.py b/rdmo/management/tests/test_import_questions.py
@@ -2,6 +2,7 @@
 
 import pytest
 
+from rdmo.core.imports import ELEMENT_DIFF_FIELD_NAME
 from rdmo.management.imports import import_elements
 from rdmo.questions.models import Catalog, Page, Question, QuestionSet, Section
 
@@ -64,7 +65,7 @@ def test_update_catalogs_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_sections(db, settings):
@@ -114,7 +115,7 @@ def test_update_sections_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_pages(db, settings):
@@ -163,7 +164,7 @@ def test_update_pages_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_questionsets(db, settings):
@@ -214,7 +215,7 @@ def test_update_questionsets_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_questions(db, settings):
@@ -261,7 +262,7 @@ def test_update_questions_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_legacy_questions(db, settings):

diff --git a/rdmo/management/tests/test_import_tasks.py b/rdmo/management/tests/test_import_tasks.py
@@ -2,6 +2,7 @@
 
 import pytest
 
+from rdmo.core.imports import ELEMENT_DIFF_FIELD_NAME
 from rdmo.management.imports import import_elements
 from rdmo.tasks.models import Task
 
@@ -53,7 +54,7 @@ def test_update_tasks_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_legacy_tasks(db, settings):

diff --git a/rdmo/management/tests/test_import_views.py b/rdmo/management/tests/test_import_views.py
@@ -2,6 +2,7 @@
 
 import pytest
 
+from rdmo.core.imports import ELEMENT_DIFF_FIELD_NAME
 from rdmo.management.imports import import_elements
 from rdmo.views.models import View
 
@@ -53,7 +54,7 @@ def test_update_views_with_changed_fields(db, settings, updated_fields):
     assert len(imported_and_changed) == len(changed_elements)
     # compare two ordered lists with "updated_and_changed" dicts
     for test, imported in zip(changed_elements, imported_and_changed):
-        assert test['updated_and_changed'] == imported['updated_and_changed']
+        assert test[ELEMENT_DIFF_FIELD_NAME] == imported[ELEMENT_DIFF_FIELD_NAME]
 
 
 def test_create_legacy_tasks(db, settings):