From f7420f6003fce4663c017633407b3044e81ce587 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 6 Sep 2019 20:22:55 +0200 Subject: Serialization: warehouse filter --- archaeological_warehouse/tests.py | 46 +++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 9 deletions(-) (limited to 'archaeological_warehouse/tests.py') diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py index 52f1a96fc..6d6dbddc9 100644 --- a/archaeological_warehouse/tests.py +++ b/archaeological_warehouse/tests.py @@ -32,6 +32,8 @@ from archaeological_finds.models import Find from archaeological_warehouse import models, views, forms, serializers from archaeological_operations.serializers import operation_serialization +from archaeological_context_records.serializers import cr_serialization +from archaeological_finds.serializers import find_serialization class SerializationTest(GenericSerializationTest, FindInit, TestCase): @@ -280,7 +282,6 @@ class SerializationTest(GenericSerializationTest, FindInit, TestCase): ) self.assertEqual(len(loca_json), 2) - """ def test_ope_serialization_with_warehouse_filter(self): res = self.generic_serialization_test( operation_serialization, no_test=True, @@ -290,18 +291,18 @@ class SerializationTest(GenericSerializationTest, FindInit, TestCase): ) self.assertEqual(len(ope_json), 2) - result_queryset = models.Find.objects.filter( - uuid=self.finds[0].uuid) + result_queryset = models.Warehouse.objects.filter( + id=self.warehouses[0].pk) res = self.generic_serialization_test( operation_serialization, no_test=True, - kwargs={"find_queryset": result_queryset} + kwargs={"warehouse_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): + def test_cr_serialization_with_warehouse_filter(self): res = self.generic_serialization_test( cr_serialization, no_test=True, ) @@ -311,18 +312,45 @@ class SerializationTest(GenericSerializationTest, FindInit, TestCase): ) self.assertEqual(len(cr_json), 2) - result_queryset = models.Find.objects.filter( - uuid=self.finds[0].uuid) + result_queryset = models.Warehouse.objects.filter( + id=self.warehouses[0].pk) res = self.generic_serialization_test( cr_serialization, no_test=True, - kwargs={"find_queryset": result_queryset} + kwargs={"warehouse_queryset": result_queryset} ) cr_json = json.loads( res[('context_records', 'archaeological_context_records__ContextRecord')] ) self.assertEqual(len(cr_json), 1) - """ + + def test_find_serialization_with_warehouse_filter(self): + res = self.generic_serialization_test( + find_serialization, no_test=True, + ) + find_json = json.loads( + res[('finds', 'archaeological_finds__Find')] + ) + self.assertEqual(len(find_json), 3) + bfind_json = json.loads( + res[('finds', 'archaeological_finds__BaseFind')] + ) + self.assertEqual(len(bfind_json), 3) + + result_queryset = models.Warehouse.objects.filter( + id=self.warehouses[0].pk) + res = self.generic_serialization_test( + find_serialization, no_test=True, + kwargs={"warehouse_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_restore(self): current_number, zip_filename = self.generic_restore_test_genzip( -- cgit v1.2.3