remove warnings

This commit is contained in:
Val Neekman 2014-03-08 09:15:18 -05:00
parent 06c224ccdb
commit 647b01feb6
2 changed files with 39 additions and 35 deletions

View file

@ -3,12 +3,16 @@ python:
- "2.7"
- "3.2"
- "3.3"
env:
- DJANGO=1.5.5
- DJANGO=1.6.2
- DJANGO=https://www.djangoproject.com/download/1.7a2/tarball/
install:
- pip install -q Django==$DJANGO --use-mirrors
- pip install -q -r requirements.txt --use-mirrors
- pip install pep8 --use-mirrors
- pip install -q -e . --use-mirrors
- pip install -q Django==$DJANGO
- pip install -q -r requirements.txt
- pip install pep8
- pip install -q -e .
script: python manage.py test

View file

@ -18,59 +18,59 @@ class SlugUnicodeTestCase(TestCase):
txt = "This is a test ---"
r = slugify(txt)
self.assertEquals(r, "this-is-a-test")
self.assertEqual(r, "this-is-a-test")
txt = "This -- is a ## test ---"
r = slugify(txt)
self.assertEquals(r, "this-is-a-test")
self.assertEqual(r, "this-is-a-test")
txt = 'C\'est déjà l\'été.'
r = slugify(txt)
self.assertEquals(r, "cest-deja-lete")
self.assertEqual(r, "cest-deja-lete")
txt = 'Nín hǎo. Wǒ shì zhōng guó rén'
r = slugify(txt)
self.assertEquals(r, "nin-hao-wo-shi-zhong-guo-ren")
self.assertEqual(r, "nin-hao-wo-shi-zhong-guo-ren")
txt = 'Компьютер'
r = slugify(txt)
self.assertEquals(r, "kompiuter")
self.assertEqual(r, "kompiuter")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt)
self.assertEquals(r, "jaja-lol-mememeoo-a")
self.assertEqual(r, "jaja-lol-mememeoo-a")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt, max_length=9)
self.assertEquals(r, "jaja-lol")
self.assertEqual(r, "jaja-lol")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt, max_length=15)
self.assertEquals(r, "jaja-lol-mememe")
self.assertEqual(r, "jaja-lol-mememe")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt, max_length=50)
self.assertEquals(r, "jaja-lol-mememeoo-a")
self.assertEqual(r, "jaja-lol-mememeoo-a")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt, max_length=15, word_boundary=True)
self.assertEquals(r, "jaja-lol-a")
self.assertEqual(r, "jaja-lol-a")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt, max_length=19, word_boundary=True)
self.assertEquals(r, "jaja-lol-mememeoo")
self.assertEqual(r, "jaja-lol-mememeoo")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt, max_length=20, word_boundary=True)
self.assertEquals(r, "jaja-lol-mememeoo-a")
self.assertEqual(r, "jaja-lol-mememeoo-a")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt, max_length=20, word_boundary=True, separator=".")
self.assertEquals(r, "jaja.lol.mememeoo.a")
self.assertEqual(r, "jaja.lol.mememeoo.a")
txt = 'jaja---lol-méméméoo--a'
r = slugify(txt, max_length=20, word_boundary=True, separator="ZZZZZZ")
self.assertEquals(r, "jajaZZZZZZlolZZZZZZmememeooZZZZZZa")
self.assertEqual(r, "jajaZZZZZZlolZZZZZZmememeooZZZZZZa")
class SlugUniqueTestCase(TestCase):
@ -84,7 +84,7 @@ class SlugUniqueTestCase(TestCase):
# 1. query: SELECT test, if slug 'john' exists
# 2. query: INSERT values
obj = CoolSlug.objects.create(name=name)
self.assertEquals(obj.slug, "john")
self.assertEqual(obj.slug, "john")
#with PrintQueries("create second john"): # display the SQL queries
with self.assertNumQueries(3):
@ -92,7 +92,7 @@ class SlugUniqueTestCase(TestCase):
# 2. query: SELECT test, if slug 'john-1' exists
# 3. query: INSERT values
obj = CoolSlug.objects.create(name=name)
self.assertEquals(obj.slug, "john-1")
self.assertEqual(obj.slug, "john-1")
def test_start_no(self):
name = 'Foo Bar'
@ -102,7 +102,7 @@ class SlugUniqueTestCase(TestCase):
# 1. query: SELECT test, if slug 'foo-bar' exists
# 2. query: INSERT values
obj = AnotherSlug.objects.create(name=name)
self.assertEquals(obj.slug, "foo-bar")
self.assertEqual(obj.slug, "foo-bar")
#with PrintQueries("create second 'Foo Bar'"): # display the SQL queries
with self.assertNumQueries(3):
@ -110,7 +110,7 @@ class SlugUniqueTestCase(TestCase):
# 2. query: SELECT test, if slug 'foo-bar-2' exists
# 3. query: INSERT values
obj = AnotherSlug.objects.create(name=name)
self.assertEquals(obj.slug, "foo-bar-2")
self.assertEqual(obj.slug, "foo-bar-2")
#with PrintQueries("create third 'Foo Bar'"): # display the SQL queries
with self.assertNumQueries(4):
@ -119,31 +119,31 @@ class SlugUniqueTestCase(TestCase):
# 3. query: SELECT test, if slug 'foo-bar-3' exists
# 4. query: INSERT values
obj = AnotherSlug.objects.create(name=name)
self.assertEquals(obj.slug, "foo-bar-3")
self.assertEqual(obj.slug, "foo-bar-3")
def test_max_length(self):
name = 'jaja---lol-méméméoo--a'
obj = TruncatedSlug.objects.create(name=name)
self.assertEquals(obj.slug, "jaja-lol-mememeoo") # 17 is max_length
self.assertEqual(obj.slug, "jaja-lol-mememeoo") # 17 is max_length
obj = TruncatedSlug.objects.create(name=name)
self.assertEquals(obj.slug, "jaja-lol-mememe-2") # 17 is max_length
self.assertEqual(obj.slug, "jaja-lol-mememe-2") # 17 is max_length
obj = TruncatedSlug.objects.create(name=name)
self.assertEquals(obj.slug, "jaja-lol-mememe-3") # 17 is max_length
self.assertEqual(obj.slug, "jaja-lol-mememe-3") # 17 is max_length
def test_max_length_exact_word_boundry(self):
name = 'jaja---lol-méméméoo--a'
obj = SmartTruncatedExactWordBoundrySlug.objects.create(name=name)
self.assertEquals(obj.slug, "jaja-lol-mememeoo") # 19 is max_length
self.assertEqual(obj.slug, "jaja-lol-mememeoo") # 19 is max_length
obj = SmartTruncatedExactWordBoundrySlug.objects.create(name=name)
self.assertEquals(obj.slug, "jaja-lol-mememeoo-9") # 19 is max_length, start_no = 9
self.assertEqual(obj.slug, "jaja-lol-mememeoo-9") # 19 is max_length, start_no = 9
obj = SmartTruncatedExactWordBoundrySlug.objects.create(name=name)
self.assertEquals(obj.slug, "jaja-lol-mememeo-10") # 19 is max_length, readjust for "-10"
self.assertEqual(obj.slug, "jaja-lol-mememeo-10") # 19 is max_length, readjust for "-10"
class SlugUniqueDifferentSeparatorTestCase(TestCase):
@ -157,7 +157,7 @@ class SlugUniqueDifferentSeparatorTestCase(TestCase):
# 1. query: SELECT test, if slug 'john' exists
# 2. query: INSERT values
obj = CoolSlugDifferentSeparator.objects.create(name=name)
self.assertEquals(obj.slug, "john")
self.assertEqual(obj.slug, "john")
#with PrintQueries("create second john"): # display the SQL queries
with self.assertNumQueries(3):
@ -165,7 +165,7 @@ class SlugUniqueDifferentSeparatorTestCase(TestCase):
# 2. query: SELECT test, if slug 'john-1' exists
# 3. query: INSERT values
obj = CoolSlugDifferentSeparator.objects.create(name=name)
self.assertEquals(obj.slug, "john_1")
self.assertEqual(obj.slug, "john_1")
#with PrintQueries("create third john"): # display the SQL queries
with self.assertNumQueries(4):
@ -173,16 +173,16 @@ class SlugUniqueDifferentSeparatorTestCase(TestCase):
# 2. query: SELECT test, if slug 'john-1' exists
# 3. query: INSERT values
obj = CoolSlugDifferentSeparator.objects.create(name=name)
self.assertEquals(obj.slug, "john_2")
self.assertEqual(obj.slug, "john_2")
def test_max_length(self):
name = 'jaja---lol-méméméoo--a'
obj = TruncatedSlugDifferentSeparator.objects.create(name=name)
self.assertEquals(obj.slug, "jaja_lol_mememeoo") # 17 is max_length
self.assertEqual(obj.slug, "jaja_lol_mememeoo") # 17 is max_length
obj = TruncatedSlugDifferentSeparator.objects.create(name=name)
self.assertEquals(obj.slug, "jaja_lol_mememe_2") # 17 is max_length
self.assertEqual(obj.slug, "jaja_lol_mememe_2") # 17 is max_length
obj = TruncatedSlugDifferentSeparator.objects.create(name=name)
self.assertEquals(obj.slug, "jaja_lol_mememe_3") # 17 is max_length
self.assertEqual(obj.slug, "jaja_lol_mememe_3") # 17 is max_length