Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Splitted expressions tests into smaller methods"

This reverts commit c253282.
  • Loading branch information...
commit 7f4dbdc036a4439ed3e4954625fe91596b314a36 1 parent c2150d4
@akaariai akaariai authored
Showing with 15 additions and 28 deletions.
  1. +15 −28 tests/modeltests/expressions/tests.py
View
43 tests/modeltests/expressions/tests.py
@@ -9,7 +9,7 @@
class ExpressionsTests(TestCase):
- def setUp(self):
+ def test_filter(self):
Company.objects.create(
name="Example Inc.", num_employees=2300, num_chairs=5, is_large=False,
ceo=Employee.objects.create(firstname="Joe", lastname="Smith")
@@ -23,8 +23,6 @@ def setUp(self):
ceo=Employee.objects.create(firstname="Max", lastname="Mustermann")
)
-
- def test_filter(self):
company_query = Company.objects.values(
"name", "num_employees", "num_chairs", "is_large"
).order_by(
@@ -160,13 +158,6 @@ def test_filter(self):
],
lambda o: o,
)
-
- def test_comparisons(self):
- company_query = Company.objects.values(
- "name", "num_employees", "num_chairs", "is_large"
- ).order_by(
- "name", "num_employees", "num_chairs", "is_large"
- )
# The comparison operators and the bitwise unary not can be used
# to assign to boolean fields
for expression in (
@@ -189,19 +180,19 @@ def test_comparisons(self):
self.assertQuerysetEqual(
company_query, [
{
- 'num_chairs': 5,
+ 'num_chairs': 5294600,
'name': 'Example Inc.',
'num_employees': 2300,
'is_large': True
},
{
- 'num_chairs': 4,
+ 'num_chairs': 15,
'name': 'Foobar Ltd.',
'num_employees': 3,
'is_large': False
},
{
- 'num_chairs': 1,
+ 'num_chairs': 1088,
'name': 'Test GmbH',
'num_employees': 32,
'is_large': False
@@ -239,31 +230,28 @@ def test_comparisons(self):
lambda c: six.text_type(c.point_of_contact),
)
- def test_joins(self):
c = Company.objects.all()[0]
- c.point_of_contact = Employee.objects.create(
- firstname="Guido", lastname="van Rossum")
- old_ceo = c.ceo
- c.ceo = c.point_of_contact
+ c.point_of_contact = Employee.objects.create(firstname="Guido", lastname="van Rossum")
c.save()
# F Expressions can also span joins
self.assertQuerysetEqual(
- Company.objects.filter(
- ceo__firstname=F("point_of_contact__firstname")),
- [
- "Example Inc.",
+ Company.objects.filter(ceo__firstname=F("point_of_contact__firstname")), [
+ "Foobar Ltd.",
+ "Test GmbH",
],
lambda c: c.name
)
- c.ceo = old_ceo
- c.save()
- # Guido is point of contanct but not CEO. For the null cases we do
- # not generate a match.
+
Company.objects.exclude(
ceo__firstname=F("point_of_contact__firstname")
).update(name="foo")
- self.assertEqual(Company.objects.filter(name="foo").count(), 1)
+ self.assertEqual(
+ Company.objects.exclude(
+ ceo__firstname=F('point_of_contact__firstname')
+ ).get().name,
+ "foo",
+ )
self.assertRaises(FieldError,
lambda: Company.objects.exclude(
@@ -271,7 +259,6 @@ def test_joins(self):
).update(name=F('point_of_contact__lastname'))
)
- def test_save(self):
# F expressions can be used to update attributes on single objects
test_gmbh = Company.objects.get(name="Test GmbH")
self.assertEqual(test_gmbh.num_employees, 32)
Please sign in to comment.
Something went wrong with that request. Please try again.