diff --git a/tests/model/general_data/test_general_data_helper.py b/tests/model/general_data/test_general_data_helper.py index c82dc0ce7c5a4106dbb28bab625f570fb17fb326..275405f26f4e29eed66884b2dc3e744f05af2cab 100644 --- a/tests/model/general_data/test_general_data_helper.py +++ b/tests/model/general_data/test_general_data_helper.py @@ -1,13 +1,36 @@ import numpy as np +from pathlib import Path from unittest import TestCase from unittest.mock import patch from sohstationviewer.model.general_data.general_data_helper import ( _check_related_gaps, squash_gaps, sort_data, retrieve_data_time_from_data_dict, retrieve_gaps_from_data_dict, - combine_data, apply_convert_factor_to_data_dict + combine_data, apply_convert_factor_to_data_dict, read_text ) +TEST_DATA_DIR = Path(__file__).resolve().parent.parent.parent.joinpath( + 'test_data') +text_file = TEST_DATA_DIR.joinpath( + "Pegasus-sample/Pegasus_SVC4/logs/2020/XX/KC01/XX.KC01...D.2020.129") +binary_file = TEST_DATA_DIR.joinpath( + "Pegasus-sample/Pegasus_SVC4/soh/2020/XX/KC01/VDT.D/" + "XX.KC01..VDT.D.2020.129") + + +class TestReadText(TestCase): + def test_text_file(self): + ret = read_text(text_file) + expected_ret = ( + "\n\n** STATE OF HEALTH: XX.KC01...D.2020.129" + "\n2020-05-08 22:55:45.390 UTC: I(Initializations): Firmware") + self.assertEqual(ret[:100], expected_ret + ) + + def test_binary_file(self): + ret = read_text(binary_file) + self.assertIsNone(ret) + class TestCheckRelatedGaps(TestCase): # FROM test_handling_data_rearrange_data.TestCheckRelatedGaps diff --git a/tests/model/mseed_data/test_mseed_helper.py b/tests/model/mseed_data/test_mseed_helper.py index 938092c629f7115bd2623971a58a7aa5e7b047fe..e695b0edf71f15d78ae6f50072327464430c47d7 100644 --- a/tests/model/mseed_data/test_mseed_helper.py +++ b/tests/model/mseed_data/test_mseed_helper.py @@ -1,32 +1,9 @@ from unittest import TestCase -from pathlib import Path from sohstationviewer.model.mseed_data.mseed_helper import ( - retrieve_nets_from_data_dict, read_text + retrieve_nets_from_data_dict ) -TEST_DATA_DIR = Path(__file__).resolve().parent.parent.parent.joinpath( - 'test_data') -text_file = TEST_DATA_DIR.joinpath( - "Pegasus-sample/Pegasus_SVC4/logs/2020/XX/KC01/XX.KC01...D.2020.129") -binary_file = TEST_DATA_DIR.joinpath( - "Pegasus-sample/Pegasus_SVC4/soh/2020/XX/KC01/VDT.D/" - "XX.KC01..VDT.D.2020.129") - - -class TestReadText(TestCase): - def test_text_file(self): - ret = read_text(text_file) - expected_ret = ( - "\n\n** STATE OF HEALTH: XX.KC01...D.2020.129" - "\n2020-05-08 22:55:45.390 UTC: I(Initializations): Firmware") - self.assertEqual(ret[:100], expected_ret - ) - - def test_binary_file(self): - ret = read_text(binary_file) - self.assertIsNone(ret) - class TestRetrieveNetsFromDataDict(TestCase): def setUp(self): diff --git a/tests/test_model/test_reftek/test_packet_readers.py b/tests/test_model/test_reftek/test_packet_readers.py index 2235ea668cc999bb26b16b597b97e4e788dbc11a..175a61774eebc07d879ecbd1e9d48266728c0c9f 100644 --- a/tests/test_model/test_reftek/test_packet_readers.py +++ b/tests/test_model/test_reftek/test_packet_readers.py @@ -99,11 +99,11 @@ class TestReadDTPacket(unittest.TestCase): self.data = b' ' * 1000 uncompressed_patcher = patch( - 'sohstationviewer.model.reftek.reftek_reader.packet_readers.' + 'sohstationviewer.model.reftek_data.reftek_reader.packet_readers.' 'decode_uncompressed' ) compressed_patcher = patch( - 'sohstationviewer.model.reftek.reftek_reader.packet_readers.' + 'sohstationviewer.model.reftek_data.reftek_reader.packet_readers.' 'decode_compressed' ) self.mock_uncompressed = uncompressed_patcher.start() diff --git a/tests/test_model/test_reftek/test_reftek_helper.py b/tests/test_model/test_reftek/test_reftek_helper.py index 7fbbbbcc62a0b10b6edee4b69813d92fa292cef4..66a9089b3ac9334914f2a30cf73cfc798a305cb6 100644 --- a/tests/test_model/test_reftek/test_reftek_helper.py +++ b/tests/test_model/test_reftek/test_reftek_helper.py @@ -29,7 +29,7 @@ class TestReadRT130File(unittest.TestCase): ) eh_et_patcher = patch( - 'sohstationviewer.model.reftek.reftek_reader.reftek_helper.' + 'sohstationviewer.model.reftek_data.reftek_reader.reftek_reader_helper.' 'read_eh_et_packet', wraps=read_eh_et_packet ) @@ -37,7 +37,7 @@ class TestReadRT130File(unittest.TestCase): self.addCleanup(eh_et_patcher.stop) dt_patcher = patch( - 'sohstationviewer.model.reftek.reftek_reader.reftek_helper.' + 'sohstationviewer.model.reftek_data.reftek_reader.reftek_reader_helper.' 'read_dt_packet', wraps=read_dt_packet ) @@ -45,7 +45,7 @@ class TestReadRT130File(unittest.TestCase): self.addCleanup(dt_patcher.stop) soh_patcher = patch( - 'sohstationviewer.model.reftek.reftek_reader.reftek_helper.' + 'sohstationviewer.model.reftek_data.reftek_reader.reftek_reader_helper.' 'read_soh_packet', wraps=read_soh_packet )