summaryrefslogtreecommitdiff
path: root/tests/forms_tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests/forms_tests')
-rw-r--r--tests/forms_tests/tests/test_extra.py4
-rw-r--r--tests/forms_tests/tests/test_forms.py7
-rw-r--r--tests/forms_tests/tests/test_widgets.py12
-rw-r--r--tests/forms_tests/tests/tests.py2
4 files changed, 12 insertions, 13 deletions
diff --git a/tests/forms_tests/tests/test_extra.py b/tests/forms_tests/tests/test_extra.py
index 6ec1a62932..1d53a9bd1d 100644
--- a/tests/forms_tests/tests/test_extra.py
+++ b/tests/forms_tests/tests/test_extra.py
@@ -318,7 +318,7 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin):
# label tag is correctly associated with month dropdown
d = GetDate({'mydate_month': '1', 'mydate_day': '1', 'mydate_year': '2010'})
- self.assertTrue('<label for="id_mydate_month">' in d.as_p())
+ self.assertIn('<label for="id_mydate_month">', d.as_p())
def test_selectdate_empty_label(self):
w = SelectDateWidget(years=('2014',), empty_label='empty_label')
@@ -865,4 +865,4 @@ class FormsExtraL10NTestCase(TestCase):
def test_form_label_association(self):
# label tag is correctly associated with first rendered dropdown
a = GetDate({'mydate_month': '1', 'mydate_day': '1', 'mydate_year': '2010'})
- self.assertTrue('<label for="id_mydate_day">' in a.as_p())
+ self.assertIn('<label for="id_mydate_day">', a.as_p())
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index 914bf1810d..6478116f02 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -955,7 +955,7 @@ class FormsTestCase(TestCase):
f2 = MyForm()
f1.fields['myfield'].validators[0] = MaxValueValidator(12)
- self.assertFalse(f1.fields['myfield'].validators[0] == f2.fields['myfield'].validators[0])
+ self.assertNotEqual(f1.fields['myfield'].validators[0], f2.fields['myfield'].validators[0])
def test_hidden_widget(self):
# HiddenInput widgets are displayed differently in the as_table(), as_ul())
@@ -2003,9 +2003,8 @@ class FormsTestCase(TestCase):
field = ChoicesField()
field2 = copy.deepcopy(field)
self.assertIsInstance(field2, ChoicesField)
- self.assertFalse(id(field2.fields) == id(field.fields))
- self.assertFalse(id(field2.fields[0].choices) ==
- id(field.fields[0].choices))
+ self.assertIsNot(field2.fields, field.fields)
+ self.assertIsNot(field2.fields[0].choices, field.fields[0].choices)
def test_multivalue_optional_subfields(self):
class PhoneField(MultiValueField):
diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py
index 02048a1fc1..9f7e0d0bec 100644
--- a/tests/forms_tests/tests/test_widgets.py
+++ b/tests/forms_tests/tests/test_widgets.py
@@ -1194,12 +1194,12 @@ class ClearableFileInputTests(TestCase):
widget = ClearableFileInput()
field = StrangeFieldFile()
output = widget.render('my<div>file', field)
- self.assertFalse(field.url in output)
- self.assertTrue('href="something?chapter=1&amp;sect=2&amp;copy=3&amp;lang=en"' in output)
- self.assertFalse(six.text_type(field) in output)
- self.assertTrue('something&lt;div onclick=&quot;alert(&#39;oops&#39;)&quot;&gt;.jpg' in output)
- self.assertTrue('my&lt;div&gt;file' in output)
- self.assertFalse('my<div>file' in output)
+ self.assertNotIn(field.url, output)
+ self.assertIn('href="something?chapter=1&amp;sect=2&amp;copy=3&amp;lang=en"', output)
+ self.assertNotIn(six.text_type(field), output)
+ self.assertIn('something&lt;div onclick=&quot;alert(&#39;oops&#39;)&quot;&gt;.jpg', output)
+ self.assertIn('my&lt;div&gt;file', output)
+ self.assertNotIn('my<div>file', output)
def test_clear_input_renders_only_if_not_required(self):
"""
diff --git a/tests/forms_tests/tests/tests.py b/tests/forms_tests/tests/tests.py
index 62b2251ede..d53d030158 100644
--- a/tests/forms_tests/tests/tests.py
+++ b/tests/forms_tests/tests/tests.py
@@ -157,7 +157,7 @@ class FormsModelTestCase(TestCase):
# FileModel with unicode filename and data #########################
f = FileForm(data={}, files={'file1': SimpleUploadedFile('我隻氣墊船裝滿晒鱔.txt', 'मेरी मँडराने वाली नाव सर्पमीनों से भरी ह'.encode('utf-8'))}, auto_id=False)
self.assertTrue(f.is_valid())
- self.assertTrue('file1' in f.cleaned_data)
+ self.assertIn('file1', f.cleaned_data)
m = FileModel.objects.create(file=f.cleaned_data['file1'])
self.assertEqual(m.file.name, 'tests/\u6211\u96bb\u6c23\u588a\u8239\u88dd\u6eff\u6652\u9c54.txt')
m.delete()