From b6f0754406306054edb8f70d7016fbe8a38e2fa4 Mon Sep 17 00:00:00 2001
From: ldam <ldam@passcal.nmt.edu>
Date: Mon, 28 Aug 2023 13:36:15 -0600
Subject: [PATCH] fig bug due to changing name and moving functions around in
unittest
---
.../general_data/test_general_data_helper.py | 25 ++++++++++++++++++-
tests/model/mseed_data/test_mseed_helper.py | 25 +------------------
.../test_reftek/test_packet_readers.py | 4 +--
.../test_reftek/test_reftek_helper.py | 6 ++---
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/tests/model/general_data/test_general_data_helper.py b/tests/model/general_data/test_general_data_helper.py
index c82dc0ce7..275405f26 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 938092c62..e695b0edf 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 2235ea668..175a61774 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 7fbbbbcc6..66a9089b3 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
)
--
GitLab