encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 00:19:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix testcase for django < 1.4

Browse Source
This commit is contained in:
Stephan Groß 2013-01-29 13:30:37 +01:00
parent 5e354845c5
commit e8ccc58254
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rest_framework/tests/serializer.py
View File

@ -1,6 +1,8 @@
import datetime import datetime
import pickle import pickle
import django
from django.test import TestCase from django.test import TestCase
from django.utils import unittest
from rest_framework import serializers from rest_framework import serializers
from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel, from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel,
BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel, BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel,
@ -514,8 +516,6 @@ class DateValidationTest(TestCase):
class DateTimeValidationTest(TestCase): class DateTimeValidationTest(TestCase):
def test_valid_date_time_input_formats(self): def test_valid_date_time_input_formats(self):
serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31 04:31:59.123456'})
self.assertTrue(serializer.is_valid())
serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31 04:31:59'}) serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31 04:31:59'})
self.assertTrue(serializer.is_valid()) self.assertTrue(serializer.is_valid())
@ -526,9 +526,6 @@ class DateTimeValidationTest(TestCase):
serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31'}) serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31'})
self.assertTrue(serializer.is_valid()) self.assertTrue(serializer.is_valid())
serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984 04:31:59.123456'})
self.assertTrue(serializer.is_valid())
serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984 04:31:59'}) serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984 04:31:59'})
self.assertTrue(serializer.is_valid()) self.assertTrue(serializer.is_valid())
@ -538,9 +535,6 @@ class DateTimeValidationTest(TestCase):
serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984'}) serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984'})
self.assertTrue(serializer.is_valid()) self.assertTrue(serializer.is_valid())
serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84 04:31:59.123456'})
self.assertTrue(serializer.is_valid())
serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84 04:31:59'}) serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84 04:31:59'})
self.assertTrue(serializer.is_valid()) self.assertTrue(serializer.is_valid())
@ -550,6 +544,18 @@ class DateTimeValidationTest(TestCase):
serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84'}) serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84'})
self.assertTrue(serializer.is_valid()) self.assertTrue(serializer.is_valid())
@unittest.skipUnless(django.VERSION >= (1, 4), "django < 1.4 don't have microseconds in default settings")
def test_valid_date_time_input_formats_2(self):
serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31 04:31:59.123456'})
self.assertTrue(serializer.is_valid())
serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984 04:31:59.123456'})
self.assertTrue(serializer.is_valid())
serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84 04:31:59.123456'})
self.assertTrue(serializer.is_valid())
def test_wrong_date_time_input_format(self): def test_wrong_date_time_input_format(self):
serializer = DateTimeObjectSerializer(data={'date_time': 'something wrong'}) serializer = DateTimeObjectSerializer(data={'date_time': 'something wrong'})
self.assertFalse(serializer.is_valid()) self.assertFalse(serializer.is_valid())