Skip to content

Commit cd14104

Browse files
cyberdeliacyberdelia
committed
Improve tests
1 parent b68d46e commit cd14104

File tree

3 files changed

+45
-42
lines changed

3 files changed

+45
-42
lines changed

‎tests/tests/test_compressor.py

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
from __future__ import unicode_literals
33

44
import base64
5-
import os
65
import io
6+
import os
7+
import sys
78

89
try:
910
from mock import patch
1011
except ImportError:
1112
from unittest.mock import patch # noqa
1213

14+
from unittest import skipIf
15+
1316
from django.test import TestCase
1417

1518
from pipeline.compressors import Compressor, TEMPLATE_FUNC, \
@@ -74,32 +77,32 @@ def test_base_path(self):
7477
self.assertEqual(base_path, _('js/templates'))
7578

7679
def test_absolute_path(self):
77-
absolute_path = self.compressor.absolute_path('../../images/sprite.png',
78-
'css/plugins/')
80+
absolute_path = self.compressor.absolute_path(
81+
'../../images/sprite.png', 'css/plugins/')
7982
self.assertEqual(absolute_path, 'images/sprite.png')
80-
absolute_path = self.compressor.absolute_path('/images/sprite.png',
81-
'css/plugins/')
83+
absolute_path = self.compressor.absolute_path(
84+
'/images/sprite.png', 'css/plugins/')
8285
self.assertEqual(absolute_path, '/images/sprite.png')
8386

8487
def test_template_name(self):
85-
name = self.compressor.template_name('templates/photo/detail.jst',
86-
'templates/')
88+
name = self.compressor.template_name(
89+
'templates/photo/detail.jst', 'templates/')
8790
self.assertEqual(name, 'photo_detail')
8891
name = self.compressor.template_name('templates/photo_edit.jst', '')
8992
self.assertEqual(name, 'photo_edit')
90-
name = self.compressor.template_name('templates\photo\detail.jst',
91-
'templates\\')
93+
name = self.compressor.template_name(
94+
'templates\photo\detail.jst', 'templates\\')
9295
self.assertEqual(name, 'photo_detail')
9396

9497
@pipeline_settings(TEMPLATE_SEPARATOR='/')
9598
def test_template_name_separator(self):
96-
name = self.compressor.template_name('templates/photo/detail.jst',
97-
'templates/')
99+
name = self.compressor.template_name(
100+
'templates/photo/detail.jst', 'templates/')
98101
self.assertEqual(name, 'photo/detail')
99102
name = self.compressor.template_name('templates/photo_edit.jst', '')
100103
self.assertEqual(name, 'photo_edit')
101-
name = self.compressor.template_name('templates\photo\detail.jst',
102-
'templates\\')
104+
name = self.compressor.template_name(
105+
'templates\photo\detail.jst', 'templates\\')
103106
self.assertEqual(name, 'photo/detail')
104107

105108
def test_compile_templates(self):
@@ -118,11 +121,11 @@ def test_embeddable(self):
118121
self.assertFalse(self.compressor.embeddable(_('pipeline/images/arrow.dat'), 'datauri'))
119122

120123
def test_construct_asset_path(self):
121-
asset_path = self.compressor.construct_asset_path("../../images/sprite.png",
122-
"css/plugins/gallery.css", "css/gallery.css")
124+
asset_path = self.compressor.construct_asset_path(
125+
"../../images/sprite.png", "css/plugins/gallery.css", "css/gallery.css")
123126
self.assertEqual(asset_path, "../images/sprite.png")
124-
asset_path = self.compressor.construct_asset_path("/images/sprite.png",
125-
"css/plugins/gallery.css", "css/gallery.css")
127+
asset_path = self.compressor.construct_asset_path(
128+
"/images/sprite.png", "css/plugins/gallery.css", "css/gallery.css")
126129
self.assertEqual(asset_path, "/images/sprite.png")
127130

