forked from orbit-oss/flask
Use assert_true instead of assert_
assert_ is deprecated which causes annoying warnings
This commit is contained in:
Daniel Neuhäuser
parent
5b89355b1c
commit
239780be28
12 changed files with 147 additions and 144 deletions
|
|
@ -185,7 +185,7 @@ class ModuleTestCase(FlaskTestCase):
|
|||
except TemplateNotFound as e:
|
||||
self.assert_equal(e.name, 'missing.html')
|
||||
else:
|
||||
self.assert_(0, 'expected exception')
|
||||
self.assert_true(0, 'expected exception')
|
||||
|
||||
with flask.Flask(__name__).test_request_context():
|
||||
self.assert_equal(flask.render_template('nested/nested.txt'), 'I\'m nested')
|
||||
|
|
@ -201,13 +201,13 @@ class ModuleTestCase(FlaskTestCase):
|
|||
except NotFound:
|
||||
pass
|
||||
else:
|
||||
self.assert_(0, 'expected exception')
|
||||
self.assert_true(0, 'expected exception')
|
||||
try:
|
||||
f('../__init__.py')
|
||||
except NotFound:
|
||||
pass
|
||||
else:
|
||||
self.assert_(0, 'expected exception')
|
||||
self.assert_true(0, 'expected exception')
|
||||
|
||||
# testcase for a security issue that may exist on windows systems
|
||||
import os
|
||||
|
|
@ -220,7 +220,7 @@ class ModuleTestCase(FlaskTestCase):
|
|||
except NotFound:
|
||||
pass
|
||||
else:
|
||||
self.assert_(0, 'expected exception')
|
||||
self.assert_true(0, 'expected exception')
|
||||
finally:
|
||||
os.path = old_path
|
||||
|
||||
|
|
@ -380,7 +380,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
except TemplateNotFound as e:
|
||||
self.assert_equal(e.name, 'missing.html')
|
||||
else:
|
||||
self.assert_(0, 'expected exception')
|
||||
self.assert_true(0, 'expected exception')
|
||||
|
||||
with flask.Flask(__name__).test_request_context():
|
||||
self.assert_equal(flask.render_template('nested/nested.txt'), 'I\'m nested')
|
||||
|
|
@ -547,7 +547,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
return s[::-1]
|
||||
app = flask.Flask(__name__)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
self.assert_('my_reverse' in app.jinja_env.filters.keys())
|
||||
self.assert_true('my_reverse' in app.jinja_env.filters.keys())
|
||||
self.assert_equal(app.jinja_env.filters['my_reverse'], my_reverse)
|
||||
self.assert_equal(app.jinja_env.filters['my_reverse']('abcd'), 'dcba')
|
||||
|
||||
|
|
@ -558,7 +558,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
bp.add_app_template_filter(my_reverse)
|
||||
app = flask.Flask(__name__)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
self.assert_('my_reverse' in app.jinja_env.filters.keys())
|
||||
self.assert_true('my_reverse' in app.jinja_env.filters.keys())
|
||||
self.assert_equal(app.jinja_env.filters['my_reverse'], my_reverse)
|
||||
self.assert_equal(app.jinja_env.filters['my_reverse']('abcd'), 'dcba')
|
||||
|
||||
|
|
@ -569,7 +569,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
return s[::-1]
|
||||
app = flask.Flask(__name__)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
self.assert_('strrev' in app.jinja_env.filters.keys())
|
||||
self.assert_true('strrev' in app.jinja_env.filters.keys())
|
||||
self.assert_equal(app.jinja_env.filters['strrev'], my_reverse)
|
||||
self.assert_equal(app.jinja_env.filters['strrev']('abcd'), 'dcba')
|
||||
|
||||
|
|
@ -580,7 +580,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
bp.add_app_template_filter(my_reverse, 'strrev')
|
||||
app = flask.Flask(__name__)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
self.assert_('strrev' in app.jinja_env.filters.keys())
|
||||
self.assert_true('strrev' in app.jinja_env.filters.keys())
|
||||
self.assert_equal(app.jinja_env.filters['strrev'], my_reverse)
|
||||
self.assert_equal(app.jinja_env.filters['strrev']('abcd'), 'dcba')
|
||||
|
||||
|
|
@ -656,9 +656,9 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
return isinstance(value, bool)
|
||||
app = flask.Flask(__name__)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
self.assert_('is_boolean' in app.jinja_env.tests.keys())
|
||||
self.assert_true('is_boolean' in app.jinja_env.tests.keys())
|
||||
self.assert_equal(app.jinja_env.tests['is_boolean'], is_boolean)
|
||||
self.assert_(app.jinja_env.tests['is_boolean'](False))
|
||||
self.assert_true(app.jinja_env.tests['is_boolean'](False))
|
||||
|
||||
def test_add_template_test(self):
|
||||
bp = flask.Blueprint('bp', __name__)
|
||||
|
|
@ -667,9 +667,9 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
bp.add_app_template_test(is_boolean)
|
||||
app = flask.Flask(__name__)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
self.assert_('is_boolean' in app.jinja_env.tests.keys())
|
||||
self.assert_true('is_boolean' in app.jinja_env.tests.keys())
|
||||
self.assert_equal(app.jinja_env.tests['is_boolean'], is_boolean)
|
||||
self.assert_(app.jinja_env.tests['is_boolean'](False))
|
||||
self.assert_true(app.jinja_env.tests['is_boolean'](False))
|
||||
|
||||
def test_template_test_with_name(self):
|
||||
bp = flask.Blueprint('bp', __name__)
|
||||
|
|
@ -678,9 +678,9 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
return isinstance(value, bool)
|
||||
app = flask.Flask(__name__)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
self.assert_('boolean' in app.jinja_env.tests.keys())
|
||||
self.assert_true('boolean' in app.jinja_env.tests.keys())
|
||||
self.assert_equal(app.jinja_env.tests['boolean'], is_boolean)
|
||||
self.assert_(app.jinja_env.tests['boolean'](False))
|
||||
self.assert_true(app.jinja_env.tests['boolean'](False))
|
||||
|
||||
def test_add_template_test_with_name(self):
|
||||
bp = flask.Blueprint('bp', __name__)
|
||||
|
|
@ -689,9 +689,9 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
bp.add_app_template_test(is_boolean, 'boolean')
|
||||
app = flask.Flask(__name__)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
self.assert_('boolean' in app.jinja_env.tests.keys())
|
||||
self.assert_true('boolean' in app.jinja_env.tests.keys())
|
||||
self.assert_equal(app.jinja_env.tests['boolean'], is_boolean)
|
||||
self.assert_(app.jinja_env.tests['boolean'](False))
|
||||
self.assert_true(app.jinja_env.tests['boolean'](False))
|
||||
|
||||
def test_template_test_with_template(self):
|
||||
bp = flask.Blueprint('bp', __name__)
|
||||
|
|
@ -704,7 +704,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
def index():
|
||||
return flask.render_template('template_test.html', value=False)
|
||||
rv = app.test_client().get('/')
|
||||
self.assert_(b'Success!' in rv.data)
|
||||
self.assert_true(b'Success!' in rv.data)
|
||||
|
||||
def test_template_test_after_route_with_template(self):
|
||||
app = flask.Flask(__name__)
|
||||
|
|
@ -717,7 +717,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
return isinstance(value, bool)
|
||||
app.register_blueprint(bp, url_prefix='/py')
|
||||
rv = app.test_client().get('/')
|
||||
self.assert_(b'Success!' in rv.data)
|
||||
self.assert_true(b'Success!' in rv.data)
|
||||
|
||||
def test_add_template_test_with_template(self):
|
||||
bp = flask.Blueprint('bp', __name__)
|
||||
|
|
@ -730,7 +730,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
def index():
|
||||
return flask.render_template('template_test.html', value=False)
|
||||
rv = app.test_client().get('/')
|
||||
self.assert_(b'Success!' in rv.data)
|
||||
self.assert_true(b'Success!' in rv.data)
|
||||
|
||||
def test_template_test_with_name_and_template(self):
|
||||
bp = flask.Blueprint('bp', __name__)
|
||||
|
|
@ -743,7 +743,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
def index():
|
||||
return flask.render_template('template_test.html', value=False)
|
||||
rv = app.test_client().get('/')
|
||||
self.assert_(b'Success!' in rv.data)
|
||||
self.assert_true(b'Success!' in rv.data)
|
||||
|
||||
def test_add_template_test_with_name_and_template(self):
|
||||
bp = flask.Blueprint('bp', __name__)
|
||||
|
|
@ -756,7 +756,7 @@ class BlueprintTestCase(FlaskTestCase):
|
|||
def index():
|
||||
return flask.render_template('template_test.html', value=False)
|
||||
rv = app.test_client().get('/')
|
||||
self.assert_(b'Success!' in rv.data)
|
||||
self.assert_true(b'Success!' in rv.data)
|
||||
|
||||
def suite():
|
||||
suite = unittest.TestSuite()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue