Skip to content

Commit e0e4a4e

Browse files
committed
Simplified tests using fixtures
1 parent cdec0cd commit e0e4a4e

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

tests/test_parser.py

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
1-
from pathlib import Path
1+
import pytest
22

3+
from pathlib import Path
34
from hdltools.hdl_reader import HDLReader
45
from hdltools.mod_parser import ModParser
56

67

7-
def get_vlog():
8+
@pytest.fixture
9+
def vobj():
810
filepath = Path(__file__).parent.resolve() / 'hdl' / 'modules.sv'
911
reader = HDLReader()
1012
reader.read_file(filepath)
11-
return reader.get_code()
13+
parser = ModParser(reader.get_code())
14+
parser.parse()
15+
return parser
1216

1317

14-
def test_modules():
15-
vobj = ModParser(get_vlog())
16-
vobj.parse()
18+
def test_modules(vobj):
1719
modules = vobj.get_modules()
1820
assert len(modules) == 3
1921

2022

21-
def test_empty():
22-
vobj = ModParser(get_vlog())
23-
vobj.parse()
23+
def test_empty(vobj):
2424
module = vobj.get_module('mod_empty')
2525
assert module == {}
2626

2727

28-
def test_params():
29-
vobj = ModParser(get_vlog())
30-
vobj.parse()
28+
def test_params(vobj):
3129
module = vobj.get_module('mod_param')
3230
assert 'params' in module
3331
params = {}
@@ -42,9 +40,7 @@ def test_params():
4240
assert module["params"] == params
4341

4442

45-
def test_ports():
46-
vobj = ModParser(get_vlog())
47-
vobj.parse()
43+
def test_ports(vobj):
4844
module = vobj.get_module('mod_param')
4945
assert 'ports' in module
5046
ports = {

tests/test_reader.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
from pathlib import Path
1+
import pytest
22

3+
from pathlib import Path
34
from hdltools.hdl_reader import HDLReader
45

5-
vfile = Path(__file__).parent.resolve() / 'hdl' / 'modules.sv'
66

7-
8-
def test_comments():
7+
@pytest.fixture
8+
def vcode():
9+
vfile = Path(__file__).parent.resolve() / 'hdl' / 'modules.sv'
910
vobj = HDLReader()
1011
vobj.read_file(vfile)
11-
vcode = vobj.get_code()
12+
return vobj.get_code()
13+
14+
15+
def test_comments(vcode):
1216
comment_patterns = ['//', '/*', '*/', '--']
1317
assert not any(pattern in vcode for pattern in comment_patterns)
1418

1519

16-
def test_spaces():
17-
vobj = HDLReader()
18-
vobj.read_file(vfile)
19-
vcode = vobj.get_code()
20+
def test_spaces(vcode):
2021
assert '\n' not in vcode
2122
assert ' ' not in vcode

0 commit comments

Comments
 (0)