aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_validation.py
diff options
context:
space:
mode:
authorTom Christie2014-10-10 14:16:09 +0100
committerTom Christie2014-10-10 14:16:09 +0100
commitd9a199ca0ddf92f999aa37b396596d0e3e0a26d9 (patch)
treec7521c3c046e5f97e52bab51aef8a5367ad52f6e /tests/test_validation.py
parenta0e852a4d52558db93209b4616f030b4ae2dcedb (diff)
downloaddjango-rest-framework-d9a199ca0ddf92f999aa37b396596d0e3e0a26d9.tar.bz2
exceptions.ValidationFailed, not Django's ValidationError
Diffstat (limited to 'tests/test_validation.py')
-rw-r--r--tests/test_validation.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/test_validation.py b/tests/test_validation.py
index ce39714d..849c7e9d 100644
--- a/tests/test_validation.py
+++ b/tests/test_validation.py
@@ -1,9 +1,8 @@
from __future__ import unicode_literals
from django.core.validators import MaxValueValidator
-from django.core.exceptions import ValidationError
from django.db import models
from django.test import TestCase
-from rest_framework import generics, serializers, status
+from rest_framework import exceptions, generics, serializers, status
from rest_framework.test import APIRequestFactory
factory = APIRequestFactory()
@@ -38,7 +37,7 @@ class ShouldValidateModelSerializer(serializers.ModelSerializer):
def validate_renamed(self, value):
if len(value) < 3:
- raise serializers.ValidationError('Minimum 3 characters.')
+ raise exceptions.ValidationFailed('Minimum 3 characters.')
return value
class Meta:
@@ -74,10 +73,10 @@ class ValidationSerializer(serializers.Serializer):
foo = serializers.CharField()
def validate_foo(self, attrs, source):
- raise serializers.ValidationError("foo invalid")
+ raise exceptions.ValidationFailed("foo invalid")
def validate(self, attrs):
- raise serializers.ValidationError("serializer invalid")
+ raise exceptions.ValidationFailed("serializer invalid")
class TestAvoidValidation(TestCase):
@@ -159,7 +158,7 @@ class TestChoiceFieldChoicesValidate(TestCase):
value = self.CHOICES[0][0]
try:
f.to_internal_value(value)
- except ValidationError:
+ except exceptions.ValidationFailed:
self.fail("Value %s does not validate" % str(value))
# def test_nested_choices(self):