diff options
Diffstat (limited to 'archaeological_operations/tests.py')
| -rw-r--r-- | archaeological_operations/tests.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index bbf736112..706bad836 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -1420,8 +1420,8 @@ class OperationTest(TestCase, OperationInitTest): operation = self.operations[0] self.assertIsNotNone(operation.cached_label) town, ope_id = operation.cached_label.split(' | ') - self.assertIn(town, (u'Intercommunal', u"Multi-town")) - self.assertEqual(ope_id, 'OP2010-1') + self.assertIn(town, ('Intercommunal', "Multi-town")) + self.assertEqual(ope_id, 'OA1 - OP2010-1') operation = models.Operation.objects.get(pk=operation.pk) operation.year = 2011 operation.save() @@ -1429,7 +1429,7 @@ class OperationTest(TestCase, OperationInitTest): operation = models.Operation.objects.get(pk=operation.pk) self.assertIsNotNone(operation.cached_label) town, ope_id = operation.cached_label.split(' | ') - self.assertEqual(ope_id, 'OP2011-1') + self.assertEqual(ope_id, 'OA1 - OP2011-1') self.assertEqual(town, self.towns[0].name) def test_search_vector_update(self): @@ -1440,7 +1440,7 @@ class OperationTest(TestCase, OperationInitTest): {'numero_insee': '12347', 'name': 'Dirty old'})[-1] operation.towns.add(town) operation = models.Operation.objects.get(pk=operation.pk) - operation.comment = u"Zardoz" + operation.comment = "Zardoz" profile = get_current_profile() profile.operation_region_code = u"42" profile.save() @@ -1503,16 +1503,15 @@ class OperationTest(TestCase, OperationInitTest): ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ') profile = get_current_profile() - self.assertEqual( - ope_id, '{}2011-1'.format(profile.default_operation_prefix)) + self.assertEqual(ope_id, 'OA1') base_find = BaseFind.objects.get(pk=base_find.pk) op_code, idx = base_find.cache_short_id.split(' | ') - self.assertEqual(op_code, 'OP2011-1') + self.assertEqual(op_code, 'OA1') self.assertEqual(idx, '00001') self.assertIsNotNone(base_find.cache_complete_id) op_code, mat_code, lbl, idx = base_find.cache_complete_id.split(' | ') - self.assertEqual(op_code, 'OP2011-1') + self.assertEqual(op_code, 'OA1') self.assertEqual(mat_code, 'ADA') self.assertEqual(lbl, 'Context record') self.assertEqual(idx, '00001') @@ -1520,7 +1519,7 @@ class OperationTest(TestCase, OperationInitTest): find = Find.objects.get(pk=find.pk) self.assertIsNotNone(find.cached_label) op_code_idx, lbl = find.cached_label.split(' | ') - self.assertEqual(op_code_idx, 'OP2011-1-00001') + self.assertEqual(op_code_idx, 'OA1-00001') self.assertEqual(lbl, 'Find me') operation = models.Operation.objects.get(pk=operation.pk) |