diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 3c918c7..0df6e30 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -52,7 +52,6 @@ We use basically standard rst-docstrings for Sphinx. Test ^^^^ Try to write tests whenever possible. Our goal for the future is 100% coverage. -We are currently using `nose` but might change in the future. You can copy the structure from other testcases. Please remember to adapt the docstrings. Further reading diff --git a/setup.cfg b/setup.cfg index 1722cbf..33c8950 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,17 +56,12 @@ tests_require = pytest!=3.2.0,!=3.3.0 pytest-cov pytest-mock - nose scripttest mock hypothesis>4 flake8 sphinxcontrib-spelling>=7.2.0 -[nosetests] -verbosity=3 -with-doctest=1 - [flake8] exclude = .git,.tox,.github,.eggs,__pycache__,doc/conf.py,build,dist,capabilities-data,test,src/escpos/constants.py max-line-length = 120 diff --git a/test/test_function_dummy_clear.py b/test/test_function_dummy_clear.py index 142a0a8..40ca9d4 100644 --- a/test/test_function_dummy_clear.py +++ b/test/test_function_dummy_clear.py @@ -1,4 +1,3 @@ -from nose.tools import assert_raises from escpos.printer import Dummy diff --git a/test/test_function_qr_native.py b/test/test_function_qr_native.py index 8dfed74..876b38d 100644 --- a/test/test_function_qr_native.py +++ b/test/test_function_qr_native.py @@ -8,7 +8,6 @@ """ -from nose.tools import raises import pytest import escpos.printer as printer @@ -66,25 +65,25 @@ def test_model(): assert instance.output == expected -@raises(ValueError) def test_invalid_ec(): """Test invalid QR error correction""" instance = printer.Dummy() - instance.qr("1234", native=True, ec=-1) + with pytest.raises(ValueError): + instance.qr("1234", native=True, ec=-1) -@raises(ValueError) def test_invalid_size(): """Test invalid QR size""" instance = printer.Dummy() - instance.qr("1234", native=True, size=0) + with pytest.raises(ValueError): + instance.qr("1234", native=True, size=0) -@raises(ValueError) def test_invalid_model(): """Test invalid QR model""" instance = printer.Dummy() - instance.qr("1234", native=True, model="Hello") + with pytest.raises(ValueError): + instance.qr("1234", native=True, model="Hello") @pytest.mark.skip("this test has to be debugged") @@ -103,11 +102,11 @@ def test_image(): assert instance.output == expected -@raises(ValueError) def test_image_invalid_model(): """Test unsupported QR model as image""" instance = printer.Dummy() - instance.qr("1234", native=False, model=QR_MODEL_1) + with pytest.raises(ValueError): + instance.qr("1234", native=False, model=QR_MODEL_1) @pytest.fixture diff --git a/test/test_functions.py b/test/test_functions.py index 1b58ca5..d98336e 100644 --- a/test/test_functions.py +++ b/test/test_functions.py @@ -1,4 +1,4 @@ -from nose.tools import assert_raises +import pytest from escpos.printer import Dummy @@ -16,11 +16,11 @@ def test_line_spacing_rest(): def test_line_spacing_error_handling(): printer = Dummy() - with assert_raises(ValueError): + with pytest.raises(ValueError): printer.line_spacing(99, divisor=44) - with assert_raises(ValueError): + with pytest.raises(ValueError): printer.line_spacing(divisor=80, spacing=86) - with assert_raises(ValueError): + with pytest.raises(ValueError): printer.line_spacing(divisor=360, spacing=256) - with assert_raises(ValueError): + with pytest.raises(ValueError): printer.line_spacing(divisor=180, spacing=256) diff --git a/test/test_magicencode.py b/test/test_magicencode.py index 5debbbe..c2e89d1 100644 --- a/test/test_magicencode.py +++ b/test/test_magicencode.py @@ -10,7 +10,6 @@ import pytest -from nose.tools import raises, assert_raises from hypothesis import given, example import hypothesis.strategies as st from escpos.magicencode import MagicEncode, Encoder @@ -32,9 +31,9 @@ class TestEncoder: assert not Encoder({"CP437": 1}).find_suitable_encoding("€") assert Encoder({"CP858": 1}).find_suitable_encoding("€") == "CP858" - @raises(ValueError) def test_get_encoding(self): - Encoder({}).get_encoding_name("latin1") + with pytest.raises(ValueError): + Encoder({}).get_encoding_name("latin1") class TestMagicEncode: diff --git a/tox.ini b/tox.ini index 1adcd45..c447b58 100644 --- a/tox.ini +++ b/tox.ini @@ -12,8 +12,7 @@ python = 3.11: py311 [testenv] -deps = nose - jaconv +deps = jaconv coverage scripttest mock