Fix history management - fix archaeological files history tests

* fix rollback
* fix history duplicates

1 files changed, 17 insertions, 8 deletions

diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index 8cd53d946..58291bc04 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -23,26 +23,29 @@ Unit tests
 import json
 
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.test import TestCase
 
+from ishtar_common.models import PersonType
 import models
 
 class FileTest(TestCase):
-    fixtures = [settings.ROOT_PATH + 'ishtar_common/fixtures/test-users.json']
+    fixtures = [settings.ROOT_PATH + \
+                '../ishtar_common/fixtures/initial_data-fr.json']
     model = models.File
 
     def setUp(self):
         self.extra_models, self.model_list = {}, []
-
-        user = models.IshtarUser.objects.get(pk=1)
-        person_type = models.PersonType(label=u'Test person type',
-                                        txt_idx='test_person', available=True)
+        self.user, created = User.objects.get_or_create(username='username')
+        o_user, created = User.objects.get_or_create(username='ousername')
+        person_type = PersonType(label=u'Test person type',
+                                 txt_idx='test_person', available=True)
         person_type.save()
         self.extra_models['person_type'] = person_type
         self.model_list.append(person_type)
 
         person = models.Person(title='Mr', surname='Surname', name='Name',
-                               person_type=person_type, history_modifier=user)
+                               history_modifier=o_user)
         person.save()
         self.extra_models['person'] = person
         self.model_list.append(person)
@@ -55,7 +58,7 @@ class FileTest(TestCase):
 
         dct = {'year':2010, 'numeric_reference':1000, 'file_type':file_type,
                'internal_reference':u'UNIT_testÉ ?', 'in_charge':person,
-               'history_modifier':user, 'total_surface':10000}
+               'history_modifier':o_user, 'total_surface':10000}
         self.item = self.model(**dct)
         self.item.save()
 
@@ -72,6 +75,7 @@ class FileTest(TestCase):
         self.assertTrue(self.item.history.count() >= 1)
         base_label = self.item.internal_reference
         self.item.internal_reference = u"Unité_Test"
+        self.item.history_modifier = self.user
         self.item.save()
         self.failUnlessEqual(self.item.history.count(), nb_hist+1)
         self.failUnlessEqual(self.item.history.all()[1].internal_reference,
@@ -84,6 +88,7 @@ class FileTest(TestCase):
         """
         nb_hist = self.item.history.count()
         self.item.internal_reference = u"Unité_Test"
+        self.item.history_modifier = self.user
         self.item.save()
         self.failUnlessEqual(self.item.history.count(), nb_hist+1)
         nb_hist = self.item.history.count()
@@ -95,13 +100,16 @@ class FileTest(TestCase):
         initial_values = self.item.values()
         backup_date = self.item.history.all()[0].history_date
         self.item.internal_reference = u"Unité_Test"
+        self.item.history_modifier = self.user
         self.item.save()
         self.item.rollback(backup_date)
         self.failUnlessEqual(self.item.history.count(), nb_hist)
         new_values = self.item.values()
         for k in initial_values.keys():
             self.assertTrue(k in new_values)
-            self.assertEqual(new_values[k], initial_values[k])
+            self.assertEqual(new_values[k], initial_values[k],
+                        msg=u"for %s: %s != %s" % (k, unicode(new_values[k]),
+                                                   unicode(initial_values[k])))
 
     def testRESTGetFile(self):
         response = self.client.post('/get-file/',
@@ -116,6 +124,7 @@ class FileTest(TestCase):
         new_ref = u"Unité_Test_old_file"
         new_ref = initial_ref != new_ref and new_ref or new_ref + u"extra"
         self.item.internal_reference = new_ref
+        self.item.history_modifier = self.user
         self.item.save()
         response = self.client.post('/get-file/',
                      {'numeric_reference':self.item.numeric_reference, 'old':1})