Restructure the entire project, enforce linting and add support for type checkers

4 files changed, 692 insertions, 0 deletions

diff --git a/tests/test_generator.py b/tests/test_generator.py
new file mode 100644
index 0000000..08947e5
--- /dev/null
+++ b/tests/test_generator.py
@@ -0,0 +1,251 @@
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2020-2026, Simeon Simeonov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Tests for otp2289.generator"""
+
+import pytest
+
+import otp2289
+
+
+def test_caller_exceptions() -> None:
+    """Tests the exceptions when calling an initialized object"""
+    gen = otp2289.OTPGenerator(
+        b'This is a test.', 'TeSt', otp2289.OTP_ALGO_MD5
+    )
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        gen.generate_otp_words('3')  # ty: ignore[invalid-argument-type]
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == 'Step value MUST be an int'
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        gen.generate_otp_hexdigest(-1)
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == 'Step value MUST be >= 0'
+    with pytest.raises(otp2289.OTPChallengeError) as exc_info:
+        gen.generate_otp_hexdigest_from_challenge(
+            b'md5 fbd TeSt'  # ty: ignore[invalid-argument-type]
+        )
+    assert exc_info.type is otp2289.OTPChallengeError
+    assert exc_info.value.args[0] == 'Challenge must be str'
+    with pytest.raises(otp2289.OTPChallengeError) as exc_info:
+        gen.generate_otp_hexdigest_from_challenge('md5 fbd TeSt')
+    assert exc_info.type is otp2289.OTPChallengeError
+    assert exc_info.value.args[0] == 'Invalid challenge'
+    with pytest.raises(otp2289.generator.OTPChallengeError) as exc_info:
+        gen.generate_otp_hexdigest_from_challenge('otp-md5 fbd TeSt')
+    assert exc_info.type is otp2289.generator.OTPChallengeError
+    assert exc_info.value.args[0] == 'Invalid challenge'
+
+
+def test_constructor_exceptions() -> None:
+    """
+    Tests the exceptions when initializing a new object (in the constructor)
+    """
+    # test the otp2289.OTPGenerator __init__ and validators
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        otp2289.OTPGenerator(
+            b'This is a test.',
+            'TeStø'.encode(),  # ty: ignore[invalid-argument-type]
+            otp2289.OTP_ALGO_MD5,
+        )
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == 'Seed must be a string'
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        otp2289.OTPGenerator(
+            b'This is a test.', 'TeStøtEsTteSTteStTest', otp2289.OTP_ALGO_SHA1
+        )
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == (
+        'The seed MUST be of 1 to 16 characters in length'
+    )
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        otp2289.OTPGenerator(
+            b'This is a test.', 'TeStø', otp2289.OTP_ALGO_SHA1
+        )
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == (
+        'The seed MUST consist of purely alphanumeric characters'
+    )
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        otp2289.OTPGenerator(b'This is a test.', 'TeSt', 9)
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == (
+        'hash_algo is not among the known algorithms'
+    )
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        otp2289.OTPGenerator(
+            b'This is a test.',
+            'TeSt',
+            b'md5',  # ty: ignore[invalid-argument-type]
+        )
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == 'hash_algo must be an int or a str'
+    # test the package structure as well
+    with pytest.raises(otp2289.generator.OTPGeneratorError) as exc_info:
+        otp2289.generator.OTPGenerator(b'This is a test.', 'TeSt', 'foo')
+    assert exc_info.type is otp2289.generator.OTPGeneratorError
+    assert exc_info.value.args[0] == (
+        'foo is not supported by this version of the hashlib module'
+    )
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        otp2289.OTPGenerator(
+            '1234567',  # ty: ignore[invalid-argument-type]
+            'TeSt',
+            otp2289.OTP_ALGO_MD5,
+        )
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == 'Password must be a byte-string'
+    with pytest.raises(otp2289.OTPGeneratorError) as exc_info:
+        otp2289.OTPGenerator(b'1234567', 'TeSt', otp2289.OTP_ALGO_MD5)
+    assert exc_info.type is otp2289.OTPGeneratorError
+    assert exc_info.value.args[0] == 'Password must be longer than 10 bytes'
+
+
+def test_md5() -> None:
+    """
+    Tests the MD5 functionality of the OTPGenerator as described in the RFC
+
+    Those are the tests from 'RFC-2289 Appendix C - OTP Verification Examples'
+    """
+    # We could run this in a loop, but I guess "Readability counts."
+    # pass='This is a test.', seed='TeSt'
+    gen = otp2289.OTPGenerator(
+        b'This is a test.', 'TeSt', otp2289.OTP_ALGO_MD5
+    )
+    res_words = gen.generate_otp_words(0)
+    res_hex = gen.generate_otp_hexdigest(0)
+    assert isinstance(res_words, str)
+    assert isinstance(res_hex, str)
+    assert res_hex == '0x9e876134d90499dd'
+    assert res_words == 'INCH SEA ANNE LONG AHEM TOUR'
+    # step 1
+    assert gen.generate_otp_hexdigest(1) == '0x7965e05436f5029f'
+    assert gen.generate_otp_words(1) == 'EASE OIL FUM CURE AWRY AVIS'
+    assert gen.generate_otp_hexdigest_from_challenge('otp-md5 1   TeSt') == (
+        '0x7965e05436f5029f'
+    )
+    assert gen.generate_otp_words_from_challenge('otp-md5 1 TeSt') == (
+        'EASE OIL FUM CURE AWRY AVIS'
+    )
+    # step 99
+    assert gen.generate_otp_hexdigest(99) == '0x50fe1962c4965880'
+    assert gen.generate_otp_words(99) == 'BAIL TUFT BITS GANG CHEF THY'
+    assert gen.generate_otp_hexdigest_from_challenge('otp-md5 99   TeSt') == (
+        '0x50fe1962c4965880'
+    )
+    assert gen.generate_otp_words_from_challenge('otp-md5 99   TeSt') == (
+        'BAIL TUFT BITS GANG CHEF THY'
+    )
+    # iterator test
+    hexdigests = list(gen.hexdigest_range(105))  # testing the range itself
+    words = list(gen.words_range(99))
+    hexdigests.reverse()
+    words.reverse()
+    assert hexdigests[0] == '0x9e876134d90499dd'
+    assert hexdigests[1] == '0x7965e05436f5029f'
+    assert hexdigests[99] == '0x50fe1962c4965880'
+    assert words[0] == 'INCH SEA ANNE LONG AHEM TOUR'
+    assert words[1] == 'EASE OIL FUM CURE AWRY AVIS'
+    assert words[99] == 'BAIL TUFT BITS GANG CHEF THY'
+    # pass='AbCdEfGhIjK', seed='alpha1'
+    gen = otp2289.OTPGenerator(b'AbCdEfGhIjK', 'alpha1', otp2289.OTP_ALGO_MD5)
+    assert gen.generate_otp_hexdigest(0) == '0x87066dd9644bf206'
+    assert gen.generate_otp_words(0) == 'FULL PEW DOWN ONCE MORT ARC'
+    assert gen.generate_otp_hexdigest(1) == '0x7cd34c1040add14b'
+    assert gen.generate_otp_words(1) == 'FACT HOOF AT FIST SITE KENT'
+    assert gen.generate_otp_hexdigest(99) == '0x5aa37a81f212146c'
+    assert gen.generate_otp_words(99) == 'BODE HOP JAKE STOW JUT RAP'
+    # pass="OTP's are good", seed='correct'
+    gen = otp2289.OTPGenerator(
+        b"OTP's are good", 'correct', otp2289.OTP_ALGO_MD5
+    )
+    assert gen.generate_otp_hexdigest(0) == '0xf205753943de4cf9'
+    assert gen.generate_otp_words(0) == 'ULAN NEW ARMY FUSE SUIT EYED'
+    assert gen.generate_otp_hexdigest(1) == '0xddcdac956f234937'
+    assert gen.generate_otp_words(1) == 'SKIM CULT LOB SLAM POE HOWL'
+    assert gen.generate_otp_hexdigest(99) == '0xb203e28fa525be47'
+    assert gen.generate_otp_words(99) == 'LONG IVY JULY AJAR BOND LEE'
+
+
+def test_sha1() -> None:
+    """
+    Tests the SHA-1 functionality of the OTPGenerator as described in the RFC
+
+    Those are the tests from 'RFC-2289 Appendix C - OTP Verification Examples'
+    """
+    # pass='This is a test.', seed='TeSt'
+    gen = otp2289.OTPGenerator(
+        b'This is a test.', 'TeSt', otp2289.OTP_ALGO_SHA1
+    )
+    res_hex = gen.generate_otp_hexdigest(step=0)
+    res_words = gen.generate_otp_words(step=0)
+    assert isinstance(res_words, str)
+    assert isinstance(res_hex, str)
+    assert res_hex == '0xbb9e6ae1979d8ff4'
+    assert res_words == 'MILT VARY MAST OK SEES WENT'
+    assert gen.generate_otp_hexdigest(1) == '0x63d936639734385b'
+    assert gen.generate_otp_words(1) == 'CART OTTO HIVE ODE VAT NUT'
+    assert gen.generate_otp_hexdigest_from_challenge('otp-sha1 1 TeSt') == (
+        '0x63d936639734385b'
+    )
+    assert gen.generate_otp_words_from_challenge('otp-sha1 1 TeSt') == (
+        'CART OTTO HIVE ODE VAT NUT'
+    )
+    assert gen.generate_otp_hexdigest(99) == '0x87fec7768b73ccf9'
+    assert gen.generate_otp_words(99) == 'GAFF WAIT SKID GIG SKY EYED'
+    assert gen.generate_otp_hexdigest_from_challenge('otp-sha1 99   TeSt') == (
+        '0x87fec7768b73ccf9'
+    )
+    assert gen.generate_otp_words_from_challenge('otp-sha1 99  TeSt') == (
+        'GAFF WAIT SKID GIG SKY EYED'
+    )
+    # iterator test
+    hexdigests = list(gen.hexdigest_range(105))
+    words = list(gen.words_range(99))
+    hexdigests.reverse()
+    words.reverse()
+    assert hexdigests[0] == '0xbb9e6ae1979d8ff4'
+    assert hexdigests[1] == '0x63d936639734385b'
+    assert hexdigests[99] == '0x87fec7768b73ccf9'
+    assert words[0] == 'MILT VARY MAST OK SEES WENT'
+    assert words[1] == 'CART OTTO HIVE ODE VAT NUT'
+    assert words[99] == 'GAFF WAIT SKID GIG SKY EYED'
+    # pass='AbCdEfGhIjK', seed='alpha1'
+    gen = otp2289.OTPGenerator(b'AbCdEfGhIjK', 'alpha1', otp2289.OTP_ALGO_SHA1)
+    assert gen.generate_otp_hexdigest(0) == '0xad85f658ebe383c9'
+    assert gen.generate_otp_words(0) == 'LEST OR HEEL SCOT ROB SUIT'
+    assert gen.generate_otp_hexdigest(1) == '0xd07ce229b5cf119b'
+    assert gen.generate_otp_words(1) == 'RITE TAKE GELD COST TUNE RECK'
+    assert gen.generate_otp_hexdigest(99) == '0x27bc71035aaf3dc6'
+    assert gen.generate_otp_words(99) == 'MAY STAR TIN LYON VEDA STAN'
+    # pass="OTP's are good", seed='correct'
+    gen = otp2289.OTPGenerator(
+        b"OTP's are good", 'correct', otp2289.OTP_ALGO_SHA1
+    )
+    assert gen.generate_otp_hexdigest(0) == '0xd51f3e99bf8e6f0b'
+    assert gen.generate_otp_words(0) == 'RUST WELT KICK FELL TAIL FRAU'
+    assert gen.generate_otp_hexdigest(1) == '0x82aeb52d943774e4'
+    assert gen.generate_otp_words(1) == 'FLIT DOSE ALSO MEW DRUM DEFY'
+    assert gen.generate_otp_hexdigest(99) == '0x4f296a74fe1567ec'
+    assert gen.generate_otp_words(99) == 'AURA ALOE HURL WING BERG WAIT'
diff --git a/tests/test_main.py b/tests/test_main.py
new file mode 100644
index 0000000..3c75621
--- /dev/null
+++ b/tests/test_main.py
@@ -0,0 +1,225 @@
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2020-2026, Simeon Simeonov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Tests for otp2289.__main__"""
+
+import os
+import unittest.mock
+
+import pytest
+
+from otp2289.__main__ import main
+
+
+def test_main_generate_otp_response(capsys: pytest.CaptureFixture) -> None:
+    """tests main"""
+    args = [
+        '--generate-otp-response',
+        '-a',
+        'sha1',
+        '-i',
+        '99',
+        '-s',
+        'TesT',
+        '-p',
+        'This is a test.',
+    ]
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'Seed: TesT, Step: 99, Hash: sha1{os.linesep}'
+        f'0x87fec7768b73ccf9{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+    args.extend(['-f', 'token'])
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'Seed: TesT, Step: 99, Hash: sha1{os.linesep}'
+        f'GAFF WAIT SKID GIG SKY EYED{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+    args.append('-q')
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == f'GAFF WAIT SKID GIG SKY EYED{os.linesep}'
+    assert exit_info.value.code == 0
+
+
+def test_main_generate_otp_response_env_passwd(
+    capsys: pytest.CaptureFixture,
+) -> None:
+    """tests main by fetching password from the env. var. 'OTP2289_PASSWORD'"""
+    args = ['--generate-otp-response', '-a', 'sha1', '-i', '99', '-s', 'TesT']
+    with unittest.mock.patch.dict(
+        os.environ, {'OTP2289_PASSWORD': 'This is a test.'}
+    ):
+        with pytest.raises(SystemExit) as exit_info:
+            main(args)
+        captured = capsys.readouterr()
+        assert captured.out == (
+            f'Seed: TesT, Step: 99, Hash: sha1{os.linesep}'
+            f'0x87fec7768b73ccf9{os.linesep}'
+        )
+        assert exit_info.value.code == 0
+        args.extend(['-f', 'token'])
+        with pytest.raises(SystemExit) as exit_info:
+            main(args)
+        captured = capsys.readouterr()
+        assert captured.out == (
+            f'Seed: TesT, Step: 99, Hash: sha1{os.linesep}'
+            f'GAFF WAIT SKID GIG SKY EYED{os.linesep}'
+        )
+        assert exit_info.value.code == 0
+        args.append('-q')
+        with pytest.raises(SystemExit) as exit_info:
+            main(args)
+        captured = capsys.readouterr()
+        assert captured.out == f'GAFF WAIT SKID GIG SKY EYED{os.linesep}'
+        assert exit_info.value.code == 0
+
+
+def test_main_generate_otp_range(capsys: pytest.CaptureFixture) -> None:
+    """tests main"""
+    args = [
+        '--generate-otp-range',
+        '-i',
+        '2',
+        '-s',
+        'TesT',
+        '-r',
+        '5',
+        '-p',
+        'This is a test.',
+    ]
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'Seed: TesT, Step: 2, Hash: md5, Range: 3'
+        f'{os.linesep}'
+        f'2: 0x4049f8b161669b7b{os.linesep}'
+        f'1: 0x7965e05436f5029f{os.linesep}'
+        f'0: 0x9e876134d90499dd{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+    args.append('-q')
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'2: 0x4049f8b161669b7b{os.linesep}'
+        f'1: 0x7965e05436f5029f{os.linesep}'
+        f'0: 0x9e876134d90499dd{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+    args.extend(['-f', 'token'])
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'2: THY AVON NO NECK COKE MOLL{os.linesep}'
+        f'1: EASE OIL FUM CURE AWRY AVIS{os.linesep}'
+        f'0: INCH SEA ANNE LONG AHEM TOUR{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+
+
+@pytest.mark.parametrize(
+    'args',
+    [
+        ['--generate-otp-range', '-i', '2', '-s', 'TesT', '-r', '5'],
+        ['--generate-otp-range', '-i', '2', '-s', 'TesT', '-r', '5', '-P'],
+    ],
+)
+@unittest.mock.patch('getpass.getpass')
+def test_main_generate_otp_range_passwd_prompt(
+    getpass: unittest.mock.MagicMock,
+    capsys: pytest.CaptureFixture,
+    args: list[str],
+) -> None:
+    """tests main by prompting for password (with or without -P)"""
+    args = ['--generate-otp-range', '-i', '2', '-s', 'TesT', '-r', '5']
+    getpass.return_value = 'This is a test.'
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'Seed: TesT, Step: 2, Hash: md5, Range: 3'
+        f'{os.linesep}'
+        f'2: 0x4049f8b161669b7b{os.linesep}'
+        f'1: 0x7965e05436f5029f{os.linesep}'
+        f'0: 0x9e876134d90499dd{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+    args.append('-q')
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'2: 0x4049f8b161669b7b{os.linesep}'
+        f'1: 0x7965e05436f5029f{os.linesep}'
+        f'0: 0x9e876134d90499dd{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+    args.extend(['-f', 'token'])
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'2: THY AVON NO NECK COKE MOLL{os.linesep}'
+        f'1: EASE OIL FUM CURE AWRY AVIS{os.linesep}'
+        f'0: INCH SEA ANNE LONG AHEM TOUR{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+
+
+def test_main_initiate(capsys: pytest.CaptureFixture) -> None:
+    """tests main"""
+    args = [
+        '--initiate-new-sequence',
+        '-i',
+        '500',
+        '-s',
+        'TesT',
+        '-p',
+        'This is a test.',
+    ]
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == (
+        f'Seed: TesT, Step: 500, Hash: md5{os.linesep}'
+        f'0x2b8d82b6ac14346c{os.linesep}'
+    )
+    assert exit_info.value.code == 0
+    args.append('-q')
+    with pytest.raises(SystemExit) as exit_info:
+        main(args)
+    captured = capsys.readouterr()
+    assert captured.out == f'0x2b8d82b6ac14346c{os.linesep}'
+    assert exit_info.value.code == 0
diff --git a/tests/test_server.py b/tests/test_server.py
new file mode 100644
index 0000000..3099cf7
--- /dev/null
+++ b/tests/test_server.py
@@ -0,0 +1,121 @@
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2020-2026, Simeon Simeonov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Tests for otp2289.server"""
+
+import json
+
+import pytest
+
+import otp2289
+
+
+def test_state_caller_exceptions() -> None:
+    """Tests the exceptions when calling the OTPState objects"""
+    state = otp2289.OTPState(
+        '0x7965e05436f5029f', 1, 'TeSt', otp2289.OTP_ALGO_MD5
+    )
+    with pytest.raises(otp2289.OTPInvalidResponseError) as exc_info:
+        state.response_validates('bla')
+    assert exc_info.type is otp2289.OTPInvalidResponseError
+    assert exc_info.value.args[0] == (
+        'The response is neither a valid token or hex'
+    )
+
+
+def test_state_constructor_exceptions() -> None:
+    """Tests the exceptions when initializing new OTPState objects"""
+    with pytest.raises(otp2289.OTPStateError) as exc_info:
+        otp2289.OTPState(
+            '0x7965e05436f5029t',
+            1,
+            'TeStø'.encode(),  # ty: ignore[invalid-argument-type]
+            otp2289.OTP_ALGO_MD5,
+        )
+    assert exc_info.type is otp2289.OTPStateError
+    assert exc_info.value.args[0] == 'Seed must be a string'
+
+    with pytest.raises(otp2289.OTPStateError) as exc_info:
+        otp2289.OTPState(
+            '0x7965e05436f5029t',
+            '1',  # ty: ignore[invalid-argument-type]
+            'TeSt',
+            otp2289.OTP_ALGO_MD5,
+        )
+    assert exc_info.type is otp2289.OTPStateError
+    assert exc_info.value.args[0] == 'Step value MUST be an int'
+
+
+def test_state_validation_md5() -> None:
+    """Tests the OTPState validation functionality for MD5"""
+    state = otp2289.OTPState(
+        '0x7965e05436f5029f', 1, 'TeSt', otp2289.OTP_ALGO_MD5
+    )
+    assert state.validated is False
+    assert state.response_validates('0x9e876134d90499dd') is True
+    assert state.response_validates('INCH SEA ANNE LONG AHEM TOUR') is True
+    assert state.ot_hex == '7965e05436f5029f'
+    assert state.validated is True
+
+
+def test_state_validation_sha1() -> None:
+    """Tests the OTPState validation functionality for SHA1"""
+    state = otp2289.OTPState(
+        '0x63d936639734385b', 1, 'TeSt', otp2289.OTP_ALGO_SHA1
+    )
+    assert state.validated is False
+    assert state.response_validates('0xbb9e6ae1979d8ff4') is True
+    assert state.response_validates('MILT VARY MAST OK SEES WENT') is True
+    assert state.ot_hex == '63d936639734385b'
+    assert state.validated is True
+
+
+def test_store() -> None:
+    """Tests the OTPStore functionality"""
+    store_data = {
+        'sgs': {
+            'ot_hex': '0x7965e05436f5029f',
+            'current_step': 1,
+            'seed': 'TeSt',
+            'hash_algo': 'md5',
+        },
+        'blackmore': {
+            'ot_hex': '0x63d936639734385b',
+            'current_step': 1,
+            'seed': 'TeSt',
+            'hash_algo': 'sha1',
+        },
+    }
+    store = otp2289.OTPStore(store_data)
+    assert len(store) == len(store_data)
+    assert isinstance(json.dumps(store.to_dict()), str)  # serializable?
+    assert store.response_validates('sgs', '0x9e876134d90499dd') is True
+    assert store.response_validates('sgs', '0x9e876134d90499dd') is False
+    sgs_state = store.get('sgs')
+    if sgs_state is not None:
+        assert sgs_state in store
+    store.pop_state('sgs')
+    assert bool(store) is True
+    store.pop_state('blackmore')
+    assert bool(store) is False
diff --git a/tests/test_static.py b/tests/test_static.py
new file mode 100644
index 0000000..589fc17
--- /dev/null
+++ b/tests/test_static.py
@@ -0,0 +1,95 @@
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2020-2026, Simeon Simeonov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""Tests for the static methods and basic bit, byte, token functionality"""
+
+import os
+
+import otp2289
+
+
+def test_bytes_and_tokens() -> None:
+    """Tests the official hex and tokens defined in RFC2289"""
+    assert bytes.fromhex('9e876134d90499dd') == (
+        otp2289.OTPGenerator.tokens_to_bytes('INCH SEA ANNE LONG AHEM TOUR')
+    )
+    assert bytes.fromhex('7965e05436f5029f') == (
+        otp2289.OTPGenerator.tokens_to_bytes('EASE OIL FUM CURE AWRY AVIS')
+    )
+    assert bytes.fromhex('50fe1962c4965880') == (
+        otp2289.OTPGenerator.tokens_to_bytes('BAIL TUFT BITS GANG CHEF THY')
+    )
+    assert bytes.fromhex('87066dd9644bf206') == (
+        otp2289.OTPGenerator.tokens_to_bytes('FULL PEW DOWN ONCE MORT ARC')
+    )
+    assert bytes.fromhex('7cd34c1040add14b') == (
+        otp2289.OTPGenerator.tokens_to_bytes('FACT HOOF AT FIST SITE KENT')
+    )
+    assert bytes.fromhex('5aa37a81f212146c') == (
+        otp2289.OTPGenerator.tokens_to_bytes('BODE HOP JAKE STOW JUT RAP')
+    )
+    assert bytes.fromhex('f205753943de4cf9') == (
+        otp2289.OTPGenerator.tokens_to_bytes('ULAN NEW ARMY FUSE SUIT EYED')
+    )
+    assert bytes.fromhex('ddcdac956f234937') == (
+        otp2289.OTPGenerator.tokens_to_bytes('SKIM CULT LOB SLAM POE HOWL')
+    )
+    assert bytes.fromhex('b203e28fa525be47') == (
+        otp2289.OTPGenerator.tokens_to_bytes('LONG IVY JULY AJAR BOND LEE')
+    )
+    assert bytes.fromhex('bb9e6ae1979d8ff4') == (
+        otp2289.OTPGenerator.tokens_to_bytes('MILT VARY MAST OK SEES WENT')
+    )
+    assert bytes.fromhex('63d936639734385b') == (
+        otp2289.OTPGenerator.tokens_to_bytes('CART OTTO HIVE ODE VAT NUT')
+    )
+    assert bytes.fromhex('87fec7768b73ccf9') == (
+        otp2289.OTPGenerator.tokens_to_bytes('GAFF WAIT SKID GIG SKY EYED')
+    )
+    assert bytes.fromhex('ad85f658ebe383c9') == (
+        otp2289.OTPGenerator.tokens_to_bytes('LEST OR HEEL SCOT ROB SUIT')
+    )
+    assert bytes.fromhex('d07ce229b5cf119b') == (
+        otp2289.OTPGenerator.tokens_to_bytes('RITE TAKE GELD COST TUNE RECK')
+    )
+    assert bytes.fromhex('27bc71035aaf3dc6') == (
+        otp2289.OTPGenerator.tokens_to_bytes('MAY STAR TIN LYON VEDA STAN')
+    )
+    assert bytes.fromhex('d51f3e99bf8e6f0b') == (
+        otp2289.OTPGenerator.tokens_to_bytes('RUST WELT KICK FELL TAIL FRAU')
+    )
+    assert bytes.fromhex('82aeb52d943774e4') == (
+        otp2289.OTPGenerator.tokens_to_bytes('FLIT DOSE ALSO MEW DRUM DEFY')
+    )
+    assert bytes.fromhex('4f296a74fe1567ec') == (
+        otp2289.OTPGenerator.tokens_to_bytes('AURA ALOE HURL WING BERG WAIT')
+    )
+
+
+def test_random_bytes() -> None:
+    """Implement a few tests with random bytes"""
+    for _ in range(10):
+        rnd_bytes = os.urandom(8)  # 64 bits
+        tokens = otp2289.OTPResponse.bytes_to_tokens(rnd_bytes)
+        assert rnd_bytes == otp2289.OTPGenerator.tokens_to_bytes(tokens)