1 files changed, 43 insertions, 6 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 63090ce04..2d6b85b1a 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -54,6 +54,8 @@ from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
 from archaeological_operations.tests import ImportTest, create_operation
 from archaeological_context_records.tests import ContextRecordInit
 
+from archaeological_operations.serializers import operation_serialization
+from archaeological_context_records.serializers import cr_serialization
 from archaeological_finds import serializers
 
 
@@ -173,8 +175,22 @@ class SerializationTest(GenericSerializationTest, FindInit, TestCase):
         )
         self.assertEqual(len(bfind_json), 1)
 
-        """
-    def test_ope_serialization_with_cr_filter(self):
+        result_queryset = models.Find.objects.filter(
+            uuid=self.finds[0].uuid)
+        res = self.generic_serialization_test(
+            serializers.find_serialization, no_test=True,
+            kwargs={"find_queryset": result_queryset}
+        )
+        find_json = json.loads(
+            res[('finds', 'archaeological_finds__Find')]
+        )
+        self.assertEqual(len(find_json), 1)
+        bfind_json = json.loads(
+            res[('finds', 'archaeological_finds__BaseFind')]
+        )
+        self.assertEqual(len(bfind_json), 1)
+
+    def test_ope_serialization_with_find_filter(self):
         res = self.generic_serialization_test(
             operation_serialization, no_test=True,
         )
@@ -183,17 +199,38 @@ class SerializationTest(GenericSerializationTest, FindInit, TestCase):
         )
         self.assertEqual(len(ope_json), 2)
 
-        result_queryset = models.ContextRecord.objects.filter(
-            uuid=self.context_records[0].uuid)
+        result_queryset = models.Find.objects.filter(
+            uuid=self.finds[0].uuid)
         res = self.generic_serialization_test(
             operation_serialization, no_test=True,
-            kwargs={"cr_queryset": result_queryset}
+            kwargs={"find_queryset": result_queryset}
         )
         ope_json = json.loads(
             res[('operations', 'archaeological_operations__Operation')]
         )
         self.assertEqual(len(ope_json), 1)
-    """
+
+    def test_cr_serialization_with_find_filter(self):
+        res = self.generic_serialization_test(
+            cr_serialization, no_test=True,
+        )
+        cr_json = json.loads(
+            res[('context_records',
+                 'archaeological_context_records__ContextRecord')]
+        )
+        self.assertEqual(len(cr_json), 2)
+
+        result_queryset = models.Find.objects.filter(
+            uuid=self.finds[0].uuid)
+        res = self.generic_serialization_test(
+            cr_serialization, no_test=True,
+            kwargs={"find_queryset": result_queryset}
+        )
+        cr_json = json.loads(
+            res[('context_records',
+                 'archaeological_context_records__ContextRecord')]
+        )
+        self.assertEqual(len(cr_json), 1)
 
     def test_restore(self):
         current_number, zip_filename = self.generic_restore_test_genzip(