From 7ed68a50b1379a8d8265ff76292ed0620d2a45e5 Mon Sep 17 00:00:00 2001 From: Alexis Roda Date: Wed, 7 Aug 2019 02:05:14 +0200 Subject: Fix issue 11. --- tests/test_parser.py | 23 +++++++++++++++++++++++ tests/test_z80count.py | 21 +++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 tests/test_z80count.py (limited to 'tests') diff --git a/tests/test_parser.py b/tests/test_parser.py index 3153415..b6ab468 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -918,6 +918,10 @@ def test_lookup(instruction, cycles, parser_table): assert entry["cycles"] == cycles, "Failed: {} expected '{}' != found '{}'".format(instruction, cycles, entry["cycles"]) +########################################################################## +# _extract_mnemonic # +########################################################################## + @pytest.mark.parametrize("line,operator", ( ("foo: LD A, 1 ; load accumulator", "LD"), ("foo: CALL 0xABCD", "CALL"), @@ -935,3 +939,22 @@ def test_extract_mnemonic(line, operator): def test_extract_mnemonic_normalizes_operator(): assert Parser._extract_mnemonic("call 0xabcd") == "CALL" + + +########################################################################## +# _remove_label # +########################################################################## + +@pytest.mark.parametrize("line,expected", ( + ("foo: ld A, 1 ; load accumulator", "ld A, 1 ; load accumulator"), + ("foo: CALL 0xABCD", "CALL 0xABCD"), + ("foo: EI", "EI"), + ("LD A, 1 ; load accumulator", "LD A, 1 ; load accumulator"), + ("call 0xABCE", "call 0xABCE"), + ("EI", "EI"), + ("foo: ; some label", None), + ("foo:", None), + ("; some comment", None), +)) +def test_remove_label(line, expected): + assert Parser._remove_label(line) == expected diff --git a/tests/test_z80count.py b/tests/test_z80count.py new file mode 100644 index 0000000..c816359 --- /dev/null +++ b/tests/test_z80count.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- + +import pytest + +from z80count.z80count import Parser +from z80count.z80count import z80count + + +@pytest.mark.parametrize("line,expected", ( + ("PLY_InterruptionOn: call PLY_Init", + "PLY_InterruptionOn: call PLY_Init ; [17]\n"), + ("PLY_ReplayFrequency:\tld de,0", + "PLY_ReplayFrequency:\tld de,0 ; [10]\n"), + +)) +def test_issue_11(line, expected): + parser = Parser() + output, _ = z80count(line, parser, total=0, subt=False, + no_update=True, column=1, use_tabs=False, + tab_width=4, debug=False) + assert output == expected -- cgit v1.2.3