Skip to content

Clean up test assertions #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s-t-e-v-e-n-k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clean up test assertions #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions src/actdiag/tests/test_rst_directives.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ def test_setup(self):
self.assertEqual(directives.ActdiagDirective,
docutils._directives['actdiag'])
self.assertEqual('PNG', options['format'])
self.assertEqual(False, options['antialias'])
self.assertEqual(None, options['fontpath'])
self.assertEqual(False, options['nodoctype'])
self.assertEqual(False, options['noviewbox'])
self.assertEqual(False, options['inline_svg'])
self.assertFalse(options['antialias'])
self.assertIsNone(options['fontpath'])
self.assertFalse(options['nodoctype'])
self.assertFalse(options['noviewbox'])
self.assertFalse(options['inline_svg'])

def test_setup_with_args(self):
directives.setup(format='SVG', antialias=True, fontpath='/dev/null',
Expand All @@ -62,11 +62,11 @@ def test_setup_with_args(self):
self.assertEqual(directives.ActdiagDirective,
docutils._directives['actdiag'])
self.assertEqual('SVG', options['format'])
self.assertEqual(True, options['antialias'])
self.assertTrue(options['antialias'])
self.assertEqual('/dev/null', options['fontpath'])
self.assertEqual(True, options['nodoctype'])
self.assertEqual(True, options['noviewbox'])
self.assertEqual(True, options['inline_svg'])
self.assertTrue(options['nodoctype'])
self.assertTrue(options['noviewbox'])
self.assertTrue(options['inline_svg'])

@capture_stderr
def test_cleanup(self):
Expand Down Expand Up @@ -131,7 +131,7 @@ def test_setup_noviewbox_is_true(self):
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.image, type(doctree[0]))
svg = open(doctree[0]['uri']).read()
self.assertRegexpMatches(svg, r'<svg height="\d+" width="\d+" ')
self.assertRegex(svg, r'<svg height="\d+" width="\d+" ')

def test_setup_noviewbox_is_false(self):
directives.setup(format='SVG', outputdir=self.tmpdir, noviewbox=False)
Expand All @@ -142,7 +142,7 @@ def test_setup_noviewbox_is_false(self):
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.image, type(doctree[0]))
svg = open(doctree[0]['uri']).read()
self.assertRegexpMatches(svg, r'<svg viewBox="0 0 \d+ \d+" ')
self.assertRegex(svg, r'<svg viewBox="0 0 \d+ \d+" ')

def test_setup_inline_svg_is_true(self):
directives.setup(format='SVG', outputdir=self.tmpdir, inline_svg=True)
Expand Down Expand Up @@ -189,8 +189,7 @@ def test_setup_inline_svg_is_true_and_width_option1(self):
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
r'<svg height="\d+" width="100" ')
self.assertRegex(doctree[0][0], r'<svg height="\d+" width="100" ')

def test_setup_inline_svg_is_true_and_width_option2(self):
directives.setup(format='SVG', outputdir=self.tmpdir,
Expand All @@ -203,8 +202,7 @@ def test_setup_inline_svg_is_true_and_width_option2(self):
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
r'<svg height="\d+" width="10000" ')
self.assertRegex(doctree[0][0], r'<svg height="\d+" width="10000" ')

def test_setup_inline_svg_is_true_and_height_option1(self):
directives.setup(format='SVG', outputdir=self.tmpdir,
Expand All @@ -217,8 +215,7 @@ def test_setup_inline_svg_is_true_and_height_option1(self):
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
r'<svg height="100" width="\d+" ')
self.assertRegex(doctree[0][0], r'<svg height="100" width="\d+" ')

def test_setup_inline_svg_is_true_and_height_option2(self):
directives.setup(format='SVG', outputdir=self.tmpdir,
Expand All @@ -231,8 +228,7 @@ def test_setup_inline_svg_is_true_and_height_option2(self):
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
r'<svg height="10000" width="\d+" ')
self.assertRegex(doctree[0][0], r'<svg height="10000" width="\d+" ')

def test_setup_inline_svg_is_true_and_width_and_height_option(self):
directives.setup(format='SVG', outputdir=self.tmpdir,
Expand All @@ -246,8 +242,7 @@ def test_setup_inline_svg_is_true_and_width_and_height_option(self):
self.assertEqual(1, len(doctree))
self.assertEqual(nodes.raw, type(doctree[0]))
self.assertEqual(nodes.Text, type(doctree[0][0]))
self.assertRegexpMatches(doctree[0][0],
'<svg height="100" width="200" ')
self.assertRegex(doctree[0][0], '<svg height="100" width="200" ')

def test_call_with_braces(self):
directives.setup(format='SVG', outputdir=self.tmpdir)
Expand Down