Skip to content
Snippets Groups Projects
Commit 92eb67b6 authored by Erin (Josh) Rigler's avatar Erin (Josh) Rigler
Browse files

Fix SNCL-related unit tests:

- LegacySNCL's get_channel() now requires `data_type` argument
- For some reason, specifying a location code was intended to behave differently than specifying a `data_type` in SNCL.py. I can't imagine why, but I basically reverted a change made several years ago in commit 4fab9678 when I recently forced 'variation' and 'R?' to be treated the same way by SNCL.py.
parent fb354997
No related branches found
No related tags found
1 merge request!400Minor miscellaneous fixes
...@@ -113,17 +113,17 @@ def test_element(): ...@@ -113,17 +113,17 @@ def test_element():
def test_get_channel(): def test_get_channel():
"""edge_test.LegacySNCL_test.test_get_channel()""" """edge_test.LegacySNCL_test.test_get_channel()"""
assert get_channel(element="D", interval="second") == "SVD" assert get_channel(element="D", interval="second", data_type="variation") == "SVD"
assert get_channel(element="F", interval="minute") == "MSF" assert get_channel(element="F", interval="minute", data_type="variation") == "MSF"
assert get_channel(element="H", interval="hour") == "HVH" assert get_channel(element="H", interval="hour", data_type="variation") == "HVH"
assert get_channel(element="E-E", interval="day") == "DQE" assert get_channel(element="E-E", interval="day", data_type="variation") == "DQE"
assert get_channel(element="E-N", interval="minute") == "MQN" assert get_channel(element="E-N", interval="minute", data_type="variation") == "MQN"
assert get_channel(element="SQ", interval="minute") == "MSQ" assert get_channel(element="SQ", interval="minute", data_type="variation") == "MSQ"
assert get_channel(element="SV", interval="minute") == "MSV" assert get_channel(element="SV", interval="minute", data_type="variation") == "MSV"
assert get_channel(element="UK1", interval="minute") == "UK1" assert get_channel(element="UK1", interval="minute", data_type="variation") == "UK1"
assert get_channel(element="DIST", interval="minute") == "MDT" assert get_channel(element="DIST", interval="minute", data_type="variation") == "MDT"
assert get_channel(element="DST", interval="minute") == "MGD" assert get_channel(element="DST", interval="minute", data_type="variation") == "MGD"
assert get_channel(element="UK1.R0", interval="minute") == "UK1" assert get_channel(element="UK1.R0", interval="minute", data_type="variation") == "UK1"
def test_get_location(): def test_get_location():
......
...@@ -153,11 +153,11 @@ def test_get_channel(): ...@@ -153,11 +153,11 @@ def test_get_channel():
assert get_channel(element="V", interval="hour", data_type="variation") == "RFV" assert get_channel(element="V", interval="hour", data_type="variation") == "RFV"
assert get_channel(element="W", interval="hour", data_type="variation") == "RFW" assert get_channel(element="W", interval="hour", data_type="variation") == "RFW"
assert get_channel(element="H", interval="hour", data_type="variation") == "RFU" assert get_channel(element="H", interval="hour", data_type="variation") == "RFU"
assert get_channel(element="H", interval="hour", data_type="R0") == "RFH" assert get_channel(element="H", interval="hour", data_type="R0") == "RFU"
assert get_channel(element="E", interval="hour", data_type="variation") == "RFV" assert get_channel(element="E", interval="hour", data_type="variation") == "RFV"
assert get_channel(element="E", interval="hour", data_type="R0") == "RFE" assert get_channel(element="E", interval="hour", data_type="R0") == "RFV"
assert get_channel(element="Z", interval="hour", data_type="variation") == "RFW" assert get_channel(element="Z", interval="hour", data_type="variation") == "RFW"
assert get_channel(element="Z", interval="hour", data_type="R0") == "RFZ" assert get_channel(element="Z", interval="hour", data_type="R0") == "RFW"
# not variation data_type, test that H,Z is not converted to U,V # not variation data_type, test that H,Z is not converted to U,V
assert get_channel(element="H", interval="hour", data_type="adjusted") == "RFH" assert get_channel(element="H", interval="hour", data_type="adjusted") == "RFH"
assert get_channel(element="H", interval="hour", data_type="A0") == "RFH" assert get_channel(element="H", interval="hour", data_type="A0") == "RFH"
...@@ -229,7 +229,7 @@ def test_get_sncl(): ...@@ -229,7 +229,7 @@ def test_get_sncl():
) == SNCL(station="BOU", network="NT", channel="LFU", location="R0") ) == SNCL(station="BOU", network="NT", channel="LFU", location="R0")
assert SNCL.get_sncl( assert SNCL.get_sncl(
station="BOU", data_type="R0", interval="second", element="H" station="BOU", data_type="R0", interval="second", element="H"
) == SNCL(station="BOU", network="NT", channel="LFH", location="R0") ) == SNCL(station="BOU", network="NT", channel="LFU", location="R0")
assert SNCL.get_sncl( assert SNCL.get_sncl(
station="BOU", data_type="A0", interval="second", element="H" station="BOU", data_type="A0", interval="second", element="H"
) == SNCL(station="BOU", network="NT", channel="LFH", location="A0") ) == SNCL(station="BOU", network="NT", channel="LFH", location="A0")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment