summaryrefslogtreecommitdiff
path: root/tests/serializers
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-06-05 18:59:22 +0200
committerClaude Paroz <claude@2xlibre.net>2017-06-05 21:36:25 +0200
commitd02fc8dfd3622efd996c0e300e11f6c219b549b4 (patch)
tree6433aec40e824b2aa3d56d3654c860b28e83f4fb /tests/serializers
parent5a52d932ef4da8228d82673314341c2c86602248 (diff)
Refs #21286 -- Enabled serializer tests with date/datetime pk model
Diffstat (limited to 'tests/serializers')
-rw-r--r--tests/serializers/models/data.py10
-rw-r--r--tests/serializers/test_data.py25
2 files changed, 19 insertions, 16 deletions
diff --git a/tests/serializers/models/data.py b/tests/serializers/models/data.py
index 14bd644fe1..b62f85a868 100644
--- a/tests/serializers/models/data.py
+++ b/tests/serializers/models/data.py
@@ -188,11 +188,13 @@ class BooleanPKData(models.Model):
class CharPKData(models.Model):
data = models.CharField(max_length=30, primary_key=True)
-# class DatePKData(models.Model):
-# data = models.DateField(primary_key=True)
-# class DateTimePKData(models.Model):
-# data = models.DateTimeField(primary_key=True)
+class DatePKData(models.Model):
+ data = models.DateField(primary_key=True)
+
+
+class DateTimePKData(models.Model):
+ data = models.DateTimeField(primary_key=True)
class DecimalPKData(models.Model):
diff --git a/tests/serializers/test_data.py b/tests/serializers/test_data.py
index c56223a1e8..b61dfe075f 100644
--- a/tests/serializers/test_data.py
+++ b/tests/serializers/test_data.py
@@ -16,16 +16,17 @@ from django.test import TestCase
from .models import (
Anchor, AutoNowDateTimeData, BigIntegerData, BinaryData, BooleanData,
- BooleanPKData, CharData, CharPKData, DateData, DateTimeData, DecimalData,
- DecimalPKData, EmailData, EmailPKData, ExplicitInheritBaseModel, FileData,
- FilePathData, FilePathPKData, FKData, FKDataToField, FKDataToO2O,
- FKSelfData, FKToUUID, FloatData, FloatPKData, GenericData,
- GenericIPAddressData, GenericIPAddressPKData, InheritAbstractModel,
- InheritBaseModel, IntegerData, IntegerPKData, Intermediate, LengthModel,
- M2MData, M2MIntermediateData, M2MSelfData, ModifyingSaveData,
- NullBooleanData, O2OData, PositiveIntegerData, PositiveIntegerPKData,
- PositiveSmallIntegerData, PositiveSmallIntegerPKData, SlugData, SlugPKData,
- SmallData, SmallPKData, Tag, TextData, TimeData, UniqueAnchor, UUIDData,
+ BooleanPKData, CharData, CharPKData, DateData, DatePKData, DateTimeData,
+ DateTimePKData, DecimalData, DecimalPKData, EmailData, EmailPKData,
+ ExplicitInheritBaseModel, FileData, FilePathData, FilePathPKData, FKData,
+ FKDataToField, FKDataToO2O, FKSelfData, FKToUUID, FloatData, FloatPKData,
+ GenericData, GenericIPAddressData, GenericIPAddressPKData,
+ InheritAbstractModel, InheritBaseModel, IntegerData, IntegerPKData,
+ Intermediate, LengthModel, M2MData, M2MIntermediateData, M2MSelfData,
+ ModifyingSaveData, NullBooleanData, O2OData, PositiveIntegerData,
+ PositiveIntegerPKData, PositiveSmallIntegerData,
+ PositiveSmallIntegerPKData, SlugData, SlugPKData, SmallData, SmallPKData,
+ Tag, TextData, TimeData, UniqueAnchor, UUIDData,
)
from .tests import register_tests
@@ -317,8 +318,8 @@ The end."""),
(pk_obj, 601, BooleanPKData, True),
(pk_obj, 602, BooleanPKData, False),
(pk_obj, 610, CharPKData, "Test Char PKData"),
- # (pk_obj, 620, DatePKData, datetime.date(2006, 6, 16)),
- # (pk_obj, 630, DateTimePKData, datetime.datetime(2006, 6, 16, 10, 42, 37)),
+ (pk_obj, 620, DatePKData, datetime.date(2006, 6, 16)),
+ (pk_obj, 630, DateTimePKData, datetime.datetime(2006, 6, 16, 10, 42, 37)),
(pk_obj, 640, EmailPKData, "hovercraft@example.com"),
# (pk_obj, 650, FilePKData, 'file:///foo/bar/whiz.txt'),
(pk_obj, 660, FilePathPKData, "/foo/bar/whiz.txt"),