Skip to content

Commit

Permalink
Format consistent with the rest of Armstrong (no code changed)
Browse files Browse the repository at this point in the history
  • Loading branch information
tswicegood committed Mar 20, 2012
1 parent 7a7f0fd commit 492e5eb
Showing 1 changed file with 17 additions and 25 deletions.
42 changes: 17 additions & 25 deletions armstrong/core/arm_wells/tests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@
from django.db.utils import IntegrityError
from django.core.exceptions import ObjectDoesNotExist

from ._utils import (TestCase,
add_n_random_stories_to_well,
generate_random_well,
generate_random_welltype,
generate_random_story)
from ._utils import (TestCase, add_n_random_stories_to_well,
generate_random_well, generate_random_welltype, generate_random_story)

from ..models import WellType, Well, Node
from .arm_wells_support.models import (MissingFieldWell, MissingFieldWellNode,
Story, NewWell, NewNode,
DifferentWell, DifferentWellType,
WrongRelationWell, WrongRelationNode)
Story, NewWell, NewNode, DifferentWell, DifferentWellType,
WrongRelationWell, WrongRelationNode)


#
Expand Down Expand Up @@ -70,13 +66,13 @@ def test_has_well_field(self):
class SubclassesTestCase(TestCase):
def setUp(self):
self.well = NewWell.objects.create(type=generate_random_welltype())
self.node1 = NewNode.objects.create(content_object=generate_random_story(),
well=self.well,
order=100)
self.node1 = NewNode.objects.create(
content_object=generate_random_story(), well=self.well,
order=100)

self.node2 = NewNode.objects.create(content_object=generate_random_story(),
well=self.well,
order=9)
self.node2 = NewNode.objects.create(
content_object=generate_random_story(), well=self.well,
order=9)

def test_has_correct_relations(self):
self.assertEqual(WellType, type(self.well.type))
Expand Down Expand Up @@ -118,12 +114,10 @@ def test_has_working_items_relation(self):
self.well.nodes.all()[1].content_object)

def test_has_broken_items_relation(self):
well = WrongRelationWell.objects.create(type=generate_random_welltype())
well = WrongRelationWell.objects.create(
type=generate_random_welltype())
node = WrongRelationNode.objects.create(
content_object=generate_random_story(),
well=well,
order=1
)
content_object=generate_random_story(), well=well, order=1)

with self.assertRaises(AttributeError):
well.items
Expand All @@ -146,18 +140,16 @@ def test_has_as_many_nodes_as_are_added(self):
r = random.randint(1, 10)
for i in range(r):
Node.objects.create(well=well,
content_object=generate_random_story())
content_object=generate_random_story())

self.assertEqual(r, well.nodes.count())

def test_nodes_are_sorted_by_order(self):
well = generate_random_well()
second = Node.objects.create(well=well,
content_object=generate_random_story(),
order=100)
content_object=generate_random_story(), order=100)
first = Node.objects.create(well=well,
content_object=generate_random_story(),
order=10)
content_object=generate_random_story(), order=10)

self.assertEqual(first, well.nodes.all()[0])
self.assertEqual(second, well.nodes.all()[1])
Expand Down Expand Up @@ -262,7 +254,7 @@ def test_string_representation(self):
well = generate_random_well()
order = random.randint(100, 200)
node = Node.objects.create(well=well, content_object=story,
order=order)
order=order)

expected = "%s (%d): %s" % (well.title, order, story.title)
self.assertEqual(expected, str(node))

0 comments on commit 492e5eb

Please sign in to comment.