Changed a large number of test assertions to use assertContains() and removed separate, now unnecessary,status_code checks. Also changed many assertTrue(... in ...) to use assertIn().

 - Legacy-Id: 16346

Author: levkowetz

ietf/doc/tests_ballot.py

@@ -112,8 +112,7 @@ def test_api_set_position(self):
                                         discuss=" This is a discussion test. \n ",
                                         comment=" This is a test. \n ")
             )
-        self.assertEqual(r.content, "Done")
-        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, "Done")
 
         pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
         self.assertEqual(pos.pos.slug, "discuss")
@@ -733,21 +732,18 @@ def test_ballot_downref_approve(self):
         # Only Secretariat can use this URL
         login_testing_unauthorized(self, "ad", url)
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 403)
-        self.assertContains(r, "Restricted to role Secretariat")
+        self.assertContains(r, "Restricted to role Secretariat", status_code=403)
 
         # There are no downrefs, the page should say so
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "No downward references for")
 
         # Add a downref, the page should ask if it should be added to the registry
         rel = draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'),relationship_id='refnorm')
         d = [rdoc for rdoc in draft.relateddocument_set.all() if rel.is_approved_downref()]
         original_len = len(d)
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "normatively references rfc6666")
 
         # POST with the downref checked

ietf/doc/tests_conflict_review.py

@@ -279,9 +279,9 @@ def approve_test_helper(self,approve_type):
         q = PyQuery(r.content)
         self.assertEqual(len(q('[type=submit]:contains("Send announcement")')), 1)
         if approve_type == 'appr-noprob':
-            self.assertIn( 'IESG has no problem', ''.join(wrap(r.content,2**16)))
+            self.assertContains(r, 'IESG has no problem')
         else:
-            self.assertIn( 'NOT be published', ''.join(wrap(r.content,2**16)))
+            self.assertContains(r, 'NOT be published')
 
         # submit
         empty_outbox()
@@ -298,9 +298,9 @@ def approve_test_helper(self,approve_type):
         self.assertIn('ietf-announce@', outbox[0]['Cc'])
         self.assertIn('iana@', outbox[0]['Cc'])
         if approve_type == 'appr-noprob':
-            self.assertIn( 'IESG has no problem', ''.join(wrap(str(outbox[0]),2**16)))
+            self.assertContains(r, 'IESG has no problem')
         else:
-            self.assertIn( 'NOT be published', ''.join(wrap(str(outbox[0]),2**16)))
+            self.assertContains(r, 'NOT be published')
 
 
     def test_approve_reqnopub(self):

ietf/doc/tests_downref.py

@@ -32,26 +32,20 @@ def test_downref_registry(self):
         # normal - get the table without the "Add downref" button
         self.client.login(username="plain", password="plain+password")
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('<h1>Downref registry</h1>' in content)
-        self.assertFalse('Add downref' in content)
+        self.assertContains(r, '<h1>Downref registry</h1>')
+        self.assertNotContains(r, 'Add downref')
 
         # secretariat - get the table with the "Add downref" button
         self.client.login(username='secretary', password='secretary+password')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('<h1>Downref registry</h1>' in content)
