#2887 - Resolve conflicts from merge

tests/integration_tests/configuration_file_parsing/test_software_fixing_duration.py

@@ -13,8 +13,8 @@ from primaite.simulator.system.services.database.database_service import Databas
 from primaite.simulator.system.services.dns.dns_client import DNSClient
 from tests import TEST_ASSETS_ROOT
 
-TEST_CONFIG = TEST_ASSETS_ROOT / "configs/software_fix_duration.yaml"
-ONE_ITEM_CONFIG = TEST_ASSETS_ROOT / "configs/fix_duration_one_item.yaml"
+TEST_CONFIG = TEST_ASSETS_ROOT / "configs/software_fixing_duration.yaml"
+ONE_ITEM_CONFIG = TEST_ASSETS_ROOT / "configs/fixing_duration_one_item.yaml"
 
 TestApplications = ["DummyApplication", "BroadcastTestClient"]
 
@@ -27,27 +27,27 @@ def load_config(config_path: Union[str, Path]) -> PrimaiteGame:
     return PrimaiteGame.from_config(cfg)
 
 
-def test_default_fix_duration():
-    """Test that software with no defined fix duration in config uses the default fix duration of 2."""
+def test_default_fixing_duration():
+    """Test that software with no defined fixing duration in config uses the default fixing duration of 2."""
     game = load_config(TEST_CONFIG)
     client_2: Computer = game.simulation.network.get_node_by_hostname("client_2")
 
     database_client: DatabaseClient = client_2.software_manager.software.get("DatabaseClient")
-    assert database_client.fixing_duration == 2
+    assert database_client.config.fixing_duration == 2
 
     dns_client: DNSClient = client_2.software_manager.software.get("DNSClient")
-    assert dns_client.fixing_duration == 2
+    assert dns_client.config.fixing_duration == 2
 
 
-def test_fix_duration_set_from_config():
-    """Test to check that the fix duration set for applications and services works as intended."""
+def test_fixing_duration_set_from_config():
+    """Test to check that the fixing duration set for applications and services works as intended."""
     game = load_config(TEST_CONFIG)
     client_1: Computer = game.simulation.network.get_node_by_hostname("client_1")
 
     # in config - services take 3 timesteps to fix
     for service in ["DNSClient", "DNSServer", "DatabaseService", "WebServer", "FTPClient", "FTPServer", "NTPServer"]:
         assert client_1.software_manager.software.get(service) is not None
-        assert client_1.software_manager.software.get(service).fixing_duration == 3
+        assert client_1.software_manager.software.get(service).config.fixing_duration == 3
 
     # in config - applications take 1 timestep to fix
     # remove test applications from list
@@ -55,27 +55,27 @@ def test_fix_duration_set_from_config():
 
     for application in ["RansomwareScript", "WebBrowser", "DataManipulationBot", "DoSBot", "DatabaseClient"]:
         assert client_1.software_manager.software.get(application) is not None
-        assert client_1.software_manager.software.get(application).fixing_duration == 1
+        assert client_1.software_manager.software.get(application).config.fixing_duration == 1
 
 
-def test_fix_duration_for_one_item():
-    """Test that setting fix duration for one application does not affect other components."""
+def test_fixing_duration_for_one_item():
+    """Test that setting fixing duration for one application does not affect other components."""
     game = load_config(ONE_ITEM_CONFIG)
     client_1: Computer = game.simulation.network.get_node_by_hostname("client_1")
 
     # in config - services take 3 timesteps to fix
     for service in ["DNSClient", "DNSServer", "WebServer", "FTPClient", "FTPServer", "NTPServer"]:
         assert client_1.software_manager.software.get(service) is not None
-        assert client_1.software_manager.software.get(service).fixing_duration == 2
+        assert client_1.software_manager.software.get(service).config.fixing_duration == 2
 
     # in config - applications take 1 timestep to fix
     # remove test applications from list
     for applications in ["RansomwareScript", "WebBrowser", "DataManipulationBot", "DoSBot"]:
         assert client_1.software_manager.software.get(applications) is not None
-        assert client_1.software_manager.software.get(applications).fixing_duration == 2
+        assert client_1.software_manager.software.get(applications).config.fixing_duration == 2
 
     database_client: DatabaseClient = client_1.software_manager.software.get("DatabaseClient")
-    assert database_client.fixing_duration == 1
+    assert database_client.config.fixing_duration == 1
 
     database_service: DatabaseService = client_1.software_manager.software.get("DatabaseService")
-    assert database_service.fixing_duration == 5
+    assert database_service.config.fixing_duration == 5