128131
def test_url_rewrite(self):
@@ -170,6 +173,7 @@ def test_url_rewrite_data_uri(self):
170173
}
171174
""", output)
172175

176+
@skipIf(sys.platform.startswith("win"), "requires posix platform")
173177
def test_compressor_subprocess_unicode(self):
174178
path = os.path.dirname(os.path.dirname(__file__))
175179
content = io.open(path + '/assets/css/unicode.css', encoding="utf-8").read()

‎tests/tests/test_glob.py

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,48 +52,47 @@ def tearDown(self):
5252
glob.staticfiles_storage = self.old_storage
5353

5454
def test_glob_literal(self):
55-
self.assertSequenceEqual(self.glob('a'),
56-
[self.normpath('a')])
57-
self.assertSequenceEqual(self.glob('a', 'D'),
58-
[self.normpath('a', 'D')])
59-
self.assertSequenceEqual(self.glob('aab'),
60-
[self.normpath('aab')])
55+
self.assertSequenceEqual(self.glob('a'), [self.normpath('a')])
56+
self.assertSequenceEqual(self.glob('a', 'D'), [self.normpath('a', 'D')])
57+
self.assertSequenceEqual(self.glob('aab'), [self.normpath('aab')])
6158
self.assertSequenceEqual(self.glob('zymurgy'), [])
6259

6360
def test_glob_one_directory(self):
64-
self.assertSequenceEqual(self.glob('a*'),
65-
map(self.normpath, ['a', 'aab', 'aaa']))
66-
self.assertSequenceEqual(self.glob('*a'),
67-
map(self.normpath, ['a', 'aaa']))
68-
self.assertSequenceEqual(self.glob('aa?'),
69-
map(self.normpath, ['aaa', 'aab']))
70-
self.assertSequenceEqual(self.glob('aa[ab]'),
71-
map(self.normpath, ['aaa', 'aab']))
61+
self.assertSequenceEqual(
62+
self.glob('a*'), map(self.normpath, ['a', 'aab', 'aaa']))
63+
self.assertSequenceEqual(
64+
self.glob('*a'), map(self.normpath, ['a', 'aaa']))
65+
self.assertSequenceEqual(
66+
self.glob('aa?'), map(self.normpath, ['aaa', 'aab']))
67+
self.assertSequenceEqual(
68+
self.glob('aa[ab]'), map(self.normpath, ['aaa', 'aab']))
7269
self.assertSequenceEqual(self.glob('*q'), [])
7370

7471
def test_glob_nested_directory(self):
7572
if os.path.normcase("abCD") == "abCD":
7673
# case-sensitive filesystem
77-
self.assertSequenceEqual(self.glob('a', 'bcd', 'E*'),
78-
[self.normpath('a', 'bcd', 'EF')])
74+
self.assertSequenceEqual(
75+
self.glob('a', 'bcd', 'E*'), [self.normpath('a', 'bcd', 'EF')])
7976
else:
8077
# case insensitive filesystem
8178
self.assertSequenceEqual(self.glob('a', 'bcd', 'E*'), [
8279
self.normpath('a', 'bcd', 'EF'),
8380
self.normpath('a', 'bcd', 'efg')
8481
])
85-
self.assertSequenceEqual(self.glob('a', 'bcd', '*g'),
86-
[self.normpath('a', 'bcd', 'efg')])
82+
self.assertSequenceEqual(
83+
self.glob('a', 'bcd', '*g'), [self.normpath('a', 'bcd', 'efg')])
8784

8885
def test_glob_directory_names(self):
89-
self.assertSequenceEqual(self.glob('*', 'D'),
90-
[self.normpath('a', 'D')])
86+
self.assertSequenceEqual(
87+
self.glob('*', 'D'), [self.normpath('a', 'D')])
9188
self.assertSequenceEqual(self.glob('*', '*a'), [])
92-
self.assertSequenceEqual(self.glob('a', '*', '*', '*a'),
93-
[self.normpath('a', 'bcd', 'efg', 'ha')])
94-
self.assertSequenceEqual(self.glob('?a?', '*F'),
89+
self.assertSequenceEqual(
90+
self.glob('a', '*', '*', '*a'),
91+
[self.normpath('a', 'bcd', 'efg', 'ha')])
92+
self.assertSequenceEqual(
93+
self.glob('?a?', '*F'),
9594
map(self.normpath, [os.path.join('aaa', 'zzzF'),
96-
os.path.join('aab', 'F')]))
95+
os.path.join('aab', 'F')]))
9796

9897
def test_glob_directory_with_trailing_slash(self):
9998
# We are verifying that when there is wildcard pattern which

‎tests/tests/test_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class JinjaTest(TestCase):
1515
def setUp(self):
1616
self.env = Environment(extensions=[PipelineExtension],
17-
loader=PackageLoader('pipeline', 'templates'))
17+
loader=PackageLoader('pipeline', 'templates'))
1818

1919
def test_no_package(self):
2020
template = self.env.from_string(u"""{% stylesheet "unknow" %}""")

0 commit comments

Comments
 (0)