-        self.assertTrue('Add downref' in content)
+        self.assertContains(r, '<h1>Downref registry</h1>')
+        self.assertContains(r, ('Add downref')
 
         # area director - get the table with the "Add downref" button
         self.client.login(username='ad', password='ad+password')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('<h1>Downref registry</h1>' in content)
-        self.assertTrue('Add downref' in content)
+        self.assertContains(r, ('<h1>Downref registry</h1>')
+        self.assertContains(r, ('Add downref')
 
     def test_downref_registry_add(self):
         url = urlreverse('ietf.doc.views_downref.downref_registry_add')
@@ -60,42 +54,32 @@ def test_downref_registry_add(self):
         # secretariat - get the form to add entries to the registry
         self.client.login(username='secretary', password='secretary+password')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('<h1>Add entry to the downref registry</h1>' in content)
-        self.assertTrue('Save downref' in content)
+        self.assertContains(r, ('<h1>Add entry to the downref registry</h1>')
+        self.assertContains(r, ('Save downref')
 
         # area director - get the form to add entries to the registry
         self.client.login(username='ad', password='ad+password')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('<h1>Add entry to the downref registry</h1>' in content)
-        self.assertTrue('Save downref' in content)
+        self.assertContains(r, ('<h1>Add entry to the downref registry</h1>')
+        self.assertContains(r, ('Save downref')
 
         # error - already in the downref registry
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.doc.pk, )))
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('Downref is already in the registry' in content)
+        self.assertContains(r, ('Downref is already in the registry')
 
         # error - source is not in an approved state
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('Draft is not yet approved' in content)
+        self.assertContains(r, ('Draft is not yet approved')
 
         # error - the target is not a normative reference of the source
         self.draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('There does not seem to be a normative reference to RFC' in content)
-        self.assertTrue('Save downref anyway' in content)
+        self.assertContains(r, ('There does not seem to be a normative reference to RFC')
+        self.assertContains(r, ('Save downref anyway')
 
         # normal - approve the document so the downref is now okay
         RelatedDocument.objects.create(source=self.draft, target=self.rfcalias, relationship_id='refnorm')
@@ -108,9 +92,7 @@ def test_downref_registry_add(self):
         self.assertEqual(r.status_code, 302)
         newurl = urlreverse('ietf.doc.views_downref.downref_registry')
         r = self.client.get(newurl)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('<a href="/doc/draft-ietf-mars-test' in content)
+        self.assertContains(r, ('<a href="/doc/draft-ietf-mars-test')
         self.assertTrue(RelatedDocument.objects.filter(source=self.draft, target=self.rfcalias, relationship_id='downref-approval'))
         self.assertEqual(self.draft.docevent_set.count(), draft_de_count_before + 1)
         self.assertEqual(self.rfc.docevent_set.count(), rfc_de_count_before + 1)

ietf/doc/tests_status_change.py

@@ -265,8 +265,8 @@ def test_edit_lc(self):
         q = PyQuery(r.content)
         self.assertEqual(len(q('form.edit-last-call-text')),1)
 
-        self.assertTrue( 'RFC9999 from Proposed Standard to Internet Standard' in ''.join(wrap(r.content,2**16)))
-        self.assertTrue( 'RFC9998 from Informational to Historic' in ''.join(wrap(r.content,2**16)))
+        self.assertContains(r,  'RFC9999 from Proposed Standard to Internet Standard')
+        self.assertContains(r,  'RFC9998 from Informational to Historic')
 
         # save
         r = self.client.post(url,dict(last_call_text="Bogus last call text",save_last_call_text="1"))
@@ -278,17 +278,17 @@ def test_edit_lc(self):
         # reset
         r = self.client.post(url,dict(regenerate_last_call_text="1"))
         self.assertEqual(r.status_code,200)
-        self.assertTrue( 'RFC9999 from Proposed Standard to Internet Standard' in ''.join(wrap(r.content,2**16)))
-        self.assertTrue( 'RFC9998 from Informational to Historic' in ''.join(wrap(r.content,2**16)))
+        self.assertContains(r,  'RFC9999 from Proposed Standard to Internet Standard')
+        self.assertContains(r,  'RFC9998 from Informational to Historic')
 
         # request last call
         messages_before = len(outbox)
         r = self.client.post(url,dict(last_call_text='stuff',send_last_call_request='Save+and+Request+Last+Call'))
         self.assertEqual(r.status_code,200)
-        self.assertTrue( 'Last call requested' in ''.join(wrap(r.content,2**16)))
+        self.assertContains(r,  'Last call requested')
         self.assertEqual(len(outbox), messages_before + 1)
         self.assertTrue('Last Call:' in outbox[-1]['Subject'])
-        self.assertTrue('Last Call Request has been submitted' in ''.join(wrap(str(outbox[-1]),2**16)))
+        self.assertTrue('Last Call Request has been submitted' in ''.join(wrap(outbox[-1].as_string()),2**16)))
 
 
     def test_approve(self):
@@ -310,8 +310,8 @@ def test_approve(self):
         self.assertEqual(len(q('[type=submit]:contains("Send announcement")')), 1)
         # There should be two messages to edit
         self.assertEqual(q('input#id_form-TOTAL_FORMS').val(),'2')
-        self.assertTrue( '(rfc9999) to Internet Standard' in ''.join(wrap(r.content,2**16)))
-        self.assertTrue( '(rfc9998) to Historic' in ''.join(wrap(r.content,2**16)))
+        self.assertContains(r,  '(rfc9999) to Internet Standard')
+        self.assertContains(r,  '(rfc9998) to Historic')
 
         # submit
         messages_before = len(outbox)
@@ -328,10 +328,10 @@ def test_approve(self):
         self.assertTrue('Action:' in outbox[-1]['Subject'])
         self.assertTrue('ietf-announce' in outbox[-1]['To'])
         self.assertTrue('rfc-editor' in outbox[-1]['Cc'])
-        self.assertTrue('(rfc9998) to Historic' in ''.join(wrap(str(outbox[-1])+str(outbox[-2]),2**16)))
-        self.assertTrue('(rfc9999) to Internet Standard' in ''.join(wrap(str(outbox[-1])+str(outbox[-2]),2**16)))
+        self.assertTrue('(rfc9998) to Historic' in ''.join(wrap(outbox[-1].as_string()+outbox[-2].as_string(), 2**16)))
+        self.assertTrue('(rfc9999) to Internet Standard' in ''.join(wrap(outbox[-1].as_string()+outbox[-2].as_string(),2**16)))
 
-        self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('The following approval message was sent'))       
+        self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('The following approval message was sent'))
 
     def test_edit_relations(self):
         doc = Document.objects.get(name='status-change-imaginary-mid-review')

ietf/group/tests_info.py

@@ -1153,7 +1153,7 @@ def testAliases(self):
         url = urlreverse('ietf.group.views.email_aliases', kwargs=dict(group_type="rg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
-        self.assertFalse('mars-ads@' in unicontent(r))
+        self.assertNotContains(r, 'mars-ads@')
 
     def testExpansions(self):
         url = urlreverse('ietf.group.views.email', kwargs=dict(acronym="mars"))
@@ -1173,7 +1173,7 @@ def test_group_menu_data(self):
         r = self.client.get(urlreverse('ietf.group.views.group_menu_data'))
         self.assertEqual(r.status_code, 200)
 
-        parents = json.loads(r.content)
+        parents = r.json()
 
         area = Group.objects.get(type="area", acronym="farfut")
         self.assertTrue(str(area.id) in parents)

ietf/group/tests_review.py

@@ -39,8 +39,8 @@ def test_review_requests(self):
                     urlreverse(ietf.group.views.review_requests, kwargs={ 'acronym': group.acronym , 'group_type': group.type_id})]:
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertIn(review_req.doc.name, unicontent(r))
-            self.assertIn(assignment.reviewer.person.__unicode__(), unicontent(r))
+            self.assertContains(r, review_req.doc.name)
+            self.assertContains(r, str(assignment.reviewer.person))
 
         url = urlreverse(ietf.group.views.review_requests, kwargs={ 'acronym': group.acronym })
 
@@ -151,29 +151,29 @@ def test_reviewer_overview(self):
                     urlreverse(ietf.group.views.reviewer_overview, kwargs={ 'acronym': group.acronym, 'group_type': group.type_id })]:
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertIn(str(reviewer), unicontent(r))
-            self.assertIn(review_req1.doc.name, unicontent(r))
+            self.assertContains(r, str(reviewer))
+            self.assertContains(r, review_req1.doc.name)
             # without a login, reason for being unavailable should not be seen
-            self.assertNotIn("Availability", unicontent(r))
+            self.assertNotContains(r, "Availability")
 
         url = urlreverse(ietf.group.views.reviewer_overview, kwargs={ 'acronym': group.acronym })
         self.client.login(username="plain", password="plain+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # not on review team, should not see reason for being unavailable
-        self.assertNotIn("Availability", unicontent(r))
+        self.assertNotContains(r, "Availability")
 
         self.client.login(username="reviewer", password="reviewer+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # review team members can see reason for being unavailable
-        self.assertIn("Availability", unicontent(r))
+        self.assertContains(r, "Availability")
 
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # secretariat can see reason for being unavailable
-        self.assertIn("Availability", unicontent(r))
+        self.assertContains(r, "Availability")
 
     def test_manage_review_requests(self):
         group = ReviewTeamFactory()
@@ -211,9 +211,7 @@ def test_manage_review_requests(self):
 
             "action": "save",
         })
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r).lower()
-        self.assertTrue("2 requests opened" in content)
+        self.assertContains(r, "2 requests opened")
 
         r = self.client.post(unassigned_url, {
             "reviewrequest": [str(review_req1.pk),str(review_req2.pk),str(review_req3.pk)],