From 6e696108d45e07582c32cf8d85f6ec3a5e88c2cb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Jun 2016 12:26:58 +0200 Subject: Flake8 --- archaeological_files/tests.py | 85 +++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 40 deletions(-) (limited to 'archaeological_files/tests.py') diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py index f24a29582..84f8269c7 100644 --- a/archaeological_files/tests.py +++ b/archaeological_files/tests.py @@ -20,7 +20,8 @@ """ Unit tests """ -import json, datetime +import datetime +import json from django.conf import settings from django.contrib.auth.models import User @@ -31,6 +32,7 @@ from archaeological_files import models from archaeological_operations.models import Parcel, ParcelOwner from archaeological_operations.tests import OperationInitTest + class FileInit(object): def login_as_superuser(self): self.client.login(username='username', password='tralala') @@ -60,16 +62,17 @@ class FileInit(object): self.extra_models['file_type'] = file_type self.model_list.append(file_type) - dct = {'year':2010, 'numeric_reference':1000, 'file_type':file_type, - 'internal_reference':u'UNIT_testÉ ?', 'in_charge':person, - 'history_modifier':self.o_user, 'total_surface':10000} + dct = {'year': 2010, 'numeric_reference': 1000, 'file_type': file_type, + 'internal_reference': u'UNIT_testÉ ?', 'in_charge': person, + 'history_modifier': self.o_user, 'total_surface': 10000} self.item = self.model(**dct) self.item.save() + class FileTest(TestCase, FileInit): - fixtures = [settings.ROOT_PATH + \ + fixtures = [settings.ROOT_PATH + '../fixtures/initial_data-auth-fr.json', - settings.ROOT_PATH + \ + settings.ROOT_PATH + '../ishtar_common/fixtures/initial_data-fr.json'] model = models.File @@ -86,7 +89,7 @@ class FileTest(TestCase, FileInit): 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.count(), nb_hist + 1) self.failUnlessEqual(self.item.history.all()[1].internal_reference, base_label) self.item.internal_reference = u"Unité_Testée" @@ -94,7 +97,7 @@ class FileTest(TestCase, FileInit): 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) + self.failUnlessEqual(self.item.history.count(), nb_hist + 1) def testCreatorHistorized(self): """ @@ -116,7 +119,7 @@ class FileTest(TestCase, FileInit): 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.count(), nb_hist + 1) nb_hist = self.item.history.count() self.item.save() self.failUnlessEqual(self.item.history.count(), nb_hist) @@ -133,21 +136,22 @@ class FileTest(TestCase, FileInit): 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], - msg=u"for %s: %s != %s" % (k, unicode(new_values[k]), - unicode(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/', - {'numeric_reference':self.item.numeric_reference}) + response = self.client.post( + '/get-file/', {'numeric_reference': self.item.numeric_reference}) self.assertEqual(response.status_code, 200) data = json.loads(response.content) # not allowed -> no data self.assertTrue(not data) self.login_as_superuser() - response = self.client.post('/get-file/', - {'numeric_reference':self.item.numeric_reference}) + response = self.client.post( + '/get-file/', {'numeric_reference': self.item.numeric_reference}) self.assertEqual(response.status_code, 200) data = json.loads(response.content) self.assertTrue('records' in data) @@ -160,33 +164,36 @@ class FileTest(TestCase, FileInit): 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}) + response = self.client.post( + '/get-file/', + {'numeric_reference': self.item.numeric_reference, 'old': 1}) self.assertEqual(response.status_code, 200) data = json.loads(response.content) # not allowed -> no data self.assertTrue(not data) self.login_as_superuser() - response = self.client.post('/get-file/', - {'numeric_reference':self.item.numeric_reference, 'old':1}) + response = self.client.post( + '/get-file/', + {'numeric_reference': self.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.assertEqual(data['rows'][0]['internal_reference'], initial_ref) -#class ImporterTest(TestCase): +# class ImporterTest(TestCase): # def testFormaters(self): # from archaeological_files import data_importer # for formater in [data_importer.SurfaceFormater]: # formater().test() + class FileOperationTest(TestCase, OperationInitTest, FileInit): model = models.File - fixtures = [settings.ROOT_PATH + \ + fixtures = [settings.ROOT_PATH + '../fixtures/initial_data-auth-fr.json', - settings.ROOT_PATH + \ + settings.ROOT_PATH + '../ishtar_common/fixtures/initial_data-fr.json', settings.ROOT_PATH + '../ishtar_common/fixtures/test_towns.json', @@ -207,34 +214,34 @@ class FileOperationTest(TestCase, OperationInitTest, FileInit): # parcel association default_town = Town.objects.all()[0] for p in range(0, 10): - parcel = Parcel.objects.create(parcel_number=unicode(p), - section='YY', - town=default_town, - operation=self.operation) + parcel = Parcel.objects.create( + parcel_number=unicode(p), + section='YY', + town=default_town, + operation=self.operation) if p == 1: ParcelOwner.objects.create( - owner=self.extra_models['person'], - parcel=parcel, start_date=datetime.date.today(), - end_date=datetime.date.today()) + owner=self.extra_models['person'], + parcel=parcel, start_date=datetime.date.today(), + end_date=datetime.date.today()) initial_nb = self.item.parcels.count() # no parcel on the file -> new parcels are copied from the # operation self.operation.associated_file = self.item self.operation.save() - self.assertEqual(self.item.parcels.count(), initial_nb+10) + self.assertEqual(self.item.parcels.count(), initial_nb + 10) # parcel owner well attached q = ParcelOwner.objects.filter(parcel__associated_file=self.item) self.assertEqual(q.count(), 1) # when attaching parcel from a file to an operation, copy is done - parcel = Parcel.objects.create(parcel_number='42', - section='ZZ', - town=default_town, - associated_file=self.item) + parcel = Parcel.objects.create( + parcel_number='42', section='ZZ', + town=default_town, associated_file=self.item) ParcelOwner.objects.create( - owner=self.extra_models['person'], - parcel=parcel, start_date=datetime.date.today(), - end_date=datetime.date.today()) + owner=self.extra_models['person'], + parcel=parcel, start_date=datetime.date.today(), + end_date=datetime.date.today()) parcel.operation = self.operation parcel.save() # double reference to operation and associated_file is deleted @@ -249,5 +256,3 @@ class FileOperationTest(TestCase, OperationInitTest, FileInit): q = ParcelOwner.objects.filter(parcel__operation=self.operation, parcel__parcel_number='42') self.assertEqual(q.count(), 1) - - -- cgit v1.2.3