def test_fontinfo_invalid_familyname4(self):
- with self.assertRaises(AttributeError):
- FontInfo("SERIF", None, 11)
+ FontInfo("SERIF", None, 11)
+ @assertRaises(TypeError)
def test_fontinfo_invalid_fontsize1(self):
- with self.assertRaises(TypeError):
- FontInfo("serif", None, None)
+ FontInfo("serif", None, None)
+ @assertRaises(ValueError)
def test_fontinfo_invalid_familyname4(self):
- with self.assertRaises(AttributeError):
- FontInfo("cursive-bold-bold", None, 11)
+ FontInfo("cursive-bold-bold", None, 11)
+ @assertRaises(AttributeError)
def test_fontinfo_invalid_familyname3(self):
- with self.assertRaises(AttributeError):
- FontInfo("monospace-unkown", None, 11)
+ FontInfo("monospace-unkown", None, 11)
+ @assertRaises(AttributeError)
def test_fontinfo_invalid_familyname2(self):
- with self.assertRaises(AttributeError):
- FontInfo("sansserif-", None, 11)
+ FontInfo("sansserif-", None, 11)
+ @assertRaises(AttributeError)
--- src/blockdiag/tests/test_utils_fontmap.py.orig 2011-11-21 02:38:58.000000000 +0000
+++ src/blockdiag/tests/test_utils_fontmap.py
@@ -3,7 +3,7 @@
import os
import sys
import unittest2
-from utils import stderr_wrapper
+from utils import stderr_wrapper, assertRaises
from cStringIO import StringIO
from blockdiag.utils.collections import namedtuple
from blockdiag.utils.fontmap import FontInfo, FontMap
@@ -31,33 +31,33 @@ class TestUtilsFontmap(unittest2.TestCas
FontInfo("my-cursive", None, 11)
FontInfo("-fantasy", None, 11)
+ @assertRaises(AttributeError)
def test_fontinfo_invalid_familyname1(self):
- with self.assertRaises(AttributeError):
- FontInfo("unknown", None, 11)
+ FontInfo("unknown", None, 11)
+ @assertRaises(AttributeError)
def test_fontinfo_invalid_familyname2(self):
- with self.assertRaises(AttributeError):
- FontInfo("sansserif-", None, 11)
+ FontInfo("sansserif-", None, 11)
+ @assertRaises(AttributeError)
def test_fontinfo_invalid_familyname3(self):
- with self.assertRaises(AttributeError):
- FontInfo("monospace-unkown", None, 11)
--- src/blockdiag/tests/test_rst_directives.py.orig 2011-11-21 02:41:13.000000000 +0000
+++ src/blockdiag/tests/test_rst_directives.py
@@ -5,7 +5,7 @@ import os
import sys
import tempfile
import unittest2
-from utils import stderr_wrapper
+from utils import stderr_wrapper, assertRaises
from docutils import nodes
from docutils.core import publish_doctree
from docutils.parsers.rst import directives as docutils
@@ -150,20 +150,20 @@ class TestRstDirectives(unittest2.TestCa
self.assertFalse('target' in doctree[0])
@use_tmpdir
+ @assertRaises(RuntimeError)
def test_rst_directives_with_block_fontpath1(self, path):
- with self.assertRaises(RuntimeError):
- directives.setup(format='SVG', fontpath=['dummy.ttf'],
- outputdir=path)
- text = ".. blockdiag::\n :alt: hello world\n\n { A -> B }"
- doctree = publish_doctree(text)
+ directives.setup(format='SVG', fontpath=['dummy.ttf'],
+ outputdir=path)
+ text = ".. blockdiag::\n :alt: hello world\n\n { A -> B }"
+ doctree = publish_doctree(text)
@use_tmpdir
+ @assertRaises(RuntimeError)
def test_rst_directives_with_block_fontpath2(self, path):
- with self.assertRaises(RuntimeError):
