diff --git a/tests/test_argument.py b/tests/test_argument.py index ae5ae62..3a959b6 100644 --- a/tests/test_argument.py +++ b/tests/test_argument.py @@ -41,16 +41,11 @@ class TestArgument(TreeEqualityTestCase): def test_strip(self): """test Argument.__strip__()""" node = Argument(wrap([Text("foobar")])) - self.assertIs(None, node.__strip__(True, True)) - self.assertIs(None, node.__strip__(True, False)) - self.assertIs(None, node.__strip__(False, True)) - self.assertIs(None, node.__strip__(False, False)) - node2 = Argument(wrap([Text("foo")]), wrap([Text("bar")])) - self.assertEqual("bar", node2.__strip__(True, True)) - self.assertEqual("bar", node2.__strip__(True, False)) - self.assertEqual("bar", node2.__strip__(False, True)) - self.assertEqual("bar", node2.__strip__(False, False)) + for a in (True, False): + for b in (True, False): + self.assertIs(None, node.__strip__(a, b)) + self.assertEqual("bar", node2.__strip__(a, b)) def test_showtree(self): """test Argument.__showtree__()""" diff --git a/tests/test_comment.py b/tests/test_comment.py index 980f594..a7a3c4d 100644 --- a/tests/test_comment.py +++ b/tests/test_comment.py @@ -39,10 +39,9 @@ class TestComment(TreeEqualityTestCase): def test_strip(self): """test Comment.__strip__()""" node = Comment("foobar") - self.assertIs(None, node.__strip__(True, True)) - self.assertIs(None, node.__strip__(True, False)) - self.assertIs(None, node.__strip__(False, True)) - self.assertIs(None, node.__strip__(False, False)) + for a in (True, False): + for b in (True, False): + self.assertIs(None, node.__strip__(a, b)) def test_showtree(self): """test Comment.__showtree__()""" diff --git a/tests/test_heading.py b/tests/test_heading.py index 88603a8..79b0ebf 100644 --- a/tests/test_heading.py +++ b/tests/test_heading.py @@ -41,10 +41,9 @@ class TestHeading(TreeEqualityTestCase): def test_strip(self): """test Heading.__strip__()""" node = Heading(wrap([Text("foobar")]), 3) - self.assertEqual("foobar", node.__strip__(True, True)) - self.assertEqual("foobar", node.__strip__(True, False)) - self.assertEqual("foobar", node.__strip__(False, True)) - self.assertEqual("foobar", node.__strip__(False, False)) + for a in (True, False): + for b in (True, False): + self.assertEqual("foobar", node.__strip__(a, b)) def test_showtree(self): """test Heading.__showtree__()""" diff --git a/tests/test_html_entity.py b/tests/test_html_entity.py index b6b4394..d3d23bf 100644 --- a/tests/test_html_entity.py +++ b/tests/test_html_entity.py @@ -47,19 +47,13 @@ class TestHTMLEntity(TreeEqualityTestCase): node1 = HTMLEntity("nbsp", named=True, hexadecimal=False) node2 = HTMLEntity("107", named=False, hexadecimal=False) node3 = HTMLEntity("e9", named=False, hexadecimal=True) - - self.assertEqual("\xa0", node1.__strip__(True, True)) - self.assertEqual("\xa0", node1.__strip__(True, False)) - self.assertEqual(" ", node1.__strip__(False, True)) - self.assertEqual(" ", node1.__strip__(False, False)) - self.assertEqual("k", node2.__strip__(True, True)) - self.assertEqual("k", node2.__strip__(True, False)) - self.assertEqual("k", node2.__strip__(False, True)) - self.assertEqual("k", node2.__strip__(False, False)) - self.assertEqual("é", node3.__strip__(True, True)) - self.assertEqual("é", node3.__strip__(True, False)) - self.assertEqual("é", node3.__strip__(False, True)) - self.assertEqual("é", node3.__strip__(False, False)) + for a in (True, False): + self.assertEqual("\xa0", node1.__strip__(True, a)) + self.assertEqual(" ", node1.__strip__(False, a)) + self.assertEqual("k", node2.__strip__(True, a)) + self.assertEqual("k", node2.__strip__(False, a)) + self.assertEqual("é", node3.__strip__(True, a)) + self.assertEqual("é", node3.__strip__(False, a)) def test_showtree(self): """test HTMLEntity.__showtree__()""" diff --git a/tests/test_text.py b/tests/test_text.py index 13636bf..f3649dd 100644 --- a/tests/test_text.py +++ b/tests/test_text.py @@ -39,10 +39,9 @@ class TestText(unittest.TestCase): def test_strip(self): """test Text.__strip__()""" node = Text("foobar") - self.assertIs(node, node.__strip__(True, True)) - self.assertIs(node, node.__strip__(True, False)) - self.assertIs(node, node.__strip__(False, True)) - self.assertIs(node, node.__strip__(False, False)) + for a in (True, False): + for b in (True, False): + self.assertIs(node, node.__strip__(a, b)) def test_showtree(self): """test Text.__showtree__()""" diff --git a/tests/test_wikilink.py b/tests/test_wikilink.py index 7c02744..09ca5b3 100644 --- a/tests/test_wikilink.py +++ b/tests/test_wikilink.py @@ -41,16 +41,11 @@ class TestWikilink(TreeEqualityTestCase): def test_strip(self): """test Wikilink.__strip__()""" node = Wikilink(wrap([Text("foobar")])) - self.assertEqual("foobar", node.__strip__(True, True)) - self.assertEqual("foobar", node.__strip__(True, False)) - self.assertEqual("foobar", node.__strip__(False, True)) - self.assertEqual("foobar", node.__strip__(False, False)) - node2 = Wikilink(wrap([Text("foo")]), wrap([Text("bar")])) - self.assertEqual("bar", node2.__strip__(True, True)) - self.assertEqual("bar", node2.__strip__(True, False)) - self.assertEqual("bar", node2.__strip__(False, True)) - self.assertEqual("bar", node2.__strip__(False, False)) + for a in (True, False): + for b in (True, False): + self.assertEqual("foobar", node.__strip__(a, b)) + self.assertEqual("bar", node2.__strip__(a, b)) def test_showtree(self): """test Wikilink.__showtree__()"""