Skip to content
Snippets Groups Projects
Verified Commit bbbf8cbc authored by Erwan Rouchet's avatar Erwan Rouchet
Browse files

Update query counts

parent d8d60d91
No related branches found
No related tags found
No related merge requests found
......@@ -104,7 +104,7 @@ class TestChildrenElements(FixtureAPITestCase):
def test_element_children_worker_version(self):
self.corpus.elements.filter(name__contains='page 1r').update(worker_version=self.worker_version)
with self.assertNumQueries(8):
with self.assertNumQueries(9):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}),
data={'worker_version': str(self.worker_version.id)}
......@@ -118,7 +118,7 @@ class TestChildrenElements(FixtureAPITestCase):
)
def test_element_children_worker_version_validation(self):
with self.assertNumQueries(0):
with self.assertNumQueries(1):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}),
data={'worker_version': 'blah'},
......@@ -126,7 +126,7 @@ class TestChildrenElements(FixtureAPITestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual(response.json(), {'worker_version': ['Invalid UUID']})
with self.assertNumQueries(1):
with self.assertNumQueries(2):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}),
data={'worker_version': uuid.uuid4()},
......@@ -163,7 +163,7 @@ class TestChildrenElements(FixtureAPITestCase):
)
element.add_parent(self.vol)
with self.assertNumQueries(9):
with self.assertNumQueries(10):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}),
data={'with_has_children': True},
......@@ -185,7 +185,7 @@ class TestChildrenElements(FixtureAPITestCase):
)
def test_children_modified_since_bad_format(self):
with self.assertNumQueries(0):
with self.assertNumQueries(1):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}),
HTTP_IF_MODIFIED_SINCE='AAAAAAAAAAAAAAAAA',
......@@ -194,7 +194,7 @@ class TestChildrenElements(FixtureAPITestCase):
self.assertDictEqual(response.json(), {'If-Modified-Since': ['Bad date format']})
def test_children_modified_since_not_modified(self):
with self.assertNumQueries(1):
with self.assertNumQueries(2):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}),
HTTP_IF_MODIFIED_SINCE='Thu, 02 Apr 2099 13:37:42 GMT',
......@@ -203,7 +203,7 @@ class TestChildrenElements(FixtureAPITestCase):
def test_children_modified_since(self):
self.corpus.elements.filter(name='Volume 1, page 1r').update(updated='2099-04-02T13:37:43Z')
with self.assertNumQueries(8):
with self.assertNumQueries(9):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}),
HTTP_IF_MODIFIED_SINCE='Thu, 02 Apr 2099 13:37:42 GMT',
......
......@@ -265,7 +265,7 @@ class TestClasses(FixtureAPITestCase):
def test_element_parents_best_classes(self):
self.populate_classified_elements()
with self.assertNumQueries(6):
with self.assertNumQueries(7):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.common_children.id)}),
data={'type': self.classified.slug, 'with_best_classes': 1}
......@@ -281,7 +281,7 @@ class TestClasses(FixtureAPITestCase):
def test_element_children_best_classes(self):
self.populate_classified_elements()
with self.assertNumQueries(6):
with self.assertNumQueries(7):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.parent.id)}),
data={'type': self.classified.slug, 'with_best_classes': 'yes'}
......@@ -302,7 +302,7 @@ class TestClasses(FixtureAPITestCase):
self.populate_classified_elements()
child = Element.objects.filter(type=self.classified.id).first()
child.classifications.all().update(state=ClassificationState.Rejected)
with self.assertNumQueries(6):
with self.assertNumQueries(7):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.parent.id)}),
data={'type': self.classified.slug, 'with_best_classes': 'yes'}
......@@ -405,7 +405,7 @@ class TestClasses(FixtureAPITestCase):
self.populate_classified_elements()
parent = Element.objects.get_ascending(self.common_children.id).last()
parent.classifications.all().filter(confidence=.7).update(state=ClassificationState.Validated)
with self.assertNumQueries(5):
with self.assertNumQueries(6):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.common_children.id)}),
data={'type': self.classified.slug, 'best_class': str(self.text.id)}
......@@ -419,7 +419,7 @@ class TestClasses(FixtureAPITestCase):
self.populate_classified_elements()
child = Element.objects.filter(type=self.classified.id).first()
child.classifications.all().filter(confidence=.7).update(state=ClassificationState.Validated)
with self.assertNumQueries(5):
with self.assertNumQueries(6):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.parent.id)}),
data={'type': self.classified.slug, 'best_class': str(self.text.id)}
......@@ -449,7 +449,7 @@ class TestClasses(FixtureAPITestCase):
self.populate_classified_elements()
self.assertEqual(Classification.objects.filter(high_confidence=True).count(), 24)
self.assertEqual(Classification.objects.filter(high_confidence=True).distinct('element_id').count(), 12)
with self.assertNumQueries(5):
with self.assertNumQueries(6):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.common_children.id)}),
data={'type': self.classified.slug, 'best_class': str(self.cover.id)}
......@@ -465,7 +465,7 @@ class TestClasses(FixtureAPITestCase):
self.populate_classified_elements()
self.assertEqual(Classification.objects.filter(high_confidence=True).count(), 24)
self.assertEqual(Classification.objects.filter(high_confidence=True).distinct('element_id').count(), 12)
with self.assertNumQueries(5):
with self.assertNumQueries(6):
response = self.client.get(
reverse('api:elements-children', kwargs={'pk': str(self.parent.id)}),
data={'type': self.classified.slug, 'best_class': str(self.cover.id)}
......
......@@ -76,7 +76,7 @@ class TestParentsElements(FixtureAPITestCase):
"""
self.corpus.elements.filter(name__contains='Volume 1').update(worker_version=self.worker_version)
with self.assertNumQueries(6):
with self.assertNumQueries(7):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.page.id)}),
data={'worker_version': str(self.worker_version.id)},
......@@ -89,7 +89,7 @@ class TestParentsElements(FixtureAPITestCase):
)
def test_parents_worker_version_validation(self):
with self.assertNumQueries(0):
with self.assertNumQueries(1):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.page.id)}),
data={'worker_version': 'blah'},
......@@ -97,7 +97,7 @@ class TestParentsElements(FixtureAPITestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual(response.json(), {'worker_version': ['Invalid UUID']})
with self.assertNumQueries(1):
with self.assertNumQueries(2):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.page.id)}),
data={'worker_version': uuid.uuid4()},
......@@ -107,7 +107,7 @@ class TestParentsElements(FixtureAPITestCase):
def test_parents_with_has_children(self):
surface = Element.objects.get(name='Surface A')
with self.assertNumQueries(7):
with self.assertNumQueries(8):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(surface.id)}),
data={'recursive': True, 'with_has_children': True},
......@@ -122,7 +122,7 @@ class TestParentsElements(FixtureAPITestCase):
)
def test_parents_modified_since_bad_format(self):
with self.assertNumQueries(0):
with self.assertNumQueries(1):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.page.id)}),
HTTP_IF_MODIFIED_SINCE='AAAAAAAAAAAAAAAAA',
......@@ -131,7 +131,7 @@ class TestParentsElements(FixtureAPITestCase):
self.assertDictEqual(response.json(), {'If-Modified-Since': ['Bad date format']})
def test_parents_modified_since_not_modified(self):
with self.assertNumQueries(1):
with self.assertNumQueries(2):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.page.id)}),
HTTP_IF_MODIFIED_SINCE='Thu, 02 Apr 2099 13:37:42 GMT',
......@@ -140,7 +140,7 @@ class TestParentsElements(FixtureAPITestCase):
def test_parents_modified_since(self):
self.corpus.elements.filter(name='Volume 1').update(updated='2099-04-02T13:37:43Z')
with self.assertNumQueries(6):
with self.assertNumQueries(7):
response = self.client.get(
reverse('api:elements-parents', kwargs={'pk': str(self.page.id)}),
HTTP_IF_MODIFIED_SINCE='Thu, 02 Apr 2099 13:37:42 GMT',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment