From ab6e5dcb2f655ac94a2a7085efd870abe89c7e5c Mon Sep 17 00:00:00 2001 From: madrigal Date: Mon, 15 Dec 2025 15:59:48 -0500 Subject: [PATCH] Updated imports to reflect new file structure --- tests/ria_toolkit_oss_cli/test_capture.py | 24 ++++----- tests/ria_toolkit_oss_cli/test_common.py | 2 +- tests/ria_toolkit_oss_cli/test_convert.py | 2 +- tests/ria_toolkit_oss_cli/test_generate.py | 2 +- tests/ria_toolkit_oss_cli/test_split.py | 2 +- tests/ria_toolkit_oss_cli/test_transmit.py | 62 +++++++++++----------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/tests/ria_toolkit_oss_cli/test_capture.py b/tests/ria_toolkit_oss_cli/test_capture.py index 63386fd..1cdd583 100644 --- a/tests/ria_toolkit_oss_cli/test_capture.py +++ b/tests/ria_toolkit_oss_cli/test_capture.py @@ -10,7 +10,7 @@ import pytest import yaml from click.testing import CliRunner -from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture import ( +from ria_toolkit_oss_cli.ria_toolkit_oss.capture import ( auto_select_device, capture, get_sdr_device, @@ -58,7 +58,7 @@ class TestAutoSelectDevice: """Test auto-select with no devices found.""" from click.exceptions import ClickException - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover: mock_discover.return_value = [] with pytest.raises(ClickException) as exc_info: @@ -68,7 +68,7 @@ class TestAutoSelectDevice: def test_auto_select_single_device(self): """Test auto-select with single device.""" - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover: mock_discover.return_value = [{"type": "HackRF", "serial": "123456"}] device_type = auto_select_device(quiet=True) @@ -77,8 +77,8 @@ class TestAutoSelectDevice: def test_auto_select_single_device_with_warning(self): """Test auto-select shows warning when not quiet.""" with ( - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover, - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.click.echo") as mock_echo, + patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover, + patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.click.echo") as mock_echo, ): mock_discover.return_value = [{"type": "PlutoSDR", "uri": "ip:pluto.local"}] @@ -93,7 +93,7 @@ class TestAutoSelectDevice: """Test auto-select with multiple devices raises error.""" from click.exceptions import ClickException - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover: mock_discover.return_value = [ {"type": "HackRF", "serial": "123456"}, {"type": "PlutoSDR", "uri": "ip:pluto.local"}, @@ -106,7 +106,7 @@ class TestAutoSelectDevice: def test_auto_select_device_name_mapping(self): """Test device name mapping.""" - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.list_all_devices") as mock_discover: # Test various device name formats test_cases = [ ("PlutoSDR", "pluto"), @@ -128,7 +128,7 @@ class TestSaveVisualization: """Test successful visualization save.""" mock_recording = MagicMock() - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.view_simple_sig") as mock_view: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.view_simple_sig") as mock_view: save_visualization(mock_recording, "test.png", quiet=True) mock_view.assert_called_once_with( @@ -141,10 +141,10 @@ class TestSaveVisualization: with ( patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.view_simple_sig", + "ria_toolkit_oss_cli.ria_toolkit_oss.capture.view_simple_sig", side_effect=ImportError("Module not found"), ), - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.click.echo") as mock_echo, + patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.click.echo") as mock_echo, ): save_visualization(mock_recording, "test.png", quiet=True) @@ -159,10 +159,10 @@ class TestSaveVisualization: with ( patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.view_simple_sig", + "ria_toolkit_oss_cli.ria_toolkit_oss.capture.view_simple_sig", side_effect=Exception("Failed to plot"), ), - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.capture.click.echo") as mock_echo, + patch("ria_toolkit_oss_cli.ria_toolkit_oss.capture.click.echo") as mock_echo, ): save_visualization(mock_recording, "test.png", quiet=True) diff --git a/tests/ria_toolkit_oss_cli/test_common.py b/tests/ria_toolkit_oss_cli/test_common.py index cc58e88..78d00c1 100644 --- a/tests/ria_toolkit_oss_cli/test_common.py +++ b/tests/ria_toolkit_oss_cli/test_common.py @@ -6,7 +6,7 @@ import tempfile import pytest import yaml -from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.common import ( +from ria_toolkit_oss_cli.ria_toolkit_oss.common import ( format_frequency, format_sample_rate, load_yaml_config, diff --git a/tests/ria_toolkit_oss_cli/test_convert.py b/tests/ria_toolkit_oss_cli/test_convert.py index f5528cc..8e5a4a4 100644 --- a/tests/ria_toolkit_oss_cli/test_convert.py +++ b/tests/ria_toolkit_oss_cli/test_convert.py @@ -7,7 +7,7 @@ from pathlib import Path import pytest from click.testing import CliRunner -from ria_toolkit_oss.ria_toolkit_oss_cli.cli import cli +from ria_toolkit_oss_cli.cli import cli class TestConvert: diff --git a/tests/ria_toolkit_oss_cli/test_generate.py b/tests/ria_toolkit_oss_cli/test_generate.py index 65742a6..68d252c 100644 --- a/tests/ria_toolkit_oss_cli/test_generate.py +++ b/tests/ria_toolkit_oss_cli/test_generate.py @@ -16,7 +16,7 @@ from pathlib import Path import pytest from click.testing import CliRunner -from ria_toolkit_oss.ria_toolkit_oss_cli.cli import cli +from ria_toolkit_oss_cli.cli import cli class TestGenerateCommandBasics: diff --git a/tests/ria_toolkit_oss_cli/test_split.py b/tests/ria_toolkit_oss_cli/test_split.py index 102afcf..d2487c4 100644 --- a/tests/ria_toolkit_oss_cli/test_split.py +++ b/tests/ria_toolkit_oss_cli/test_split.py @@ -9,7 +9,7 @@ from click.testing import CliRunner from ria_toolkit_oss.datatypes import Annotation, Recording from ria_toolkit_oss.io import load_recording, to_sigmf -from ria_toolkit_oss.ria_toolkit_oss_cli.cli import cli +from ria_toolkit_oss_cli.cli import cli class TestSplitHelp: diff --git a/tests/ria_toolkit_oss_cli/test_transmit.py b/tests/ria_toolkit_oss_cli/test_transmit.py index 2089816..100968a 100644 --- a/tests/ria_toolkit_oss_cli/test_transmit.py +++ b/tests/ria_toolkit_oss_cli/test_transmit.py @@ -8,8 +8,8 @@ import numpy as np import pytest from click.testing import CliRunner -from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.common import get_sdr_device -from ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit import ( +from ria_toolkit_oss_cli.ria_toolkit_oss.common import get_sdr_device +from ria_toolkit_oss_cli.ria_toolkit_oss.transmit import ( auto_select_tx_device, check_sample_rate_mismatch, load_input_file, @@ -59,12 +59,12 @@ class TestAutoSelectTxDevice: from click.exceptions import ClickException with ( - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"), - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]), - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[]), - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[]), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[]), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[]), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[] + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[] ), ): @@ -76,15 +76,15 @@ class TestAutoSelectTxDevice: def test_auto_select_single_device(self): """Test auto-select with single TX device.""" with ( - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"), - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]), - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[]), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[]), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[{"type": "HackRF One", "serial": "123456"}], ), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[] + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[] ), ): @@ -96,18 +96,18 @@ class TestAutoSelectTxDevice: from click.exceptions import ClickException with ( - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"), - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[]), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[{"type": "PlutoSDR", "uri": "ip:pluto.local"}], ), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[{"type": "HackRF One", "serial": "123456"}], ), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[] + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[] ), ): @@ -128,18 +128,18 @@ class TestAutoSelectTxDevice: for device_name, expected_type in test_cases: with ( - patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"), + patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_sdr_drivers"), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[] + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_uhd_devices", return_value=[] ), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[] + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_pluto_devices", return_value=[] ), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[] + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_hackrf_devices", return_value=[] ), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.find_bladerf_devices", return_value=[{"type": device_name}], ), ): @@ -169,7 +169,7 @@ class TestLoadInputFile: mock_recording = MagicMock() with patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_recording", + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_recording", return_value=mock_recording, ): recording = load_input_file(test_file, legacy=False) @@ -187,7 +187,7 @@ class TestLoadInputFile: mock_recording = MagicMock() with patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.from_npy_legacy", + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.from_npy_legacy", return_value=mock_recording, ): recording = load_input_file(test_file, legacy=True) @@ -205,7 +205,7 @@ class TestLoadInputFile: try: with patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_recording", + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_recording", side_effect=Exception("Unsupported format"), ): with pytest.raises(ClickException) as exc_info: @@ -281,7 +281,7 @@ class TestCheckSampleRateMismatch: mock_recording = MagicMock() mock_recording.metadata = {"sample_rate": 2e6} - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.click.echo") as mock_echo: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.click.echo") as mock_echo: check_sample_rate_mismatch(mock_recording, 2e6, quiet=False) mock_echo.assert_not_called() @@ -290,7 +290,7 @@ class TestCheckSampleRateMismatch: mock_recording = MagicMock() mock_recording.metadata = {"sample_rate": 1e6} - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.click.echo") as mock_echo: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.click.echo") as mock_echo: check_sample_rate_mismatch(mock_recording, 2e6, quiet=False) mock_echo.assert_called_once() args = str(mock_echo.call_args) @@ -302,7 +302,7 @@ class TestCheckSampleRateMismatch: mock_recording = MagicMock() mock_recording.metadata = {"sample_rate": 1e6} - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.click.echo") as mock_echo: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.click.echo") as mock_echo: check_sample_rate_mismatch(mock_recording, 2e6, quiet=True) mock_echo.assert_not_called() @@ -311,7 +311,7 @@ class TestCheckSampleRateMismatch: mock_recording = MagicMock() mock_recording.metadata = None - with patch("ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.click.echo") as mock_echo: + with patch("ria_toolkit_oss_cli.ria_toolkit_oss.transmit.click.echo") as mock_echo: check_sample_rate_mismatch(mock_recording, 2e6, quiet=False) mock_echo.assert_not_called() @@ -343,10 +343,10 @@ class TestTransmitCommand: with ( patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.get_sdr_device", return_value=mock_sdr + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.get_sdr_device", return_value=mock_sdr ), patch( - "ria_toolkit_oss.ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_input_file", + "ria_toolkit_oss_cli.ria_toolkit_oss.transmit.load_input_file", return_value=mock_recording, ), ):