Skip to content

Commit

Permalink
Converts test functions names to underscore
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin ABEL committed Feb 17, 2015
1 parent 919bfb6 commit f492652
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
18 changes: 9 additions & 9 deletions tests/test_autoslug_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@ def tearDown(self):

SluggedTestModel.objects.all().delete()

def testAutoCreateSlug(self):
def test_auto_create_slug(self):
m = SluggedTestModel(title='foo')
m.save()
self.assertEqual(m.slug, 'foo')

def testAutoCreateNextSlug(self):
def test_auto_create_next_slug(self):
m = SluggedTestModel(title='foo')
m.save()

m = SluggedTestModel(title='foo')
m.save()
self.assertEqual(m.slug, 'foo-2')

def testAutoCreateSlugWithNumber(self):
def test_auto_create_slug_with_number(self):
m = SluggedTestModel(title='foo 2012')
m.save()
self.assertEqual(m.slug, 'foo-2012')

def testAutoUpdateSlugWithNumber(self):
def test_auto_update_slug_with_number(self):
m = SluggedTestModel(title='foo 2012')
m.save()
m.save()
self.assertEqual(m.slug, 'foo-2012')

def testUpdateSlug(self):
def test_update_slug(self):
m = SluggedTestModel(title='foo')
m.save()
self.assertEqual(m.slug, 'foo')
Expand All @@ -67,7 +67,7 @@ def testUpdateSlug(self):
self.assertEqual(m.title, 'bar')
self.assertEqual(m.slug, 'foo-2012')

def testSimpleSlugSource(self):
def test_simple_slug_source(self):
m = SluggedTestModel(title='-foo')
m.save()
self.assertEqual(m.slug, 'foo')
Expand All @@ -79,7 +79,7 @@ def testSimpleSlugSource(self):
n.save()
self.assertEqual(n.slug, 'foo-2')

def testEmptySlugSource(self):
def test_empty_slug_source(self):
# regression test

m = SluggedTestModel(title='')
Expand All @@ -93,7 +93,7 @@ def testEmptySlugSource(self):
n.save()
self.assertEqual(n.slug, '-3')

def testInheritanceCreatesNextSlug(self):
def test_inheritance_creates_next_slug(self):
m = SluggedTestModel(title='foo')
m.save()

Expand All @@ -108,7 +108,7 @@ def testInheritanceCreatesNextSlug(self):

@pytest.mark.skipif(django.VERSION < (1, 7),
reason="Migrations are handled by south in Django <1.7")
class TestMigration(TestCase):
class MigrationTest(TestCase):
def safe_exec(self, string, value=None):
l = {}
try:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_json_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@


class JsonFieldTest(TestCase):
def testCharFieldCreate(self):
def test_char_field_create(self):
j = JSONFieldTestModel.objects.create(a=6, j_field=dict(foo='bar'))
self.assertEqual(j.a, 6)

def testDefault(self):
def test_default(self):
j = JSONFieldTestModel.objects.create(a=1)
self.assertEqual(j.j_field, {})

def testEmptyList(self):
def test_empty_list(self):
j = JSONFieldTestModel.objects.create(a=6, j_field=[])
self.assertTrue(isinstance(j.j_field, list))
self.assertEqual(j.j_field, [])
8 changes: 4 additions & 4 deletions tests/test_shortuuid_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@


class ShortUUIDFieldTest(TestCase):
def testUUIDFieldCreate(self):
def test_UUID_field_create(self):
j = ShortUUIDTestModel_field.objects.create(a=6, uuid_field=six.u('vytxeTZskVKR7C7WgdSP3d'))
self.assertEqual(j.uuid_field, six.u('vytxeTZskVKR7C7WgdSP3d'))

def testUUIDField_pkCreate(self):
def test_UUID_field_pk_create(self):
j = ShortUUIDTestModel_pk.objects.create(uuid_field=six.u('vytxeTZskVKR7C7WgdSP3d'))
self.assertEqual(j.uuid_field, six.u('vytxeTZskVKR7C7WgdSP3d'))
self.assertEqual(j.pk, six.u('vytxeTZskVKR7C7WgdSP3d'))

def testUUIDField_pkAgregateCreate(self):
def test_UUID_field_pk_agregate_create(self):
j = ShortUUIDTestAgregateModel.objects.create(a=6)
self.assertEqual(j.a, 6)
self.assertIsInstance(j.pk, six.string_types)
self.assertTrue(len(j.pk) < 23)

def testUUIDFieldManyToManyCreate(self):
def test_UUID_field_manytomany_create(self):
j = ShortUUIDTestManyToManyModel.objects.create(uuid_field=six.u('vytxeTZskVKR7C7WgdSP3e'))
self.assertEqual(j.uuid_field, six.u('vytxeTZskVKR7C7WgdSP3e'))
self.assertEqual(j.pk, six.u('vytxeTZskVKR7C7WgdSP3e'))
8 changes: 4 additions & 4 deletions tests/test_uuid_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@


class UUIDFieldTest(TestCase):
def testUUIDFieldCreate(self):
def test_UUID_field_create(self):
j = UUIDTestModel_field.objects.create(a=6, uuid_field=six.u('550e8400-e29b-41d4-a716-446655440000'))
self.assertEqual(j.uuid_field, six.u('550e8400-e29b-41d4-a716-446655440000'))

def testUUIDField_pkCreate(self):
def test_UUID_field_pk_create(self):
j = UUIDTestModel_pk.objects.create(uuid_field=six.u('550e8400-e29b-41d4-a716-446655440000'))
self.assertEqual(j.uuid_field, six.u('550e8400-e29b-41d4-a716-446655440000'))
self.assertEqual(j.pk, six.u('550e8400-e29b-41d4-a716-446655440000'))

def testUUIDField_pkAgregateCreate(self):
def test_UUID_field_pk_agregate_create(self):
j = UUIDTestAgregateModel.objects.create(a=6, uuid_field=six.u('550e8400-e29b-41d4-a716-446655440001'))
self.assertEqual(j.a, 6)
self.assertIsInstance(j.pk, six.string_types)
self.assertEqual(len(j.pk), 36)

def testUUIDFieldManyToManyCreate(self):
def test_UUID_field_manytomany_create(self):
j = UUIDTestManyToManyModel.objects.create(uuid_field=six.u('550e8400-e29b-41d4-a716-446655440010'))
self.assertEqual(j.uuid_field, six.u('550e8400-e29b-41d4-a716-446655440010'))
self.assertEqual(j.pk, six.u('550e8400-e29b-41d4-a716-446655440010'))
Expand Down

0 comments on commit f492652

Please sign in to comment.