diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-01-24 22:46:16 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-01-24 22:46:16 +0100 |
commit | 56aceffe8361bf01ef472b9c13567c28d7dcb943 (patch) | |
tree | 060ce3c6e8d91df838b70d9acd909f93552cc124 /archaeological_context_records/tests.py | |
parent | aa70ac1ae2ea28faf7e23ad2150e24d91c2c4e5e (diff) | |
download | Ishtar-56aceffe8361bf01ef472b9c13567c28d7dcb943.tar.bz2 Ishtar-56aceffe8361bf01ef472b9c13567c28d7dcb943.zip |
Fix operations and context_records tests
Diffstat (limited to 'archaeological_context_records/tests.py')
-rw-r--r-- | archaeological_context_records/tests.py | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index 2d144de3a..fb3abb317 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -42,12 +42,13 @@ class ContextRecordInit(OperationInitTest): data['operation'] = self.get_default_operation() if not data.get('parcel'): data['parcel'] = self.get_default_parcel() - if not data.get('user'): - data['user'] = self.get_default_user() + if not data.get('history_modifier'): + data['history_modifier'] = self.get_default_user() default.update(data) - context_records.append(models.ContextRecord.create(**default)) - return context_records + self.context_records.append(models.ContextRecord.objects.create( + **default)) + return self.context_records def get_default_context_record(self): return self.create_context_record()[0] @@ -65,26 +66,21 @@ class RecordRelationsTest(TestCase, ContextRecordInit): def setUp(self): # two different context record - print(1333) self.create_context_record({"label":u"CR 1"}) - print(1444) self.create_context_record({"label":u"CR 2"}) - print(15555) def testRelations(self): - print(1) - sym_rel = models.RelationType.objects.create(symmetrical=True) - print(12) - rel_1 = models.RelationType.objects.create(symmetrical=False) - print(13) - rel_2 = models.RelationType.objects.create(symmetrical=False, - inverse_relation=rel_1) - print(14) + sym_rel = models.RelationType.objects.create(symmetrical=True, + txt_idx='sym') + rel_1 = models.RelationType.objects.create(symmetrical=False, + txt_idx='rel_1') # cannot have symmetrical and an inverse_relation with self.assertRaises(ValidationError): - rel_3 = models.RelationType.objects.create(symmetrical=True, - inverse_relation=rel_1) - print(15) + rel_test = models.RelationType.objects.create(symmetrical=True, + inverse_relation=rel_1, txt_idx='rel_3') + rel_test.full_clean() # auto fill inverse relations + rel_2 = models.RelationType.objects.create(symmetrical=False, + inverse_relation=rel_1, txt_idx='rel_2') self.assertEqual(rel_1.inverse_relation, rel_2) |