add tests for different types of ships

Author: jsurrea

antares-python/src/antares/cli.py

@@ -122,7 +122,6 @@ def add_ship(  # noqa: PLR0913
 
     except (ValidationError, ValueError, TypeError) as e:
         handle_error(f"Invalid ship parameters: {e}", code=2, json_output=json_output)
-        return
 
     try:
         client.add_ship(ship)

antares-python/tests/client/test_client.py

@@ -1,7 +1,7 @@
 import pytest
 
 from antares.client import AntaresClient
-from antares.models.ship import ShipConfig
+from antares.models.ship import StationaryShip
 
 
 def test_reset_simulation_delegates(mocker):
@@ -14,7 +14,7 @@ def test_reset_simulation_delegates(mocker):
 def test_add_ship_delegates(mocker):
     mock_add = mocker.patch("antares.client.rest.RestClient.add_ship")
     client = AntaresClient(base_url="http://localhost")
-    ship = ShipConfig(initial_position=(1.0, 2.0))
+    ship = StationaryShip(initial_position=(1.0, 2.0))
     client.add_ship(ship)
     mock_add.assert_called_once_with(ship)
 

antares-python/tests/client/test_rest.py

@@ -3,7 +3,7 @@
 
 from antares.client.rest import RestClient
 from antares.errors import ConnectionError, ShipConfigError, SimulationError
-from antares.models.ship import ShipConfig
+from antares.models.ship import CircleShip, LineShip, RandomShip
 
 
 def test_reset_simulation_success(mocker):
@@ -24,7 +24,7 @@ def test_reset_simulation_failure(mocker):
 def test_add_ship_success(mocker):
     mock_request = httpx.Request("POST", "http://localhost/simulation/ships")
     mock_post = mocker.patch("httpx.post", return_value=httpx.Response(200, request=mock_request))
-    ship = ShipConfig(initial_position=(0, 0))
+    ship = LineShip(initial_position=(0, 0), angle=0, speed=1)
     client = RestClient(base_url="http://localhost")
     client.add_ship(ship)
     mock_post.assert_called_once()
@@ -40,7 +40,7 @@ def test_add_ship_invalid_response(mocker):
             request=mock_request,
         ),
     )
-    ship = ShipConfig(initial_position=(0, 0))
+    ship = CircleShip(initial_position=(0, 0), radius=1, speed=1)
     client = RestClient(base_url="http://localhost")
     with pytest.raises(ShipConfigError):
         client.add_ship(ship)
@@ -75,7 +75,7 @@ def test_add_ship_request_error(mocker):
         ),
     )
 
-    ship = ShipConfig(initial_position=(0, 0))
+    ship = RandomShip(initial_position=(0, 0), max_speed=1)
     client = RestClient(base_url="http://localhost")
 
     with pytest.raises(ConnectionError) as exc:

antares-python/tests/test_cli.py

@@ -32,11 +32,95 @@ def test_cli_reset(mocker, fake_config):
     mock_reset.assert_called_once()
 
 
-def test_cli_add_ship(mocker, fake_config):
+def test_cli_add_stationary_ship_success(mocker, fake_config):
     mock_add = mocker.patch("antares.client.rest.RestClient.add_ship")
-    result = runner.invoke(app, ["add-ship", "--x", "5.0", "--y", "6.0", "--config", fake_config])
+
+    result = runner.invoke(
+        app,
+        ["add-ship", "--type", "stationary", "--x", "5.0", "--y", "6.0", "--config", fake_config],
+    )
+
+    assert result.exit_code == 0
+    assert "Added stationary ship at (5.0, 6.0)" in result.output
+    mock_add.assert_called_once()
+
+
+def test_cli_add_line_ship_success(mocker, fake_config):
+    mock_add = mocker.patch("antares.client.rest.RestClient.add_ship")
+
+    result = runner.invoke(
+        app,
+        [
+            "add-ship",
+            "--type",
+            "line",
+            "--x",
+            "10.0",
+            "--y",
+            "20.0",
+            "--angle",
+            "0.5",
+            "--speed",
+            "3.0",
+            "--config",
+            fake_config,
+        ],
+    )
+
+    assert result.exit_code == 0
+    assert "Added line ship at (10.0, 20.0)" in result.output
+    mock_add.assert_called_once()
+
+
+def test_cli_add_circle_ship_success(mocker, fake_config):
+    mock_add = mocker.patch("antares.client.rest.RestClient.add_ship")
+
+    result = runner.invoke(
+        app,
+        [
+            "add-ship",
+            "--type",
+            "circle",
+            "--x",
+            "30.0",
+            "--y",
+            "40.0",
+            "--radius",
+            "15.0",
+            "--speed",
+            "2.5",
+            "--config",
+            fake_config,
+        ],
+    )
+
+    assert result.exit_code == 0
+    assert "Added circle ship at (30.0, 40.0)" in result.output
+    mock_add.assert_called_once()
+
+
+def test_cli_add_random_ship_success(mocker, fake_config):
+    mock_add = mocker.patch("antares.client.rest.RestClient.add_ship")
+
+    result = runner.invoke(
+        app,
+        [
+            "add-ship",
+            "--type",
+            "random",
+            "--x",
+            "0.0",
+            "--y",
+            "0.0",
+            "--max-speed",
+            "12.0",
+            "--config",
+            fake_config,
+        ],
+    )
+
     assert result.exit_code == 0
