Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated tests of .dates().

Replaced .dates() by .datetimes() for DateTimeFields.
Replaced dates with datetimes in the expected output for DateFields.
  • Loading branch information...
commit c01bbb32358201b3ac8cb4291ef87b7612a2b8e6 1 parent 50fb7a5
@aaugustin aaugustin authored
View
2  django/contrib/gis/tests/geoapp/test_regress.py
@@ -49,7 +49,7 @@ def test_unicode_date(self):
founded = datetime(1857, 5, 23)
mansfield = PennsylvaniaCity.objects.create(name='Mansfield', county='Tioga', point='POINT(-77.071445 41.823881)',
founded=founded)
- self.assertEqual(founded, PennsylvaniaCity.objects.dates('founded', 'day')[0])
+ self.assertEqual(founded, PennsylvaniaCity.objects.datetimes('founded', 'day')[0])
self.assertEqual(founded, PennsylvaniaCity.objects.aggregate(Min('founded'))['founded__min'])
def test_empty_count(self):
View
8 tests/modeltests/aggregation/tests.py
@@ -579,9 +579,9 @@ def test_dates_with_aggregation(self):
dates = Book.objects.annotate(num_authors=Count("authors")).dates('pubdate', 'year')
self.assertQuerysetEqual(
dates, [
- "datetime.datetime(1991, 1, 1, 0, 0)",
- "datetime.datetime(1995, 1, 1, 0, 0)",
- "datetime.datetime(2007, 1, 1, 0, 0)",
- "datetime.datetime(2008, 1, 1, 0, 0)"
+ "datetime.date(1991, 1, 1)",
+ "datetime.date(1995, 1, 1)",
+ "datetime.date(2007, 1, 1)",
+ "datetime.date(2008, 1, 1)"
]
)
View
18 tests/modeltests/basic/tests.py
@@ -266,34 +266,34 @@ def test_object_creation(self):
# ... but there will often be more efficient ways if that is all you need:
self.assertTrue(Article.objects.filter(id=a8.id).exists())
- # dates() returns a list of available dates of the given scope for
+ # datetimes() returns a list of available dates of the given scope for
# the given field.
self.assertQuerysetEqual(
- Article.objects.dates('pub_date', 'year'),
+ Article.objects.datetimes('pub_date', 'year'),
["datetime.datetime(2005, 1, 1, 0, 0)"])
self.assertQuerysetEqual(
- Article.objects.dates('pub_date', 'month'),
+ Article.objects.datetimes('pub_date', 'month'),
["datetime.datetime(2005, 7, 1, 0, 0)"])
self.assertQuerysetEqual(
- Article.objects.dates('pub_date', 'day'),
+ Article.objects.datetimes('pub_date', 'day'),
["datetime.datetime(2005, 7, 28, 0, 0)",
"datetime.datetime(2005, 7, 29, 0, 0)",
"datetime.datetime(2005, 7, 30, 0, 0)",
"datetime.datetime(2005, 7, 31, 0, 0)"])
self.assertQuerysetEqual(
- Article.objects.dates('pub_date', 'day', order='ASC'),
+ Article.objects.datetimes('pub_date', 'day', order='ASC'),
["datetime.datetime(2005, 7, 28, 0, 0)",
"datetime.datetime(2005, 7, 29, 0, 0)",
"datetime.datetime(2005, 7, 30, 0, 0)",
"datetime.datetime(2005, 7, 31, 0, 0)"])
self.assertQuerysetEqual(
- Article.objects.dates('pub_date', 'day', order='DESC'),
+ Article.objects.datetimes('pub_date', 'day', order='DESC'),
["datetime.datetime(2005, 7, 31, 0, 0)",
"datetime.datetime(2005, 7, 30, 0, 0)",
"datetime.datetime(2005, 7, 29, 0, 0)",
"datetime.datetime(2005, 7, 28, 0, 0)"])
- # dates() requires valid arguments.
+ # datetimes() requires valid arguments.
self.assertRaises(
TypeError,
Article.objects.dates,
@@ -324,10 +324,10 @@ def test_object_creation(self):
order="bad order",
)
- # Use iterator() with dates() to return a generator that lazily
+ # Use iterator() with datetimes() to return a generator that lazily
# requests each result one at a time, to save memory.
dates = []
- for article in Article.objects.dates('pub_date', 'day', order='DESC').iterator():
+ for article in Article.objects.datetimes('pub_date', 'day', order='DESC').iterator():
dates.append(article)
self.assertEqual(dates, [
datetime(2005, 7, 31, 0, 0),
View
56 tests/modeltests/many_to_one/tests.py
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from copy import deepcopy
-from datetime import datetime
+import datetime
from django.core.exceptions import MultipleObjectsReturned, FieldError
from django.test import TestCase
@@ -20,7 +20,7 @@ def setUp(self):
self.r2.save()
# Create an Article.
self.a = Article(id=None, headline="This is a test",
- pub_date=datetime(2005, 7, 27), reporter=self.r)
+ pub_date=datetime.date(2005, 7, 27), reporter=self.r)
self.a.save()
def test_get(self):
@@ -36,25 +36,25 @@ def test_create(self):
# You can also instantiate an Article by passing the Reporter's ID
# instead of a Reporter object.
a3 = Article(id=None, headline="Third article",
- pub_date=datetime(2005, 7, 27), reporter_id=self.r.id)
+ pub_date=datetime.date(2005, 7, 27), reporter_id=self.r.id)
a3.save()
self.assertEqual(a3.reporter.id, self.r.id)
# Similarly, the reporter ID can be a string.
a4 = Article(id=None, headline="Fourth article",
- pub_date=datetime(2005, 7, 27), reporter_id=str(self.r.id))
+ pub_date=datetime.date(2005, 7, 27), reporter_id=str(self.r.id))
a4.save()
self.assertEqual(repr(a4.reporter), "<Reporter: John Smith>")
def test_add(self):
# Create an Article via the Reporter object.
new_article = self.r.article_set.create(headline="John's second story",
- pub_date=datetime(2005, 7, 29))
+ pub_date=datetime.date(2005, 7, 29))
self.assertEqual(repr(new_article), "<Article: John's second story>")
self.assertEqual(new_article.reporter.id, self.r.id)
# Create a new article, and add it to the article set.
- new_article2 = Article(headline="Paul's story", pub_date=datetime(2006, 1, 17))
+ new_article2 = Article(headline="Paul's story", pub_date=datetime.date(2006, 1, 17))
self.r.article_set.add(new_article2)
self.assertEqual(new_article2.reporter.id, self.r.id)
self.assertQuerysetEqual(self.r.article_set.all(),
@@ -80,9 +80,9 @@ def test_add(self):
def test_assign(self):
new_article = self.r.article_set.create(headline="John's second story",
- pub_date=datetime(2005, 7, 29))
+ pub_date=datetime.date(2005, 7, 29))
new_article2 = self.r2.article_set.create(headline="Paul's story",
- pub_date=datetime(2006, 1, 17))
+ pub_date=datetime.date(2006, 1, 17))
# Assign the article to the reporter directly using the descriptor.
new_article2.reporter = self.r
new_article2.save()
@@ -118,9 +118,9 @@ def test_assign(self):
def test_selects(self):
new_article = self.r.article_set.create(headline="John's second story",
- pub_date=datetime(2005, 7, 29))
+ pub_date=datetime.date(2005, 7, 29))
new_article2 = self.r2.article_set.create(headline="Paul's story",
- pub_date=datetime(2006, 1, 17))
+ pub_date=datetime.date(2006, 1, 17))
# Reporter objects have access to their related Article objects.
self.assertQuerysetEqual(self.r.article_set.all(), [
"<Article: John's second story>",
@@ -237,9 +237,9 @@ def test_selects(self):
def test_reverse_selects(self):
a3 = Article.objects.create(id=None, headline="Third article",
- pub_date=datetime(2005, 7, 27), reporter_id=self.r.id)
+ pub_date=datetime.date(2005, 7, 27), reporter_id=self.r.id)
a4 = Article.objects.create(id=None, headline="Fourth article",
- pub_date=datetime(2005, 7, 27), reporter_id=str(self.r.id))
+ pub_date=datetime.date(2005, 7, 27), reporter_id=str(self.r.id))
# Reporters can be queried
self.assertQuerysetEqual(Reporter.objects.filter(id__exact=self.r.id),
["<Reporter: John Smith>"])
@@ -316,33 +316,33 @@ def test_select_related(self):
# objects (Reporters).
r1 = Reporter.objects.create(first_name='Mike', last_name='Royko', email='royko@suntimes.com')
r2 = Reporter.objects.create(first_name='John', last_name='Kass', email='jkass@tribune.com')
- a1 = Article.objects.create(headline='First', pub_date=datetime(1980, 4, 23), reporter=r1)
- a2 = Article.objects.create(headline='Second', pub_date=datetime(1980, 4, 23), reporter=r2)
+ Article.objects.create(headline='First', pub_date=datetime.date(1980, 4, 23), reporter=r1)
+ Article.objects.create(headline='Second', pub_date=datetime.date(1980, 4, 23), reporter=r2)
self.assertEqual(list(Article.objects.select_related().dates('pub_date', 'day')),
[
- datetime(1980, 4, 23, 0, 0),
- datetime(2005, 7, 27, 0, 0),
+ datetime.date(1980, 4, 23),
+ datetime.date(2005, 7, 27),
])
self.assertEqual(list(Article.objects.select_related().dates('pub_date', 'month')),
[
- datetime(1980, 4, 1, 0, 0),
- datetime(2005, 7, 1, 0, 0),
+ datetime.date(1980, 4, 1),
+ datetime.date(2005, 7, 1),
])
self.assertEqual(list(Article.objects.select_related().dates('pub_date', 'year')),
[
- datetime(1980, 1, 1, 0, 0),
- datetime(2005, 1, 1, 0, 0),
+ datetime.date(1980, 1, 1),
+ datetime.date(2005, 1, 1),
])
def test_delete(self):
new_article = self.r.article_set.create(headline="John's second story",
- pub_date=datetime(2005, 7, 29))
+ pub_date=datetime.date(2005, 7, 29))
new_article2 = self.r2.article_set.create(headline="Paul's story",
- pub_date=datetime(2006, 1, 17))
+ pub_date=datetime.date(2006, 1, 17))
a3 = Article.objects.create(id=None, headline="Third article",
- pub_date=datetime(2005, 7, 27), reporter_id=self.r.id)
+ pub_date=datetime.date(2005, 7, 27), reporter_id=self.r.id)
a4 = Article.objects.create(id=None, headline="Fourth article",
- pub_date=datetime(2005, 7, 27), reporter_id=str(self.r.id))
+ pub_date=datetime.date(2005, 7, 27), reporter_id=str(self.r.id))
# If you delete a reporter, his articles will be deleted.
self.assertQuerysetEqual(Article.objects.all(),
[
@@ -383,7 +383,7 @@ def test_explicit_fk(self):
# for a ForeignKey.
a2, created = Article.objects.get_or_create(id=None,
headline="John's second test",
- pub_date=datetime(2011, 5, 7),
+ pub_date=datetime.date(2011, 5, 7),
reporter_id=self.r.id)
self.assertTrue(created)
self.assertEqual(a2.reporter.id, self.r.id)
@@ -398,7 +398,7 @@ def test_explicit_fk(self):
# Create an Article by Paul for the same date.
a3 = Article.objects.create(id=None, headline="Paul's commentary",
- pub_date=datetime(2011, 5, 7),
+ pub_date=datetime.date(2011, 5, 7),
reporter_id=self.r2.id)
self.assertEqual(a3.reporter.id, self.r2.id)
@@ -407,7 +407,7 @@ def test_explicit_fk(self):
Article.objects.get, reporter_id=self.r.id)
self.assertEqual(repr(a3),
repr(Article.objects.get(reporter_id=self.r2.id,
- pub_date=datetime(2011, 5, 7))))
+ pub_date=datetime.date(2011, 5, 7))))
def test_manager_class_caching(self):
r1 = Reporter.objects.create(first_name='Mike')
@@ -425,7 +425,7 @@ def test_create_relation_with_ugettext_lazy(self):
email='john.smith@example.com')
lazy = ugettext_lazy('test')
reporter.article_set.create(headline=lazy,
- pub_date=datetime(2011, 6, 10))
+ pub_date=datetime.date(2011, 6, 10))
notlazy = six.text_type(lazy)
article = reporter.article_set.get()
self.assertEqual(article.headline, notlazy)
View
4 tests/modeltests/reserved_names/tests.py
@@ -42,8 +42,8 @@ def test_dates(self):
self.generate()
resp = Thing.objects.dates('where', 'year')
self.assertEqual(list(resp), [
- datetime.datetime(2005, 1, 1, 0, 0),
- datetime.datetime(2006, 1, 1, 0, 0),
+ datetime.date(2005, 1, 1),
+ datetime.date(2006, 1, 1),
])
def test_month_filter(self):
View
4 tests/regressiontests/aggregation_regress/tests.py
@@ -546,8 +546,8 @@ def test_more_more_more(self):
qs = Book.objects.annotate(num_authors=Count('authors')).filter(num_authors=2).dates('pubdate', 'day')
self.assertQuerysetEqual(
qs, [
- datetime.datetime(1995, 1, 15, 0, 0),
- datetime.datetime(2007, 12, 6, 0, 0)
+ datetime.date(1995, 1, 15),
+ datetime.date(2007, 12, 6),
],
lambda b: b
)
View
2  tests/regressiontests/backends/tests.py
@@ -144,7 +144,7 @@ def test_django_date_trunc(self):
updated = datetime.datetime(2010, 2, 20)
models.SchoolClass.objects.create(year=2009, last_updated=updated)
years = models.SchoolClass.objects.dates('last_updated', 'year')
- self.assertEqual(list(years), [datetime.datetime(2010, 1, 1, 0, 0)])
+ self.assertEqual(list(years), [datetime.date(2010, 1, 1)])
def test_django_date_extract(self):
"""
View
5 tests/regressiontests/extra_regress/tests.py
@@ -166,8 +166,9 @@ def test_dates_query(self):
)
self.assertQuerysetEqual(
- RevisionableModel.objects.extra(select={"the_answer": 'id'}).dates('when', 'month'),
- ['datetime.datetime(2008, 9, 1, 0, 0)']
+ RevisionableModel.objects.extra(select={"the_answer": 'id'}).datetimes('when', 'month'),
+ [datetime.datetime(2008, 9, 1, 0, 0)],
+ transform=lambda d: d,
)
def test_values_with_extra(self):
View
10 tests/regressiontests/generic_views/dates.py
@@ -141,7 +141,7 @@ class YearArchiveViewTests(TestCase):
def test_year_view(self):
res = self.client.get('/dates/books/2008/')
self.assertEqual(res.status_code, 200)
- self.assertEqual(list(res.context['date_list']), [datetime.datetime(2008, 10, 1)])
+ self.assertEqual(list(res.context['date_list']), [datetime.date(2008, 10, 1)])
self.assertEqual(res.context['year'], datetime.date(2008, 1, 1))
self.assertTemplateUsed(res, 'generic_views/book_archive_year.html')
@@ -152,7 +152,7 @@ def test_year_view(self):
def test_year_view_make_object_list(self):
res = self.client.get('/dates/books/2006/make_object_list/')
self.assertEqual(res.status_code, 200)
- self.assertEqual(list(res.context['date_list']), [datetime.datetime(2006, 5, 1)])
+ self.assertEqual(list(res.context['date_list']), [datetime.date(2006, 5, 1)])
self.assertEqual(list(res.context['book_list']), list(Book.objects.filter(pubdate__year=2006)))
self.assertEqual(list(res.context['object_list']), list(Book.objects.filter(pubdate__year=2006)))
self.assertTemplateUsed(res, 'generic_views/book_archive_year.html')
@@ -182,7 +182,7 @@ def test_year_view_allow_future(self):
res = self.client.get('/dates/books/%s/allow_future/' % year)
self.assertEqual(res.status_code, 200)
- self.assertEqual(list(res.context['date_list']), [datetime.datetime(year, 1, 1)])
+ self.assertEqual(list(res.context['date_list']), [datetime.date(year, 1, 1)])
def test_year_view_paginated(self):
res = self.client.get('/dates/books/2006/paginated/')
@@ -227,7 +227,7 @@ def test_month_view(self):
res = self.client.get('/dates/books/2008/oct/')
self.assertEqual(res.status_code, 200)
self.assertTemplateUsed(res, 'generic_views/book_archive_month.html')
- self.assertEqual(list(res.context['date_list']), [datetime.datetime(2008, 10, 1)])
+ self.assertEqual(list(res.context['date_list']), [datetime.date(2008, 10, 1)])
self.assertEqual(list(res.context['book_list']),
list(Book.objects.filter(pubdate=datetime.date(2008, 10, 1))))
self.assertEqual(res.context['month'], datetime.date(2008, 10, 1))
@@ -270,7 +270,7 @@ def test_month_view_allow_future(self):
# allow_future = True, valid future month
res = self.client.get('/dates/books/%s/allow_future/' % urlbit)
self.assertEqual(res.status_code, 200)
- self.assertEqual(res.context['date_list'][0].date(), b.pubdate)
+ self.assertEqual(res.context['date_list'][0], b.pubdate)
self.assertEqual(list(res.context['book_list']), [b])
self.assertEqual(res.context['month'], future)
View
4 tests/regressiontests/model_inheritance_regress/tests.py
@@ -134,8 +134,8 @@ def test_issue_7105(self):
obj = Child.objects.create(
name='child',
created=datetime.datetime(2008, 6, 26, 17, 0, 0))
- dates = list(Child.objects.dates('created', 'month'))
- self.assertEqual(dates, [datetime.datetime(2008, 6, 1, 0, 0)])
+ datetimes = list(Child.objects.datetimes('created', 'month'))
+ self.assertEqual(datetimes, [datetime.datetime(2008, 6, 1, 0, 0)])
def test_issue_7276(self):
# Regression test for #7276: calling delete() on a model with
View
24 tests/regressiontests/queries/tests.py
@@ -550,37 +550,37 @@ def test_ticket9926(self):
def test_tickets_6180_6203(self):
# Dates with limits and/or counts
self.assertEqual(Item.objects.count(), 4)
- self.assertEqual(Item.objects.dates('created', 'month').count(), 1)
- self.assertEqual(Item.objects.dates('created', 'day').count(), 2)
- self.assertEqual(len(Item.objects.dates('created', 'day')), 2)
- self.assertEqual(Item.objects.dates('created', 'day')[0], datetime.datetime(2007, 12, 19, 0, 0))
+ self.assertEqual(Item.objects.datetimes('created', 'month').count(), 1)
+ self.assertEqual(Item.objects.datetimes('created', 'day').count(), 2)
+ self.assertEqual(len(Item.objects.datetimes('created', 'day')), 2)
+ self.assertEqual(Item.objects.datetimes('created', 'day')[0], datetime.datetime(2007, 12, 19, 0, 0))
def test_tickets_7087_12242(self):
# Dates with extra select columns
self.assertQuerysetEqual(
- Item.objects.dates('created', 'day').extra(select={'a': 1}),
+ Item.objects.datetimes('created', 'day').extra(select={'a': 1}),
['datetime.datetime(2007, 12, 19, 0, 0)', 'datetime.datetime(2007, 12, 20, 0, 0)']
)
self.assertQuerysetEqual(
- Item.objects.extra(select={'a': 1}).dates('created', 'day'),
+ Item.objects.extra(select={'a': 1}).datetimes('created', 'day'),
['datetime.datetime(2007, 12, 19, 0, 0)', 'datetime.datetime(2007, 12, 20, 0, 0)']
)
name="one"
self.assertQuerysetEqual(
- Item.objects.dates('created', 'day').extra(where=['name=%s'], params=[name]),
+ Item.objects.datetimes('created', 'day').extra(where=['name=%s'], params=[name]),
['datetime.datetime(2007, 12, 19, 0, 0)']
)
self.assertQuerysetEqual(
- Item.objects.extra(where=['name=%s'], params=[name]).dates('created', 'day'),
+ Item.objects.extra(where=['name=%s'], params=[name]).datetimes('created', 'day'),
['datetime.datetime(2007, 12, 19, 0, 0)']
)
def test_ticket7155(self):
# Nullable dates
self.assertQuerysetEqual(
- Item.objects.dates('modified', 'day'),
+ Item.objects.datetimes('modified', 'day'),
['datetime.datetime(2007, 12, 19, 0, 0)']
)
@@ -699,7 +699,7 @@ def test_ticket7791(self):
)
# Pickling of DateQuerySets used to fail
- qs = Item.objects.dates('created', 'month')
+ qs = Item.objects.datetimes('created', 'month')
_ = pickle.loads(pickle.dumps(qs))
def test_ticket9997(self):
@@ -1235,8 +1235,8 @@ def test_ticket8683(self):
# field
self.assertRaisesMessage(
AssertionError,
- "'name' isn't a DateField.",
- Item.objects.dates, 'name', 'month'
+ "'name' isn't a DateTimeField.",
+ Item.objects.datetimes, 'name', 'month'
)
class Queries4Tests(BaseQuerysetTest):
Please sign in to comment.
Something went wrong with that request. Please try again.