diff --git a/plio/data/data.db b/plio/data/data.db index c1ac0e7c5802a4222a93a6ab400dc3dbc454aeb0..09fc46d99adf6d88099df74c72033a853cc3e8eb 100644 Binary files a/plio/data/data.db and b/plio/data/data.db differ diff --git a/plio/io/isis_serial_number.py b/plio/io/isis_serial_number.py index 0c187abff1a0ea0fbe70fe3781dca7fc092f035f..01f8fb7d3d0b5256fea5c7c99a21e4de31fecbe6 100644 --- a/plio/io/isis_serial_number.py +++ b/plio/io/isis_serial_number.py @@ -82,6 +82,7 @@ def generate_serial_number(label): # Sort the keys to ensure proper iteration order keys = sorted(translation.keys()) + for k in keys: try: group = translation[k] diff --git a/plio/io/tests/test_isis_serial_numbers.py b/plio/io/tests/test_isis_serial_numbers.py index 8abf3227fa9f5c98904fbf3348911c58f3d0eeb2..2cd68907e17432dc2a72f9a315102a51e025b76d 100644 --- a/plio/io/tests/test_isis_serial_numbers.py +++ b/plio/io/tests/test_isis_serial_numbers.py @@ -1,17 +1,24 @@ import os import sys -import unittest -from plio.examples import get_path - -sys.path.insert(0, os.path.abspath('..')) +import pytest from plio.io import isis_serial_number +from plio.examples import get_path + +@pytest.fixture +def apollo_lbl(): + return get_path('Test_PVL.lbl') +@pytest.fixture +def ctx_lbl(): + return get_path('ctx.pvl') -class TestIsisSerials(unittest.TestCase): +@pytest.mark.parametrize("label, expected", [(apollo_lbl(), 'APOLLO15/METRIC/1971-07-31T14:02:27.179'), + (ctx_lbl(),'MRO/CTX/0906095311:038') + ]) +def test_generate_serial_number(label, expected): + serial = isis_serial_number.generate_serial_number(label) + assert serial == expected - def test_generate_serial_number(self): - label = get_path('Test_PVL.lbl') - serial = isis_serial_number.generate_serial_number(label) - self.assertEqual('APOLLO15/METRIC/1971-07-31T14:02:27.179', serial) \ No newline at end of file + \ No newline at end of file