-    assert "Added ship at (5.0, 6.0)" in result.output
+    assert "Added random ship at (0.0, 0.0)" in result.output
     mock_add.assert_called_once()
 
 
@@ -82,12 +166,121 @@ def test_cli_add_ship_error_handling(mocker, fake_config):
     mocker.patch(
         "antares.client.rest.RestClient.add_ship", side_effect=SimulationError("ship rejected")
     )
-    result = runner.invoke(app, ["add-ship", "--x", "1", "--y", "2", "--config", fake_config])
+
+    result = runner.invoke(
+        app,
+        ["add-ship", "--type", "stationary", "--x", "1", "--y", "2", "--config", fake_config],
+    )
+
     expected_exit_code = 2
     assert result.exit_code == expected_exit_code
     assert "ship rejected" in result.output
 
 
+def test_cli_add_ship_invalid_type(mocker, fake_config):
+    result = runner.invoke(
+        app,
+        [
+            "add-ship",
+            "--type",
+            "invalid_type",
+            "--x",
+            "10.0",
+            "--y",
+            "20.0",
+            "--config",
+            fake_config,
+        ],
+    )
+
+    expected_exit_code = 2
+    assert result.exit_code == expected_exit_code
+    assert "Invalid ship type" in result.output
+
+
+def test_cli_add_stationary_ship_missing_args(fake_config):
+    result = runner.invoke(
+        app,
+        [
+            "add-ship",
+            "--type",
+            "stationary",
+            "--x",
+            "5.0",
+            "--config",
+            fake_config,
+        ],
+    )
+
+    expected_exit_code = 2
+    assert result.exit_code == expected_exit_code
+
+
+def test_cli_add_line_ship_missing_args(fake_config):
+    result = runner.invoke(
+        app,
+        [
+            "add-ship",
+            "--type",
+            "line",
+            "--x",
+            "10.0",
+            "--y",
+            "20.0",
+            "--config",
+            fake_config,
+        ],
+    )
+
+    expected_exit_code = 2
+    assert result.exit_code == expected_exit_code
+    assert "Invalid ship parameters" in result.output
+
+
+def test_cli_add_circle_missing_radius(mocker, fake_config):
+    result = runner.invoke(
+        app,
+        [
+            "add-ship",
+            "--type",
+            "circle",
+            "--x",
+            "10.0",
+            "--y",
+            "20.0",
+            "--speed",
+            "2.0",
+            "--config",
+            fake_config,
+        ],
+    )
+
+    expected_exit_code = 2
+    assert result.exit_code == expected_exit_code
+    assert "Invalid ship parameters" in result.output
+
+
+def test_cli_add_random_missing_max_speed(mocker, fake_config):
+    result = runner.invoke(
+        app,
+        [
+            "add-ship",
+            "--type",
+            "random",
+            "--x",
+            "0.0",
+            "--y",
+            "0.0",
+            "--config",
+            fake_config,
+        ],
+    )
+
+    expected_exit_code = 2
+    assert result.exit_code == expected_exit_code
+    assert "Invalid ship parameters" in result.output
+
+
 def test_cli_subscribe_error(monkeypatch, fake_config):
     class FailingAsyncGenerator:
         def __aiter__(self):