#1816 - Fixed tests. Used node and link added number (id) in observation space.

tests/integration_tests/system/test_database_on_node.py

@@ -21,6 +21,34 @@ def test_database_client_server_connection(uc2_network):
     assert len(db_service.connections) == 0
 
 
+def test_database_client_server_correct_password(uc2_network):
+    web_server: Server = uc2_network.get_node_by_hostname("web_server")
+    db_client: DatabaseClient = web_server.software_manager.software["DatabaseClient"]
+
+    db_server: Server = uc2_network.get_node_by_hostname("database_server")
+    db_service: DatabaseService = db_server.software_manager.software["DatabaseService"]
+    db_service.password = "12345"
+
+    assert len(db_service.connections) == 0
+
+    assert db_client.connect(server_ip_address=IPv4Address("192.168.1.14"), password="12345")
+    assert len(db_service.connections) == 1
+
+
+def test_database_client_server_incorrect_password(uc2_network):
+    web_server: Server = uc2_network.get_node_by_hostname("web_server")
+    db_client: DatabaseClient = web_server.software_manager.software["DatabaseClient"]
+
+    db_server: Server = uc2_network.get_node_by_hostname("database_server")
+    db_service: DatabaseService = db_server.software_manager.software["DatabaseService"]
+    db_service.password = "12345"
+
+    assert len(db_service.connections) == 0
+
+    assert not db_client.connect(server_ip_address=IPv4Address("192.168.1.14"), password="54321")
+    assert len(db_service.connections) == 0
+
+
 def test_database_client_query(uc2_network):
     """Tests DB query across the network returns HTTP status 200 and date."""
     web_server: Server = uc2_network.get_node_by_hostname("web_server")

tests/unit_tests/_primaite/_simulator/_system/_services/_red_services/test_data_manipulator_service.py

@@ -12,9 +12,9 @@ def test_creation():
 
     client_1: Node = network.get_node_by_hostname("client_1")
 
-    client_1.software_manager.add_service(service_class=DataManipulatorService)
+    client_1.software_manager.install(service_class=DataManipulatorService)
 
-    data_manipulator_service: DataManipulatorService = client_1.software_manager.services["DataManipulatorBot"]
+    data_manipulator_service: DataManipulatorService = client_1.software_manager.software["DataManipulatorBot"]
 
     assert data_manipulator_service.name == "DataManipulatorBot"
     assert data_manipulator_service.port == Port.POSTGRES_SERVER

tests/unit_tests/_primaite/_simulator/_system/_services/test_database.py

@@ -5,55 +5,14 @@ import pytest
 from primaite.simulator.network.hardware.base import Node
 from primaite.simulator.system.services.database_service import DatabaseService
 
-DDL = """
-CREATE TABLE IF NOT EXISTS user (
-id INTEGER PRIMARY KEY AUTOINCREMENT,
-name VARCHAR(50) NOT NULL,
-email VARCHAR(50) NOT NULL,
-age INT,
-city VARCHAR(50),
-occupation VARCHAR(50)
-);"""
-
-USER_INSERT_STATEMENTS = [
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('John Doe', 'johndoe@example.com', 32, 'New York', 'Engineer');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Jane Smith', 'janesmith@example.com', 27, 'Los Angeles', 'Designer');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Bob Johnson', 'bobjohnson@example.com', 45, 'Chicago', 'Manager');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Alice Lee', 'alicelee@example.com', 22, 'San Francisco', 'Student');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('David Kim', 'davidkim@example.com', 38, 'Houston', 'Consultant');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Emily Chen', 'emilychen@example.com', 29, 'Seattle', 'Software Developer');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Frank Wang', 'frankwang@example.com', 55, 'New York', 'Entrepreneur');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Grace Park', 'gracepark@example.com', 31, 'Los Angeles', 'Marketing Specialist');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Henry Wu', 'henrywu@example.com', 40, 'Chicago', 'Accountant');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Isabella Kim', 'isabellakim@example.com', 26, 'San Francisco', 'Graphic Designer');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Jake Lee', 'jakelee@example.com', 33, 'Houston', 'Sales Manager');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Kelly Chen', 'kellychen@example.com', 28, 'Seattle', 'Web Developer');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Lucas Liu', 'lucasliu@example.com', 42, 'New York', 'Lawyer');",
-    "INSERT INTO user (name, email, age, city, occupation) VALUES ('Maggie Wang', 'maggiewang@example.com', 30, 'Los Angeles', 'Data Analyst');",
-]
-
 
 @pytest.fixture(scope="function")
 def database_server() -> Node:
     node = Node(hostname="db_node")
-    node.software_manager.add_service(DatabaseService)
-    node.software_manager.services["Database"].start()
+    node.software_manager.install(DatabaseService)
+    node.software_manager.software["DatabaseService"].start()
     return node
 
 
-@pytest.fixture(scope="function")
-def database(database_server) -> DatabaseService:
-    database: DatabaseService = database_server.software_manager.services["Database"]  # noqa
-    database.receive(DDL, None)
-    for script in USER_INSERT_STATEMENTS:
-        database.receive(script, None)
-    return database
-
-
 def test_creation(database_server):
     database_server.software_manager.show()
-
-
-def test_db_population(database):
-    database.show()
-    assert database.tables() == ["user"]