Merge pull request jazzband#111 from sirkonst/hotfix/ValidationError

Convert DeserializationError to ValidationError

Author: dominicrodger

recurrence/exceptions.py

@@ -1,14 +1,13 @@
-class RecurrenceError(Exception):
-    pass
+from django.core.exceptions import ValidationError
 
 
-class SerializationError(RecurrenceError):
+class RecurrenceError(ValidationError):
     pass
 
 
-class DeserializationError(RecurrenceError):
+class SerializationError(RecurrenceError):
     pass
 
 
-class ValidationError(RecurrenceError):
+class DeserializationError(RecurrenceError):
     pass

tests/test_saving.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from django.core.exceptions import ValidationError
 from recurrence import Recurrence, Rule
 from tests.models import EventWithNoNulls
 import pytest
@@ -59,16 +60,27 @@ def test_recurrence_object_is_saved():
     ) == instances
 
 
+@pytest.mark.django_db
+@pytest.mark.parametrize('value', [
+    ' ', 'invalid', 'RRULE:', 'RRULE:FREQ=', 'RRULE:FREQ=invalid'
+])
+def test_recurrence_text_pattern_invalid(value):
+    with pytest.raises(ValidationError):
+        EventWithNoNulls.objects.create(
+            recurs=value
+        )
+
+
 @pytest.mark.django_db
 def test_invalid_frequency_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule('fish')]
             )
         )
 
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(42)]
@@ -78,14 +90,14 @@ def test_invalid_frequency_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_interval_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(recurrence.DAILY, interval=0)]
             )
         )
 
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(recurrence.DAILY, interval='cat')]
@@ -95,7 +107,7 @@ def test_invalid_interval_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_wkst_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(recurrence.DAILY, wkst=17)]
@@ -105,7 +117,7 @@ def test_invalid_wkst_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_until_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(recurrence.DAILY, until=17)]
@@ -115,7 +127,7 @@ def test_invalid_until_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_count_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(recurrence.DAILY, count='fish')]
@@ -125,7 +137,7 @@ def test_invalid_count_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_byday_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(recurrence.DAILY, byday='house')]
@@ -135,7 +147,7 @@ def test_invalid_byday_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_bymonth_too_high_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(recurrence.DAILY, bymonth=[1, 32])]
@@ -145,7 +157,7 @@ def test_invalid_bymonth_too_high_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_bymonth_toolow_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rrules=[Rule(recurrence.DAILY, bymonth=[0, ])]
@@ -155,7 +167,7 @@ def test_invalid_bymonth_toolow_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_exclusion_interval_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 exrules=[Rule(recurrence.DAILY, interval=0)]
@@ -165,7 +177,7 @@ def test_invalid_exclusion_interval_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_date_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 rdates=["fish"]
@@ -175,7 +187,7 @@ def test_invalid_date_recurrence_object_raises():
 
 @pytest.mark.django_db
 def test_invalid_exclusion_date_recurrence_object_raises():
-    with pytest.raises(recurrence.SerializationError):
+    with pytest.raises(ValidationError):
         EventWithNoNulls.objects.create(
             recurs=Recurrence(
                 exdates=["fish"]