Migrating tests to pytest

tests/unit/test_decorator_combine.py

@@ -8,14 +8,12 @@
 # Copyright: (c) 2014 Igor R. Dejanović <igor DOT dejanovic AT gmail DOT com>
 # License: MIT License
 #######################################################################
-from unittest import TestCase
+import pytest
 from arpeggio import ParserPython, ZeroOrMore, OneOrMore, NonTerminal, Terminal, NoMatch, Combine
 from arpeggio.peg import ParserPEG
 
 
-class TestDecoratorCombine(TestCase):
-
-    def test_combine_python(self):
+def test_combine_python():
 
     # This will result in NonTerminal node
     def root():     return my_rule(), "."
@@ -32,13 +30,11 @@ class TestDecoratorCombine(TestCase):
 
     ptree1 = parser.parse(input1)
 
-        def fail_nm():
+    with pytest.raises(NoMatch):
         ptree2 = parser.parse(input2)
 
-        self.assertRaises(NoMatch, fail_nm)
-
-        self.assertIsInstance(ptree1, NonTerminal)
-        self.assertIsInstance(ptree1[0], Terminal)
-        self.assertEqual(ptree1[0].value, "abbb")
+    assert isinstance(ptree1, NonTerminal)
+    assert isinstance(ptree1[0], Terminal)
+    assert ptree1[0].value == "abbb"
 
 

tests/unit/test_exporter.py

@@ -7,8 +7,8 @@
 # License: MIT License
 #######################################################################
 
+import pytest
 import os
-from unittest import TestCase
 from arpeggio.export import PMDOTExporter, PTDOTExporter
 
 # Grammar
@@ -24,32 +24,30 @@ def expression(): return term, ZeroOrMore(["+", "-"], term)
 def calc():       return OneOrMore(expression), EOF
 
 
-class TestPythonParser(TestCase):
+@pytest.fixture
+def parser():
+    return ParserPython(calc)
 
-    def setUp(self):
-        """
-        Create parser
-        """
-        self.parser = ParserPython(calc)
 
-    def test_export_parser_model(self):
+def test_export_parser_model(parser):
     """
     Testing parser model export
     """
 
