Remove use of utest.py module from test_ptl, use py.test.
This commit is contained in:
parent
d955d01d2f
commit
079b9b11d3
|
@ -1,5 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
from quixote.test.utest import UTest
|
||||
from quixote.ptl.ptl_compile import compile_template
|
||||
from io import StringIO
|
||||
from quixote.html import TemplateIO, htmltext, _q_join, _q_format
|
||||
|
@ -24,11 +23,9 @@ def run_ptl(*source):
|
|||
dict(_q_TemplateIO=TemplateIO, _q_htmltext=htmltext,
|
||||
_q_join=_q_join, _q_format=_q_format))
|
||||
|
||||
class Test (UTest):
|
||||
|
||||
def check_html(self):
|
||||
def test_html():
|
||||
run_ptl(
|
||||
'from quixote.html import htmltext',
|
||||
'from ptl import htmltext',
|
||||
'def f [html] (a):',
|
||||
' "&"',
|
||||
' a',
|
||||
|
@ -37,9 +34,9 @@ class Test (UTest):
|
|||
'assert f("&") == "&&"',
|
||||
'assert f(htmltext("&")) == "&&"')
|
||||
|
||||
def check_plain(self):
|
||||
def test_plain():
|
||||
run_ptl(
|
||||
'from quixote.html import htmltext',
|
||||
'from ptl import htmltext',
|
||||
'def f [plain] (a):',
|
||||
' "&"',
|
||||
' a',
|
||||
|
@ -49,7 +46,7 @@ class Test (UTest):
|
|||
'assert f(htmltext("&")) == "&&"',
|
||||
'assert type(f(htmltext("&"))) == str')
|
||||
|
||||
def check_syntax(self):
|
||||
def test_syntax():
|
||||
run_ptl('def f(a):\n a')
|
||||
try:
|
||||
run_ptl('def f [] (a):\n a')
|
||||
|
@ -63,21 +60,21 @@ class Test (UTest):
|
|||
assert e.lineno == 1
|
||||
|
||||
|
||||
if HAVE_FSTRINGS:
|
||||
def check_fstring(self):
|
||||
if HAVE_FSTRINGS:
|
||||
def test_fstring():
|
||||
run_ptl(
|
||||
'from quixote.html import htmltext',
|
||||
'from ptl import htmltext',
|
||||
'def f [html] (a):',
|
||||
' f"x{a}"',
|
||||
'assert type(f(1)) == htmltext',
|
||||
'assert f("&") == "x&"',
|
||||
'assert f(htmltext("&")) == "x&"')
|
||||
|
||||
def check_q_join(self):
|
||||
def test_q_join():
|
||||
assert _q_join('x', '&') == 'x&'
|
||||
assert _q_join('x', htmltext('&')) == 'x&'
|
||||
|
||||
def check_q_format(self):
|
||||
def test_q_format():
|
||||
assert _q_format('&') == '&'
|
||||
assert _q_format(htmltext('&')) == '&'
|
||||
assert _q_format('a', ord('r')) == "'a'"
|
||||
|
@ -89,8 +86,6 @@ class Test (UTest):
|
|||
assert _q_format(38, -1, 'c') == '&'
|
||||
|
||||
|
||||
def test_all():
|
||||
Test()
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_all()
|
||||
import pytest
|
||||
pytest.main([__file__])
|
||||
|
|
Loading…
Reference in New Issue