diff options
Diffstat (limited to 'archaeological_finds/tests.py')
| -rw-r--r-- | archaeological_finds/tests.py | 104 |
1 files changed, 58 insertions, 46 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index d9b79be89..d40c9b19e 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -449,7 +449,7 @@ class ImportFindTest(ImportTest, TestCase): models.Find.objects.filter(material_types__pk=glass).count(), 1) images = [] for find in models.Find.objects.all(): - images += [im.image for im in find.images.all() if im.image.name] + images += [1 for im in find.images.all() if im.image.name] self.assertEqual(len(images), 1) # check index @@ -612,7 +612,7 @@ class FindTest(FindInit, TestCase): response = self.client.get(reverse('display-find', args=[obj.pk])) self.assertEqual(response.status_code, 200) self.assertIn('load_window("/show-find/{}/");'.format(obj.pk), - response.content) + response.content.decode()) c = Client() response = c.get(reverse('show-find', kwargs={'pk': obj.pk})) # empty content when not allowed @@ -621,7 +621,7 @@ class FindTest(FindInit, TestCase): c.login(username=self.username, password=self.password) response = self.client.get(reverse('show-find', kwargs={'pk': obj.pk})) self.assertEqual(response.status_code, 200) - self.assertIn('class="card sheet"', response.content) + self.assertIn(b'class="card sheet"', response.content) def test_delete(self): self.create_finds(force=True) @@ -671,22 +671,25 @@ class FindSearchTest(FindInit, TestCase): # one result for exact search response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - res = json.loads(response.content) - self.assertTrue(res['recordsTotal'] == 1) + content = response.content.decode() + res = json.loads(content) + self.assertEqual(res['recordsTotal'], 1) self.assertEqual(res["rows"][0]["material_types__label"], - unicode(iron_metal)) + str(iron_metal)) # no result for the brother search = {'material_types': not_iron_metal.pk} response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - self.assertTrue(json.loads(response.content)['recordsTotal'] == 0) + content = response.content.decode() + self.assertEqual(json.loads(content)['recordsTotal'], 0) # one result for the father search = {'material_types': metal.pk} response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - self.assertTrue(json.loads(response.content)['recordsTotal'] == 1) + content = response.content.decode() + self.assertEqual(json.loads(content)['recordsTotal'], 1) def test_pinned_search(self): c = Client() @@ -697,7 +700,8 @@ class FindSearchTest(FindInit, TestCase): c.get(reverse("pin", args=["operation", operation.pk])) response = c.get(reverse('get-find'), {}) # empty search -> check pined self.assertEqual(response.status_code, 200) - self.assertEqual(json.loads(response.content)['recordsTotal'], 0) + content = response.content.decode() + self.assertEqual(json.loads(content)['recordsTotal'], 0) # pinned operation with current find find = self.finds[0] @@ -707,7 +711,8 @@ class FindSearchTest(FindInit, TestCase): find.get_first_base_find().context_record.operation.pk])) response = c.get(reverse('get-find'), {}) # empty search -> check pined self.assertEqual(response.status_code, 200) - self.assertEqual(json.loads(response.content)['recordsTotal'], 1) + content = response.content.decode() + self.assertEqual(json.loads(content)['recordsTotal'], 1) def test_period_hierarchic_search(self): find = self.finds[0] @@ -731,22 +736,24 @@ class FindSearchTest(FindInit, TestCase): c.login(username=self.username, password=self.password) response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - res = json.loads(response.content) - self.assertTrue(res['recordsTotal'] == 1) + res = json.loads(response.content.decode()) + self.assertEqual(res['recordsTotal'], 1) self.assertEqual(res["rows"][0]["datings__period__label"], - unicode(final_neo)) + str(final_neo)) # no result for the brother search = {'datings__period': recent_neo.pk} response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - self.assertEqual(json.loads(response.content)['recordsTotal'], 0) + self.assertEqual( + json.loads(response.content.decode())['recordsTotal'], 0) # one result for the father search = {'datings__period': neo.pk} response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - self.assertEqual(json.loads(response.content)['recordsTotal'], 1) + self.assertEqual( + json.loads(response.content.decode())['recordsTotal'], 1) def test_conservatory_state_hierarchic_search(self): find = self.finds[0] @@ -774,19 +781,22 @@ class FindSearchTest(FindInit, TestCase): # one result for exact search response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - self.assertTrue(json.loads(response.content)['recordsTotal'] == 1) + content = response.content.decode() + self.assertEqual(json.loads(content)['recordsTotal'], 1) # no result for the brother search = {'conservatory_state': cs3.pk} response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - self.assertTrue(json.loads(response.content)['recordsTotal'] == 0) + content = response.content.decode() + self.assertEqual(json.loads(content)['recordsTotal'], 0) # one result for the father search = {'conservatory_state': cs1.pk} response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - self.assertTrue(json.loads(response.content)['recordsTotal'] == 1) + content = response.content.decode() + self.assertEqual(json.loads(content)['recordsTotal'], 1) def test_image_search(self): c = Client() @@ -794,7 +804,7 @@ class FindSearchTest(FindInit, TestCase): search = {'documents__image__isnull': 2} # 2 for nullboolfield is None response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - res = json.loads(response.content) + res = json.loads(response.content.decode()) self.assertEqual(res['recordsTotal'], 0) # add an image to the first find @@ -806,7 +816,7 @@ class FindSearchTest(FindInit, TestCase): self.finds[0].save() response = c.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - res = json.loads(response.content) + res = json.loads(response.content.decode()) self.assertEqual(res['recordsTotal'], 1) def _test_search(self, client, result, context=""): @@ -814,7 +824,7 @@ class FindSearchTest(FindInit, TestCase): search = {'search_vector': q} response = client.get(reverse('get-find'), search) self.assertEqual(response.status_code, 200) - res = json.loads(response.content) + res = json.loads(response.content.decode()) msg = "{} result(s) where expected for search: {} - found {}" \ "".format(expected_result, q, res['recordsTotal']) if context: @@ -828,11 +838,11 @@ class FindSearchTest(FindInit, TestCase): c = Client() c.login(username=self.username, password=self.password) - loan_key = unicode(pgettext_lazy("key for text search", 'loan')) + loan_key = str(pgettext_lazy("key for text search", 'loan')) result = [ - (u'{}="{}"'.format(loan_key , unicode(_(u"Yes"))), 0), - (u'{}="{}"'.format(loan_key , unicode(_(u"No"))), 0), + (u'{}="{}"'.format(loan_key, str(_(u"Yes"))), 0), + (u'{}="{}"'.format(loan_key, str(_(u"No"))), 0), ] self._test_search(c, result, context="No container defined") @@ -857,8 +867,8 @@ class FindSearchTest(FindInit, TestCase): find2.save() result = [ - (u'{}="{}"'.format(loan_key, unicode(_(u"Yes"))), 0), - (u'{}="{}"'.format(loan_key, unicode(_(u"No"))), 2), + (u'{}="{}"'.format(loan_key, str(_(u"Yes"))), 0), + (u'{}="{}"'.format(loan_key, str(_(u"No"))), 2), ] self._test_search(c, result, context="All container in their " "reference location") @@ -866,8 +876,8 @@ class FindSearchTest(FindInit, TestCase): find2.save() result = [ - (u'{}="{}"'.format(loan_key, unicode(_(u"Yes"))), 1), - (u'{}="{}"'.format(loan_key, unicode(_(u"No"))), 1), + (u'{}="{}"'.format(loan_key, str(_(u"Yes"))), 1), + (u'{}="{}"'.format(loan_key, str(_(u"No"))), 1), ] self._test_search(c, result, context="One container in his " "reference location") @@ -921,8 +931,8 @@ class FindSearchTest(FindInit, TestCase): find2.container = container2 find2.save() - ref_div_key = unicode(pgettext_lazy("key for text search", - 'reference-division')) + "-" + ref_div_key = str(pgettext_lazy("key for text search", + 'reference-division')) + "-" result = [ (u'{}="{}"'.format(ref_div_key + "salle", "B2"), 1), @@ -1037,16 +1047,18 @@ class FindPermissionTest(FindInit, TestCase): c.login(username=self.alt_username, password=self.alt_password) response = c.get(reverse('get-find')) # only one "own" context record available - self.assertTrue(json.loads(response.content)) - self.assertEqual(json.loads(response.content)['recordsTotal'], 1) + content = response.content.decode() + self.assertTrue(json.loads(content)) + self.assertEqual(json.loads(content)['recordsTotal'], 1) # area filter c = Client() c.login(username=self.alt_username2, password=self.alt_password2) response = c.get(reverse('get-find')) # only one "own" operation available - self.assertTrue(json.loads(response.content)) - self.assertEqual(json.loads(response.content)['recordsTotal'], 1) + content = response.content.decode() + self.assertTrue(json.loads(content)) + self.assertEqual(json.loads(content)['recordsTotal'], 1) class FindQATest(FindInit, TestCase): @@ -1252,7 +1264,7 @@ class FindHistoryTest(FindInit, TestCase): if hasattr(attr[k], 'txt_idx'): dct[k] = attr[k].txt_idx else: - dct[k] = unicode(attr[k]) + dct[k] = str(attr[k]) else: dct[k] = '' @@ -1351,7 +1363,7 @@ class FindHistoryTest(FindInit, TestCase): response = c.get(reverse('show-find', kwargs={'pk': find.pk})) self.assertEqual(response.status_code, 200) - self.assertIn('class="card sheet"', response.content) + self.assertIn(b'class="card sheet"', response.content) content = response.content.decode('utf-8') self.assertNotIn( models.MaterialType.objects.get(txt_idx='ceramic').label, @@ -1364,8 +1376,8 @@ class FindHistoryTest(FindInit, TestCase): kwargs={'pk': find.pk, 'date': history_date})) self.assertEqual(response.status_code, 200) - self.assertIn('class="card sheet"', response.content) content = response.content.decode('utf-8') + self.assertIn('class="card sheet"', content) self.assertIn( models.MaterialType.objects.get(txt_idx='ceramic').label, content, msg=u"ceramic not found in historical sheet") @@ -1407,7 +1419,7 @@ class FindHistoryTest(FindInit, TestCase): dating_dct[k] = getattr(dating, k) if hasattr(dating_dct[k], 'txt_idx'): dating_dct[k] = dating_dct[k].txt_idx - dating_dct[k] = unicode(dating_dct[k]) + dating_dct[k] = str(dating_dct[k]) current_datings.append(dating_dct) @@ -1637,7 +1649,7 @@ class GeomaticTest(FindInit, TestCase): self.assertIsNotNone(base_find.z) self.assertEqual(base_find.point_source, 'P') # precise self.assertEqual(base_find.point_source_item, - unicode(models.BaseFind._meta.verbose_name)) + str(models.BaseFind._meta.verbose_name)) # re-save do not change sources base_find.save() @@ -1649,7 +1661,7 @@ class GeomaticTest(FindInit, TestCase): self.assertIsNotNone(base_find.z) self.assertEqual(base_find.point_source, 'P') # precise self.assertEqual(base_find.point_source_item, - unicode(models.BaseFind._meta.verbose_name)) + str(models.BaseFind._meta.verbose_name)) # form input base_find.x = 2 @@ -1662,7 +1674,7 @@ class GeomaticTest(FindInit, TestCase): self.assertIsNotNone(base_find.point) self.assertEqual(base_find.point_source, 'P') # precise self.assertEqual(base_find.point_source_item, - unicode(models.BaseFind._meta.verbose_name)) + str(models.BaseFind._meta.verbose_name)) # re-save do not change sources base_find.save() base_find = models.BaseFind.objects.get(pk=base_find.pk) @@ -1670,7 +1682,7 @@ class GeomaticTest(FindInit, TestCase): self.assertIsNotNone(base_find.point) self.assertEqual(base_find.point_source, 'P') # precise self.assertEqual(base_find.point_source_item, - unicode(models.BaseFind._meta.verbose_name)) + str(models.BaseFind._meta.verbose_name)) # reinit base_find.x = None @@ -1709,7 +1721,7 @@ class GeomaticTest(FindInit, TestCase): self.assertEqual(base_find.multi_polygon, cr.town.limit) self.assertEqual(base_find.point_source, 'T') # town self.assertEqual(base_find.point_source_item, - unicode(ContextRecord._meta.verbose_name)) + str(ContextRecord._meta.verbose_name)) # re-save do not change sources base_find.save() base_find = models.BaseFind.objects.get(pk=base_find.pk) @@ -1721,7 +1733,7 @@ class GeomaticTest(FindInit, TestCase): self.assertEqual(base_find.multi_polygon, cr.town.limit) self.assertEqual(base_find.point_source, 'T') # town self.assertEqual(base_find.point_source_item, - unicode(ContextRecord._meta.verbose_name)) + str(ContextRecord._meta.verbose_name)) # geom from context record center = 'POINT(8 6)' @@ -1762,7 +1774,7 @@ class GeomaticTest(FindInit, TestCase): self.assertEqual(base_find.point_2d.wkt, 'POINT (5 6)') self.assertEqual(base_find.point_source, 'P') # precise self.assertEqual(base_find.point_source_item, - unicode(models.BaseFind._meta.verbose_name)) + str(models.BaseFind._meta.verbose_name)) # re-save do not change sources base_find.save() base_find = models.BaseFind.objects.get(pk=base_find.pk) @@ -1771,7 +1783,7 @@ class GeomaticTest(FindInit, TestCase): self.assertEqual(base_find.point_2d.wkt, 'POINT (5 6)') self.assertEqual(base_find.point_source, 'P') # precise self.assertEqual(base_find.point_source_item, - unicode(models.BaseFind._meta.verbose_name)) + str(models.BaseFind._meta.verbose_name)) def test_post_save_polygon(self): profile = get_current_profile() |