-        PMDOTExporter().exportFile(self.parser.parser_model,
+    PMDOTExporter().exportFile(parser.parser_model,
                             "test_exporter_parser_model.dot")
 
-        self.assertTrue(os.path.exists("test_exporter_parser_model.dot"))
+    assert os.path.exists("test_exporter_parser_model.dot")
 
 
-    def test_export_parse_tree(self):
+def test_export_parse_tree(parser):
     """
     Testing parse tree export.
     """
 
-        parse_tree = self.parser.parse("-(4-1)*5+(2+4.67)+5.89/(.2+7)")
+    parse_tree = parser.parse("-(4-1)*5+(2+4.67)+5.89/(.2+7)")
     PTDOTExporter().exportFile(parse_tree,
                                 "test_exporter_parse_tree.dot")
 
-        self.assertTrue(os.path.exists("test_exporter_parse_tree.dot"))
+    assert os.path.exists("test_exporter_parse_tree.dot")
+

tests/unit/test_parsing_expressions.py

@@ -7,13 +7,11 @@
 # License: MIT License
 #######################################################################
 
-from unittest import TestCase
+import pytest
 from arpeggio import ParserPython, ZeroOrMore, OneOrMore, NoMatch, EOF, Optional, And, Not
 from arpeggio import RegExMatch as _
 
-class TestParsingExpression(TestCase):
-
-    def test_sequence(self):
+def test_sequence():
 
     def grammar():     return ("a", "b", "c")
 
@@ -21,10 +19,10 @@ class TestParsingExpression(TestCase):
 
     parsed = parser.parse("a b c")
 
-        self.assertEqual(str(parsed), "a | b | c")
-        self.assertEqual(repr(parsed), "[  'a' [0],  'b' [2],  'c' [4] ]")
+    assert str(parsed) == "a | b | c"
+    assert repr(parsed) == "[  'a' [0],  'b' [2],  'c' [4] ]"
 
-    def test_ordered_choice(self):
+def test_ordered_choice():
 
     def grammar():     return ["a", "b", "c"], EOF
 
@@ -32,17 +30,20 @@ class TestParsingExpression(TestCase):
 
     parsed = parser.parse("b")
 
-        self.assertEqual(str(parsed), "b | ")
-        self.assertEqual(repr(parsed), "[  'b' [0], EOF [1] ]")
+    assert str(parsed) == "b | "
+    assert repr(parsed) == "[  'b' [0], EOF [1] ]"
 
     parsed = parser.parse("c")
-        self.assertEqual(str(parsed), "c | ")
-        self.assertEqual(repr(parsed), "[  'c' [0], EOF [1] ]")
+    assert str(parsed) == "c | "
+    assert repr(parsed) == "[  'c' [0], EOF [1] ]"
+
+    with pytest.raises(NoMatch):
+        parser.parse("ab")
 
-        self.assertRaises(NoMatch, lambda: parser.parse("ab"))
-        self.assertRaises(NoMatch, lambda: parser.parse("bb"))
+    with pytest.raises(NoMatch):
+        parser.parse("bb")
 
-    def test_zero_or_more(self):
+def test_zero_or_more():
 
     def grammar():     return ZeroOrMore("a"), EOF
 
@@ -50,17 +51,18 @@ class TestParsingExpression(TestCase):
 
     parsed = parser.parse("aaaaaaa")
 
-        self.assertEqual(str(parsed), "a | a | a | a | a | a | a | ")
-        self.assertEqual(repr(parsed), "[  'a' [0],  'a' [1],  'a' [2],  'a' [3],  'a' [4],  'a' [5],  'a' [6], EOF [7] ]")
+    assert str(parsed) == "a | a | a | a | a | a | a | "
+    assert repr(parsed) == "[  'a' [0],  'a' [1],  'a' [2],  'a' [3],  'a' [4],  'a' [5],  'a' [6], EOF [7] ]"
 
     parsed = parser.parse("")
 
-        self.assertEqual(str(parsed), "")
-        self.assertEqual(repr(parsed), "[ EOF [0] ]")
+    assert str(parsed) == ""
+    assert repr(parsed) == "[ EOF [0] ]"
 
-        self.assertRaises(NoMatch, lambda: parser.parse("bbb"))
+    with pytest.raises(NoMatch):
+        parser.parse("bbb")
 
-    def test_one_or_more(self):
+def test_one_or_more():
 
     def grammar():      return OneOrMore("a")
 
@@ -68,13 +70,17 @@ class TestParsingExpression(TestCase):
 
     parsed = parser.parse("aaaaaaa")
 
-        self.assertEqual(str(parsed), "a | a | a | a | a | a | a")
-        self.assertEqual(repr(parsed), "[  'a' [0],  'a' [1],  'a' [2],  'a' [3],  'a' [4],  'a' [5],  'a' [6] ]")
+    assert str(parsed) == "a | a | a | a | a | a | a"
+    assert repr(parsed) == "[  'a' [0],  'a' [1],  'a' [2],  'a' [3],  'a' [4],  'a' [5],  'a' [6] ]"
+
+
+    with pytest.raises(NoMatch):
+        parser.parse("")
 
-        self.assertRaises(NoMatch, lambda: parser.parse(""))
-        self.assertRaises(NoMatch, lambda: parser.parse("bbb"))
+    with pytest.raises(NoMatch):
+        parser.parse("bbb")
 
-    def test_optional(self):
+def test_optional():
 
     def grammar():      return Optional("a"), "b", EOF
 
@@ -82,36 +88,42 @@ class TestParsingExpression(TestCase):
 
     parsed = parser.parse("ab")
 
-        self.assertEqual(str(parsed), "a | b | ")
-        self.assertEqual(repr(parsed), "[  'a' [0],  'b' [1], EOF [2] ]")
+    assert str(parsed) == "a | b | "
+    assert repr(parsed) == "[  'a' [0],  'b' [1], EOF [2] ]"
 
     parsed = parser.parse("b")
 
-        self.assertEqual(str(parsed), "b | ")
-        self.assertEqual(repr(parsed),  "[  'b' [0], EOF [1] ]")
+    assert str(parsed) == "b | "
+    assert repr(parsed) == "[  'b' [0], EOF [1] ]"
 
-        self.assertRaises(NoMatch, lambda: parser.parse("aab"))
-        self.assertRaises(NoMatch, lambda: parser.parse(""))
+    with pytest.raises(NoMatch):
+        parser.parse("aab")
 
+    with pytest.raises(NoMatch):
+        parser.parse("")
 
-    # Syntax predicates
 
-    def test_and(self):
+# Syntax predicates
+
+def test_and():
 
     def grammar():      return "a", And("b"), ["c", "b"], EOF
 
     parser = ParserPython(grammar)
 
     parsed = parser.parse("ab")
-        self.assertEqual(str(parsed), "a | b | ")
-        self.assertEqual(repr(parsed), "[  'a' [0],  'b' [1], EOF [2] ]")
+    assert str(parsed) == "a | b | "
+    assert repr(parsed) == "[  'a' [0],  'b' [1], EOF [2] ]"
 
     # 'And' will try to match 'b' and fail so 'c' will never get matched
-        self.assertRaises(NoMatch, lambda: parser.parse("ac"))
+    with pytest.raises(NoMatch):
+        parser.parse("ac")
+
     # 'And' will not consume 'b' from the input so second 'b' will never match
-        self.assertRaises(NoMatch, lambda: parser.parse("abb"))
+    with pytest.raises(NoMatch):
+        parser.parse("abb")
 
-    def test_not(self):
+def test_not():
 
     def grammar():      return "a", Not("b"), ["b", "c"], EOF
 
@@ -119,11 +131,14 @@ class TestParsingExpression(TestCase):
 
     parsed = parser.parse("ac")
 
-        self.assertEqual(str(parsed), "a | c | ")
-        self.assertEqual(repr(parsed), "[  'a' [0],  'c' [1], EOF [2] ]")
+    assert str(parsed) == "a | c | "
+    assert repr(parsed) == "[  'a' [0],  'c' [1], EOF [2] ]"
 
     # Not will will fail on 'b'
-        self.assertRaises(NoMatch, lambda: parser.parse("ab"))
+    with pytest.raises(NoMatch):
+        parser.parse("ab")
+
     # And will not consume 'c' from the input so 'b' will never match
-        self.assertRaises(NoMatch, lambda: parser.parse("acb"))
+    with pytest.raises(NoMatch):
+        parser.parse("acb")
 

tests/unit/test_peg_parser.py

@@ -7,7 +7,7 @@
 # License: MIT License
 #######################################################################
 
-from unittest import TestCase
+import pytest
 from arpeggio import Sequence, NonTerminal
 from arpeggio.peg import ParserPEG
 
@@ -20,33 +20,32 @@ grammar = '''
     calc <- expression+ EOF;
 '''
 
-class TestPEGParser(TestCase):
-
-    def test_construct_parser(self):
+def test_construct_parser():
 
     parser = ParserPEG(grammar, 'calc')
 
-        self.assertEqual(parser.parser_model.rule ,'calc')
-        self.assertTrue(isinstance(parser.parser_model, Sequence))
-        self.assertEqual(parser.parser_model.nodes[0].name ,'OneOrMore')
+    assert parser.parser_model.rule == 'calc'
+    assert isinstance(parser.parser_model, Sequence)
+    assert parser.parser_model.nodes[0].name  == 'OneOrMore'
 
-    def test_parse_input(self):
+def test_parse_input():
 
     parser = ParserPEG(grammar, 'calc')
     input = "4+5*7/3.45*-45*(2.56+32)/-56*(2-1.34)"
     result = parser.parse(input)
 
-        self.assertTrue(isinstance(result, NonTerminal))
-        self.assertEqual(str(result), "4 | + | 5 | * | 7 | / | 3.45 | * | - | 45 | * | ( | 2.56 | + | 32 | ) | / | - | 56 | * | ( | 2 | - | 1.34 | ) | ")
-        self.assertEqual(repr(result),"[ [ [ [ number '4' [0] ] ],  '+' [1], [ [ number '5' [2] ],  '*' [3], [ number '7' [4] ],  '/' [5], [ number '3.45' [6] ],  '*' [10], [  '-' [11], number '45' [12] ],  '*' [14], [  '(' [15], [ [ [ number '2.56' [16] ] ],  '+' [20], [ [ number '32' [21] ] ] ],  ')' [23] ],  '/' [24], [  '-' [25], number '56' [26] ],  '*' [28], [  '(' [29], [ [ [ number '2' [30] ] ],  '-' [31], [ [ number '1.34' [32] ] ] ],  ')' [36] ] ] ], EOF [37] ]")
+    assert isinstance(result, NonTerminal)
+    assert str(result) == "4 | + | 5 | * | 7 | / | 3.45 | * | - | 45 | * | ( | 2.56 | + | 32 | ) | / | - | 56 | * | ( | 2 | - | 1.34 | ) | "
+    assert repr(result) == "[ [ [ [ number '4' [0] ] ],  '+' [1], [ [ number '5' [2] ],  '*' [3], [ number '7' [4] ],  '/' [5], [ number '3.45' [6] ],  '*' [10], [  '-' [11], number '45' [12] ],  '*' [14], [  '(' [15], [ [ [ number '2.56' [16] ] ],  '+' [20], [ [ number '32' [21] ] ] ],  ')' [23] ],  '/' [24], [  '-' [25], number '56' [26] ],  '*' [28], [  '(' [29], [ [ [ number '2' [30] ] ],  '-' [31], [ [ number '1.34' [32] ] ] ],  ')' [36] ] ] ], EOF [37] ]"
 
-    def test_reduce_tree(self):
+def test_reduce_tree():
 
     parser = ParserPEG(grammar, 'calc', reduce_tree=True)
     input = "4+5*7/3.45*-45*(2.56+32)/-56*(2-1.34)"
     result = parser.parse(input)
 
-        self.assertTrue(isinstance(result, NonTerminal))
+    assert isinstance(result, NonTerminal)
+
+    assert str(result) == "4 | + | 5 | * | 7 | / | 3.45 | * | - | 45 | * | ( | 2.56 | + | 32 | ) | / | - | 56 | * | ( | 2 | - | 1.34 | ) | "
+    assert repr(result) == "[ [ number '4' [0],  '+' [1], [ number '5' [2],  '*' [3], number '7' [4],  '/' [5], number '3.45' [6],  '*' [10], [  '-' [11], number '45' [12] ],  '*' [14], [  '(' [15], [ number '2.56' [16],  '+' [20], number '32' [21] ],  ')' [23] ],  '/' [24], [  '-' [25], number '56' [26] ],  '*' [28], [  '(' [29], [ number '2' [30],  '-' [31], number '1.34' [32] ],  ')' [36] ] ] ], EOF [37] ]"
 
-        self.assertEqual(str(result),"4 | + | 5 | * | 7 | / | 3.45 | * | - | 45 | * | ( | 2.56 | + | 32 | ) | / | - | 56 | * | ( | 2 | - | 1.34 | ) | ")
-        self.assertEqual(repr(result), "[ [ number '4' [0],  '+' [1], [ number '5' [2],  '*' [3], number '7' [4],  '/' [5], number '3.45' [6],  '*' [10], [  '-' [11], number '45' [12] ],  '*' [14], [  '(' [15], [ number '2.56' [16],  '+' [20], number '32' [21] ],  ')' [23] ],  '/' [24], [  '-' [25], number '56' [26] ],  '*' [28], [  '(' [29], [ number '2' [30],  '-' [31], number '1.34' [32] ],  ')' [36] ] ] ], EOF [37] ]")

tests/unit/test_python_parser.py

@@ -7,7 +7,7 @@
 # License: MIT License
 #######################################################################
 
-from unittest import TestCase
+import pytest
 
 # Grammar
 from arpeggio import Optional, ZeroOrMore, OneOrMore, EOF, ParserPython,\
@@ -23,36 +23,34 @@ def expression(): return term, ZeroOrMore(["+", "-"], term)
 def calc():       return OneOrMore(expression), EOF
 
 
-class TestPythonParser(TestCase):
-
-    def test_pp_construction(self):
+def test_pp_construction():
     '''
     Tests parser construction from python internal DSL description.
     '''
     parser = ParserPython(calc)
 
-        self.assertEqual(parser.parser_model.rule ,'calc')
-        self.assertTrue(isinstance(parser.parser_model, Sequence))
-        self.assertEqual(parser.parser_model.nodes[0].desc ,'OneOrMore')
+    assert parser.parser_model.rule == 'calc'
+    assert isinstance(parser.parser_model, Sequence)
+    assert parser.parser_model.nodes[0].desc == 'OneOrMore'
 
-    def test_parse_input(self):
+def test_parse_input():
 
     parser = ParserPython(calc)
     input = "4+5*7/3.45*-45*(2.56+32)/-56*(2-1.34)"
     result = parser.parse(input)
 
-        self.assertTrue(isinstance(result, NonTerminal))
-        self.assertEqual(str(result), "4 | + | 5 | * | 7 | / | 3.45 | * | - | 45 | * | ( | 2.56 | + | 32 | ) | / | - | 56 | * | ( | 2 | - | 1.34 | ) | ")
-        self.assertEqual(repr(result), "[ [ [ [ number '4' [0] ] ],  '+' [1], [ [ number '5' [2] ],  '*' [3], [ number '7' [4] ],  '/' [5], [ number '3.45' [6] ],  '*' [10], [  '-' [11], number '45' [12] ],  '*' [14], [  '(' [15], [ [ [ number '2.56' [16] ] ],  '+' [20], [ [ number '32' [21] ] ] ],  ')' [23] ],  '/' [24], [  '-' [25], number '56' [26] ],  '*' [28], [  '(' [29], [ [ [ number '2' [30] ] ],  '-' [31], [ [ number '1.34' [32] ] ] ],  ')' [36] ] ] ], EOF [37] ]")
+    assert isinstance(result, NonTerminal)
+    assert str(result) == "4 | + | 5 | * | 7 | / | 3.45 | * | - | 45 | * | ( | 2.56 | + | 32 | ) | / | - | 56 | * | ( | 2 | - | 1.34 | ) | "
+    assert repr(result) == "[ [ [ [ number '4' [0] ] ],  '+' [1], [ [ number '5' [2] ],  '*' [3], [ number '7' [4] ],  '/' [5], [ number '3.45' [6] ],  '*' [10], [  '-' [11], number '45' [12] ],  '*' [14], [  '(' [15], [ [ [ number '2.56' [16] ] ],  '+' [20], [ [ number '32' [21] ] ] ],  ')' [23] ],  '/' [24], [  '-' [25], number '56' [26] ],  '*' [28], [  '(' [29], [ [ [ number '2' [30] ] ],  '-' [31], [ [ number '1.34' [32] ] ] ],  ')' [36] ] ] ], EOF [37] ]"
 
-    def test_reduce_tree(self):
+def test_reduce_tree():
 
     parser = ParserPython(calc, reduce_tree=True)
     input = "4+5*7/3.45*-45*(2.56+32)/-56*(2-1.34)"
     result = parser.parse(input)
 
-        self.assertTrue(isinstance(result, NonTerminal))
+    assert isinstance(result, NonTerminal)
 
-        self.assertEqual(str(result),"4 | + | 5 | * | 7 | / | 3.45 | * | - | 45 | * | ( | 2.56 | + | 32 | ) | / | - | 56 | * | ( | 2 | - | 1.34 | ) | ")
-        self.assertEqual(repr(result), "[ [ number '4' [0],  '+' [1], [ number '5' [2],  '*' [3], number '7' [4],  '/' [5], number '3.45' [6],  '*' [10], [  '-' [11], number '45' [12] ],  '*' [14], [  '(' [15], [ number '2.56' [16],  '+' [20], number '32' [21] ],  ')' [23] ],  '/' [24], [  '-' [25], number '56' [26] ],  '*' [28], [  '(' [29], [ number '2' [30],  '-' [31], number '1.34' [32] ],  ')' [36] ] ] ], EOF [37] ]")
+    assert str(result) == "4 | + | 5 | * | 7 | / | 3.45 | * | - | 45 | * | ( | 2.56 | + | 32 | ) | / | - | 56 | * | ( | 2 | - | 1.34 | ) | "
+    assert repr(result) == "[ [ number '4' [0],  '+' [1], [ number '5' [2],  '*' [3], number '7' [4],  '/' [5], number '3.45' [6],  '*' [10], [  '-' [11], number '45' [12] ],  '*' [14], [  '(' [15], [ number '2.56' [16],  '+' [20], number '32' [21] ],  ')' [23] ],  '/' [24], [  '-' [25], number '56' [26] ],  '*' [28], [  '(' [29], [ number '2' [30],  '-' [31], number '1.34' [32] ],  ')' [36] ] ] ], EOF [37] ]"
 

tests/unit/test_rulename_lookup.py

@@ -7,7 +7,7 @@
 # License: MIT License
 #######################################################################
 
-from unittest import TestCase
+import pytest
 
 # Grammar
 from arpeggio import ParserPython, ZeroOrMore
@@ -18,16 +18,13 @@ def bar(): return "c"
 def baz(): return "d"
 
 
-
-class TestPEGParser(TestCase):
-
-    def test_lookup_single(self):
+def test_lookup_single():
 
     parser = ParserPython(foo)
 
     result = parser.parse("a c b d")
 
-        self.assertTrue(hasattr(result, "bar"))
-        self.assertTrue(hasattr(result, "baz"))
-        self.assertTrue(not hasattr(result, "unexisting"))
+    assert hasattr(result, "bar")
+    assert hasattr(result, "baz")
+    assert not hasattr(result, "unexisting")