Use assertRaisesMessage() in some tests

Author: timgraham

tests/forms_tests_/test_array.py

@@ -21,21 +21,15 @@ def test_valid(self):
 
     def test_to_python_fail(self):
         field = SimpleArrayField(forms.IntegerField())
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "Item 1 in the array did not validate: Enter a whole number."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg):
             field.clean("a,b,9")
-        self.assertEqual(
-            cm.exception.messages[0],
-            "Item 1 in the array did not validate: Enter a whole number.",
-        )
 
     def test_validate_fail(self):
         field = SimpleArrayField(forms.CharField(required=True))
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "Item 3 in the array did not validate: This field is required."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg):
             field.clean("a,b,")
-        self.assertEqual(
-            cm.exception.messages[0],
-            "Item 3 in the array did not validate: This field is required.",
-        )
 
     def test_validate_fail_base_field_error_params(self):
         field = SimpleArrayField(forms.CharField(max_length=2))
@@ -68,12 +62,9 @@ def test_validate_fail_base_field_error_params(self):
 
     def test_validators_fail(self):
         field = SimpleArrayField(forms.RegexField("[a-e]{2}"))
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "Item 1 in the array did not validate: Enter a valid value."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg):
             field.clean("a,bc,de")
-        self.assertEqual(
-            cm.exception.messages[0],
-            "Item 1 in the array did not validate: Enter a valid value.",
-        )
 
     def test_delimiter(self):
         field = SimpleArrayField(forms.CharField(), delimiter="|")
@@ -92,21 +83,15 @@ def test_prepare_value(self):
 
     def test_max_length(self):
         field = SimpleArrayField(forms.CharField(), max_length=2)
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "List contains 3 items, it should contain no more than 2."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg):
             field.clean("a,b,c")
-        self.assertEqual(
-            cm.exception.messages[0],
-            "List contains 3 items, it should contain no more than 2.",
-        )
 
     def test_min_length(self):
         field = SimpleArrayField(forms.CharField(), min_length=4)
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "List contains 3 items, it should contain no fewer than 4."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg):
             field.clean("a,b,c")
-        self.assertEqual(
-            cm.exception.messages[0],
-            "List contains 3 items, it should contain no fewer than 4.",
-        )
 
     def test_min_length_singular(self):
         field = SimpleArrayField(forms.IntegerField(), min_length=2)
@@ -117,9 +102,9 @@ def test_min_length_singular(self):
 
     def test_required(self):
         field = SimpleArrayField(forms.CharField(), required=True)
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "This field is required."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg):
             field.clean("")
-        self.assertEqual(cm.exception.messages[0], "This field is required.")
 
     def test_model_field_formfield(self):
         model_field = ArrayField(models.CharField(max_length=27))

tests/forms_tests_/test_objectidfield.py

@@ -23,9 +23,8 @@ def test_clean_empty_string(self):
 
     def test_clean_invalid(self):
         field = ObjectIdField()
-        with self.assertRaises(ValidationError) as cm:
+        with self.assertRaisesMessage(ValidationError, "Enter a valid Object Id."):
             field.clean("invalid")
-        self.assertEqual(cm.exception.messages[0], "Enter a valid Object Id.")
 
     def test_prepare_value(self):
         field = ObjectIdField()

tests/model_fields_/test_arrayfield.py

@@ -788,13 +788,10 @@ def test_loading(self):
 class ValidationTests(SimpleTestCase):
     def test_unbounded(self):
         field = ArrayField(models.IntegerField())
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "Item 2 in the array did not validate: This field cannot be null."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg) as cm:
             field.clean([1, None], None)
         self.assertEqual(cm.exception.code, "item_invalid")
-        self.assertEqual(
-            cm.exception.message % cm.exception.params,
-            "Item 2 in the array did not validate: This field cannot be null.",
-        )
 
     def test_blank_true(self):
         field = ArrayField(models.IntegerField(blank=True, null=True))
@@ -804,12 +801,9 @@ def test_blank_true(self):
     def test_with_max_size(self):
         field = ArrayField(models.IntegerField(), max_size=3)
         field.clean([1, 2, 3], None)
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "List contains 4 items, it should contain no more than 3."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg):
             field.clean([1, 2, 3, 4], None)
-        self.assertEqual(
-            cm.exception.messages[0],
-            "List contains 4 items, it should contain no more than 3.",
-        )
 
     def test_with_max_size_singular(self):
         field = ArrayField(models.IntegerField(), max_size=1)
@@ -821,10 +815,10 @@ def test_with_max_size_singular(self):
     def test_nested_array_mismatch(self):
         field = ArrayField(ArrayField(models.IntegerField()))
         field.clean([[1, 2], [3, 4]], None)
-        with self.assertRaises(exceptions.ValidationError) as cm:
+        msg = "Nested arrays must have the same length."
+        with self.assertRaisesMessage(exceptions.ValidationError, msg) as cm:
             field.clean([[1, 2], [3, 4, 5]], None)
         self.assertEqual(cm.exception.code, "nested_array_mismatch")
-        self.assertEqual(cm.exception.messages[0], "Nested arrays must have the same length.")
 
     def test_with_base_field_error_params(self):
         field = ArrayField(models.CharField(max_length=2))

tests/model_fields_/test_objectidfield.py

@@ -117,12 +117,10 @@ def test_loading(self):
 class ValidationTests(TestCase):
     def test_invalid_objectid(self):
         field = ObjectIdField()
-        with self.assertRaises(ValidationError) as cm:
+        msg = "“550e8400” is not a valid Object Id."
+        with self.assertRaisesMessage(ValidationError, msg) as cm:
             field.clean("550e8400", None)
         self.assertEqual(cm.exception.code, "invalid")
-        self.assertEqual(
-            cm.exception.message % cm.exception.params, "“550e8400” is not a valid Object Id."
-        )
 
     def test_objectid_instance_ok(self):
         value = ObjectId()