Fix history tests

1 files changed, 41 insertions, 36 deletions

diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index 837e55c59..7255f677f 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -81,46 +81,50 @@ class FileTest(TestCase, FileInit):
         """
         Test correct new version and correct access to history
         """
-        nb_hist = self.item.history.count()
-        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,
-                             base_label)
-        self.item.internal_reference = u"Unité_Testée"
-        self.item.history_modifier = self.user
-        self.item.skip_history_when_saving = True
-        self.item.save()
-        self.item.skip_history_when_saving = False
-        self.failUnlessEqual(self.item.history.count(), nb_hist + 1)
+        item = models.File.objects.get(pk=self.item.pk)
+        nb_hist = item.history.count()
+        self.assertTrue(item.history.count() >= 1)
+        base_label = item.internal_reference
+        item.internal_reference = u"Unité_Test"
+        item.history_modifier = self.user
+        item.save()
+        self.assertEqual(item.history.count(), nb_hist + 1)
+        self.assertEqual(item.history.all()[1].internal_reference, base_label)
+        item = models.File.objects.get(pk=self.item.pk)
+        item.internal_reference = u"Unité_Testée"
+        item.history_modifier = self.user
+        item.skip_history_when_saving = True
+        item.save()
+        item.skip_history_when_saving = False
+        self.assertEqual(item.history.count(), nb_hist + 1)
 
     def testCreatorHistorized(self):
         """
         Test creator association
         """
-        self.failUnlessEqual(self.item.history_creator, self.o_user)
+        self.assertEqual(self.item.history_creator, self.o_user)
         altuser, created = User.objects.get_or_create(username='altusername')
-        self.item.internal_reference = u"Unité_Test"
-        self.item.history_modifier = altuser
-        self.item.save()
-        self.failUnlessEqual(self.item.history_creator, self.o_user)
+        item = models.File.objects.get(pk=self.item.pk)
+        item.internal_reference = u"Unité_Test"
+        item.history_modifier = altuser
+        item.save()
+        self.assertEqual(item.history_creator, self.o_user)
 
     def testIntelligentHistorisation(self):
         """
         Test that two identical version are not recorded twice in the history
         and that multiple saving in a short time are not considered
         """
-        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()
-        self.item.save()
-        self.failUnlessEqual(self.item.history.count(), nb_hist)
+        item = models.File.objects.get(pk=self.item.pk)
+        nb_hist = item.history.count()
+        item.internal_reference = u"Unité_Test"
+        item.history_modifier = self.user
+        item.save()
+        self.assertEqual(item.history.count(), nb_hist + 1)
+        nb_hist = item.history.count()
+        item = models.File.objects.get(pk=self.item.pk)
+        item.save()
+        self.assertEqual(item.history.count(), nb_hist)
 
     def testRollbackFile(self):
         nb_hist = self.item.history.count()
@@ -130,7 +134,7 @@ class FileTest(TestCase, FileInit):
         self.item.history_modifier = self.user
         self.item.save()
         self.item.rollback(backup_date)
-        self.failUnlessEqual(self.item.history.count(), nb_hist)
+        self.assertEqual(self.item.history.count(), nb_hist)
         new_values = self.item.values()
         for k in initial_values.keys():
             self.assertTrue(k in new_values)
@@ -159,12 +163,13 @@ class FileTest(TestCase, FileInit):
         initial_ref = self.item.internal_reference
         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()
+        item = models.File.objects.get(pk=self.item.pk)
+        item.internal_reference = new_ref
+        item.history_modifier = self.user
+        item.save()
         response = self.client.post(
             '/get-file/',
-            {'numeric_reference': self.item.numeric_reference, 'old': 1})
+            {'numeric_reference': item.numeric_reference, 'old': 1})
         self.assertEqual(response.status_code, 200)
         data = json.loads(response.content)
         # not allowed -> no data
@@ -173,11 +178,11 @@ class FileTest(TestCase, FileInit):
         self.login_as_superuser()
         response = self.client.post(
             '/get-file/',
-            {'numeric_reference': self.item.numeric_reference, 'old': 1})
+            {'numeric_reference': item.numeric_reference, 'old': 1})
         self.assertEqual(response.status_code, 200)
         data = json.loads(response.content)
-        self.assertTrue('records' in data)
-        self.assertTrue(data['records'] == 1)
+        self.assertIn('recordsTotal', data)
+        self.assertEqual(data['recordsTotal'], 1)
         self.assertEqual(data['rows'][0]['internal_reference'], initial_ref)
 
     def testPostDeleteParcels(self):