From 1c6b39322fd92961a6747e1b083fc7aa7f2b59d2 Mon Sep 17 00:00:00 2001 From: Junzi Sun Date: Mon, 4 May 2020 20:34:25 +0200 Subject: [PATCH] rename common file --- Makefile | 5 +- pyModeS/__init__.py | 4 +- pyModeS/{common.py => py_common.py} | 0 tests/test_c_common.py | 122 ++++++++++++++-------------- tests/test_common.py | 64 --------------- tests/test_py_common.py | 64 +++++++++++++++ 6 files changed, 131 insertions(+), 128 deletions(-) rename pyModeS/{common.py => py_common.py} (100%) delete mode 100644 tests/test_common.py create mode 100644 tests/test_py_common.py diff --git a/Makefile b/Makefile index c5b57ba..4f8488e 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,12 @@ ext: python setup.py build_ext --inplace test: + python setup.py build_ext --inplace python -m pytest tests clean: - find pyModeS/decoder -type f -name '*.c' -delete - find pyModeS/decoder -type f -name '*.so' -delete + find pyModeS -type f -name '*.c' -delete + find pyModeS -type f -name '*.so' -delete find . | grep -E "(__pycache__|\.pyc|\.pyo$$)" | xargs rm -rf rm -rf *.egg-info rm -rf .pytest_cache diff --git a/pyModeS/__init__.py b/pyModeS/__init__.py index 3b414d0..1d4a787 100644 --- a/pyModeS/__init__.py +++ b/pyModeS/__init__.py @@ -5,8 +5,8 @@ try: from . import c_common as common from .c_common import * except: - from . import common - from .common import * + from . import py_common as common + from .py_common import * from .decoder import tell from .decoder import adsb diff --git a/pyModeS/common.py b/pyModeS/py_common.py similarity index 100% rename from pyModeS/common.py rename to pyModeS/py_common.py diff --git a/tests/test_c_common.py b/tests/test_c_common.py index d55b588..4d14034 100644 --- a/tests/test_c_common.py +++ b/tests/test_c_common.py @@ -1,60 +1,62 @@ -try: - from pyModeS.decoder import c_common as common - - def test_conversions(): - assert common.hex2bin("6E") == "01101110" - assert common.bin2hex("01101110") == "6E" - assert common.bin2hex("1101110") == "6E" - - def test_crc_decode(): - - assert common.crc("8D406B902015A678D4D220AA4BDA") == 0 - assert common.crc("8d8960ed58bf053cf11bc5932b7d") == 0 - assert common.crc("8d45cab390c39509496ca9a32912") == 0 - assert common.crc("8d74802958c904e6ef4ba0184d5c") == 0 - assert common.crc("8d4400cd9b0000b4f87000e71a10") == 0 - assert common.crc("8d4065de58a1054a7ef0218e226a") == 0 - - assert common.crc("c80b2dca34aa21dd821a04cb64d4") == 10719924 - assert common.crc("a800089d8094e33a6004e4b8a522") == 4805588 - assert common.crc("a8000614a50b6d32bed000bbe0ed") == 5659991 - assert common.crc("a0000410bc900010a40000f5f477") == 11727682 - assert common.crc("8d4ca251204994b1c36e60a5343d") == 16 - assert common.crc("b0001718c65632b0a82040715b65") == 353333 - - def test_crc_encode(): - parity = common.crc("8D406B902015A678D4D220AA4BDA", encode=True) - assert parity == 11160538 - - def test_icao(): - assert common.icao("8D406B902015A678D4D220AA4BDA") == "406B90" - assert common.icao("A0001839CA3800315800007448D9") == "400940" - assert common.icao("A000139381951536E024D4CCF6B5") == "3C4DD2" - assert common.icao("A000029CFFBAA11E2004727281F1") == "4243D0" - - def test_modes_altcode(): - assert common.altcode("A02014B400000000000000F9D514") == 32300 - - def test_modes_idcode(): - assert common.idcode("A800292DFFBBA9383FFCEB903D01") == "1346" - - def test_graycode_to_altitude(): - assert common.gray2alt("00000000010") == -1000 - assert common.gray2alt("00000001010") == -500 - assert common.gray2alt("00000011011") == -100 - assert common.gray2alt("00000011010") == 0 - assert common.gray2alt("00000011110") == 100 - assert common.gray2alt("00000010011") == 600 - assert common.gray2alt("00000110010") == 1000 - assert common.gray2alt("00001001001") == 5800 - assert common.gray2alt("00011100100") == 10300 - assert common.gray2alt("01100011010") == 32000 - assert common.gray2alt("01110000100") == 46300 - assert common.gray2alt("01010101100") == 50200 - assert common.gray2alt("11011110100") == 73200 - assert common.gray2alt("10000000011") == 126600 - assert common.gray2alt("10000000001") == 126700 - - -except: - pass +from pyModeS import c_common + + +def test_conversions(): + assert c_common.hex2bin("6E") == "01101110" + assert c_common.bin2hex("01101110") == "6E" + assert c_common.bin2hex("1101110") == "6E" + + +def test_crc_decode(): + + assert c_common.crc("8D406B902015A678D4D220AA4BDA") == 0 + assert c_common.crc("8d8960ed58bf053cf11bc5932b7d") == 0 + assert c_common.crc("8d45cab390c39509496ca9a32912") == 0 + assert c_common.crc("8d74802958c904e6ef4ba0184d5c") == 0 + assert c_common.crc("8d4400cd9b0000b4f87000e71a10") == 0 + assert c_common.crc("8d4065de58a1054a7ef0218e226a") == 0 + + assert c_common.crc("c80b2dca34aa21dd821a04cb64d4") == 10719924 + assert c_common.crc("a800089d8094e33a6004e4b8a522") == 4805588 + assert c_common.crc("a8000614a50b6d32bed000bbe0ed") == 5659991 + assert c_common.crc("a0000410bc900010a40000f5f477") == 11727682 + assert c_common.crc("8d4ca251204994b1c36e60a5343d") == 16 + assert c_common.crc("b0001718c65632b0a82040715b65") == 353333 + + +def test_crc_encode(): + parity = c_common.crc("8D406B902015A678D4D220AA4BDA", encode=True) + assert parity == 11160538 + + +def test_icao(): + assert c_common.icao("8D406B902015A678D4D220AA4BDA") == "406B90" + assert c_common.icao("A0001839CA3800315800007448D9") == "400940" + assert c_common.icao("A000139381951536E024D4CCF6B5") == "3C4DD2" + assert c_common.icao("A000029CFFBAA11E2004727281F1") == "4243D0" + + +def test_modes_altcode(): + assert c_common.altcode("A02014B400000000000000F9D514") == 32300 + + +def test_modes_idcode(): + assert c_common.idcode("A800292DFFBBA9383FFCEB903D01") == "1346" + + +def test_graycode_to_altitude(): + assert c_common.gray2alt("00000000010") == -1000 + assert c_common.gray2alt("00000001010") == -500 + assert c_common.gray2alt("00000011011") == -100 + assert c_common.gray2alt("00000011010") == 0 + assert c_common.gray2alt("00000011110") == 100 + assert c_common.gray2alt("00000010011") == 600 + assert c_common.gray2alt("00000110010") == 1000 + assert c_common.gray2alt("00001001001") == 5800 + assert c_common.gray2alt("00011100100") == 10300 + assert c_common.gray2alt("01100011010") == 32000 + assert c_common.gray2alt("01110000100") == 46300 + assert c_common.gray2alt("01010101100") == 50200 + assert c_common.gray2alt("11011110100") == 73200 + assert c_common.gray2alt("10000000011") == 126600 + assert c_common.gray2alt("10000000001") == 126700 diff --git a/tests/test_common.py b/tests/test_common.py deleted file mode 100644 index e9e871c..0000000 --- a/tests/test_common.py +++ /dev/null @@ -1,64 +0,0 @@ -from pyModeS import common - - -def test_conversions(): - assert common.hex2bin("6E") == "01101110" - assert common.bin2hex("01101110") == "6E" - assert common.bin2hex("1101110") == "6E" - - -def test_crc_decode(): - assert common.crc_legacy("8D406B902015A678D4D220AA4BDA") == 0 - - assert common.crc("8D406B902015A678D4D220AA4BDA") == 0 - assert common.crc("8d8960ed58bf053cf11bc5932b7d") == 0 - assert common.crc("8d45cab390c39509496ca9a32912") == 0 - assert common.crc("8d49d3d4e1089d00000000744c3b") == 0 - assert common.crc("8d74802958c904e6ef4ba0184d5c") == 0 - assert common.crc("8d4400cd9b0000b4f87000e71a10") == 0 - assert common.crc("8d4065de58a1054a7ef0218e226a") == 0 - - assert common.crc("c80b2dca34aa21dd821a04cb64d4") == 10719924 - assert common.crc("a800089d8094e33a6004e4b8a522") == 4805588 - assert common.crc("a8000614a50b6d32bed000bbe0ed") == 5659991 - assert common.crc("a0000410bc900010a40000f5f477") == 11727682 - assert common.crc("8d4ca251204994b1c36e60a5343d") == 16 - assert common.crc("b0001718c65632b0a82040715b65") == 353333 - - -def test_crc_encode(): - parity = common.crc("8D406B902015A678D4D220AA4BDA", encode=True) - assert parity == 11160538 - - -def test_icao(): - assert common.icao("8D406B902015A678D4D220AA4BDA") == "406B90" - assert common.icao("A0001839CA3800315800007448D9") == "400940" - assert common.icao("A000139381951536E024D4CCF6B5") == "3C4DD2" - assert common.icao("A000029CFFBAA11E2004727281F1") == "4243D0" - - -def test_modes_altcode(): - assert common.altcode("A02014B400000000000000F9D514") == 32300 - - -def test_modes_idcode(): - assert common.idcode("A800292DFFBBA9383FFCEB903D01") == "1346" - - -def test_graycode_to_altitude(): - assert common.gray2alt("00000000010") == -1000 - assert common.gray2alt("00000001010") == -500 - assert common.gray2alt("00000011011") == -100 - assert common.gray2alt("00000011010") == 0 - assert common.gray2alt("00000011110") == 100 - assert common.gray2alt("00000010011") == 600 - assert common.gray2alt("00000110010") == 1000 - assert common.gray2alt("00001001001") == 5800 - assert common.gray2alt("00011100100") == 10300 - assert common.gray2alt("01100011010") == 32000 - assert common.gray2alt("01110000100") == 46300 - assert common.gray2alt("01010101100") == 50200 - assert common.gray2alt("11011110100") == 73200 - assert common.gray2alt("10000000011") == 126600 - assert common.gray2alt("10000000001") == 126700 diff --git a/tests/test_py_common.py b/tests/test_py_common.py new file mode 100644 index 0000000..ac2ea68 --- /dev/null +++ b/tests/test_py_common.py @@ -0,0 +1,64 @@ +from pyModeS import py_common + + +def test_conversions(): + assert py_common.hex2bin("6E") == "01101110" + assert py_common.bin2hex("01101110") == "6E" + assert py_common.bin2hex("1101110") == "6E" + + +def test_crc_decode(): + assert py_common.crc_legacy("8D406B902015A678D4D220AA4BDA") == 0 + + assert py_common.crc("8D406B902015A678D4D220AA4BDA") == 0 + assert py_common.crc("8d8960ed58bf053cf11bc5932b7d") == 0 + assert py_common.crc("8d45cab390c39509496ca9a32912") == 0 + assert py_common.crc("8d49d3d4e1089d00000000744c3b") == 0 + assert py_common.crc("8d74802958c904e6ef4ba0184d5c") == 0 + assert py_common.crc("8d4400cd9b0000b4f87000e71a10") == 0 + assert py_common.crc("8d4065de58a1054a7ef0218e226a") == 0 + + assert py_common.crc("c80b2dca34aa21dd821a04cb64d4") == 10719924 + assert py_common.crc("a800089d8094e33a6004e4b8a522") == 4805588 + assert py_common.crc("a8000614a50b6d32bed000bbe0ed") == 5659991 + assert py_common.crc("a0000410bc900010a40000f5f477") == 11727682 + assert py_common.crc("8d4ca251204994b1c36e60a5343d") == 16 + assert py_common.crc("b0001718c65632b0a82040715b65") == 353333 + + +def test_crc_encode(): + parity = py_common.crc("8D406B902015A678D4D220AA4BDA", encode=True) + assert parity == 11160538 + + +def test_icao(): + assert py_common.icao("8D406B902015A678D4D220AA4BDA") == "406B90" + assert py_common.icao("A0001839CA3800315800007448D9") == "400940" + assert py_common.icao("A000139381951536E024D4CCF6B5") == "3C4DD2" + assert py_common.icao("A000029CFFBAA11E2004727281F1") == "4243D0" + + +def test_modes_altcode(): + assert py_common.altcode("A02014B400000000000000F9D514") == 32300 + + +def test_modes_idcode(): + assert py_common.idcode("A800292DFFBBA9383FFCEB903D01") == "1346" + + +def test_graycode_to_altitude(): + assert py_common.gray2alt("00000000010") == -1000 + assert py_common.gray2alt("00000001010") == -500 + assert py_common.gray2alt("00000011011") == -100 + assert py_common.gray2alt("00000011010") == 0 + assert py_common.gray2alt("00000011110") == 100 + assert py_common.gray2alt("00000010011") == 600 + assert py_common.gray2alt("00000110010") == 1000 + assert py_common.gray2alt("00001001001") == 5800 + assert py_common.gray2alt("00011100100") == 10300 + assert py_common.gray2alt("01100011010") == 32000 + assert py_common.gray2alt("01110000100") == 46300 + assert py_common.gray2alt("01010101100") == 50200 + assert py_common.gray2alt("11011110100") == 73200 + assert py_common.gray2alt("10000000011") == 126600 + assert py_common.gray2alt("10000000001") == 126700