Move setup utilities into common module to share between test modules

Author: davidsteiner

crates/hotfix/tests/common/mod.rs

@@ -1,4 +1,5 @@
 pub mod mock_application;
 pub mod mock_counterparty;
 pub mod session_assertions;
+pub mod setup;
 pub mod test_messages;

crates/hotfix/tests/common/setup.rs

@@ -0,0 +1,47 @@
+use crate::common::mock_application::MockApplication;
+use crate::common::mock_counterparty::MockCounterparty;
+use crate::common::test_messages::TestMessage;
+use hotfix::application::ApplicationRef;
+use hotfix::config::SessionConfig;
+use hotfix::session::SessionRef;
+use hotfix::store::in_memory::InMemoryMessageStore;
+
+pub const HEARTBEAT_INTERVAL: u64 = 30;
+
+pub async fn setup() -> (SessionRef<TestMessage>, MockCounterparty<TestMessage>) {
+    let config = create_session_config();
+    let counterparty_config = create_counterparty_session_config(config.clone());
+
+    let application_ref = ApplicationRef::new(MockApplication {});
+    let message_store = InMemoryMessageStore::default();
+
+    let session = SessionRef::new(config, application_ref, message_store);
+    let mock_counterparty = MockCounterparty::start(session.clone(), counterparty_config).await;
+
+    (session, mock_counterparty)
+}
+
+pub fn create_session_config() -> SessionConfig {
+    SessionConfig {
+        begin_string: "FIX.4.4".to_string(),
+        sender_comp_id: "dummy-initiator".to_string(),
+        target_comp_id: "dummy-acceptor".to_string(),
+        data_dictionary_path: None,
+        connection_host: "".to_string(),
+        connection_port: 0,
+        tls_config: None,
+        heartbeat_interval: HEARTBEAT_INTERVAL,
+        reconnect_interval: 30,
+        reset_on_logon: false,
+        schedule: None,
+    }
+}
+
+/// Create a session configuration for the counterparty from our configuration.
+pub fn create_counterparty_session_config(session_config: SessionConfig) -> SessionConfig {
+    SessionConfig {
+        sender_comp_id: session_config.target_comp_id.clone(),
+        target_comp_id: session_config.sender_comp_id.clone(),
+        ..session_config
+    }
+}

crates/hotfix/tests/session_test_cases/heartbeat_tests.rs

@@ -1,16 +1,9 @@
-use crate::common::mock_application::MockApplication;
-use crate::common::mock_counterparty::MockCounterparty;
 use crate::common::session_assertions::SessionAssertions;
-use crate::common::test_messages::TestMessage;
-use hotfix::application::ApplicationRef;
-use hotfix::config::SessionConfig;
-use hotfix::session::{SessionRef, Status};
-use hotfix::store::in_memory::InMemoryMessageStore;
+use crate::common::setup::{HEARTBEAT_INTERVAL, setup};
+use hotfix::session::Status;
 use hotfix_message::Part;
 use hotfix_message::fix44::MSG_TYPE;
 
-const HEARTBEAT_INTERVAL: u64 = 30;
-
 /// Tests the automatic heartbeat mechanism in an active FIX session:
 /// 1. Establishes a session by exchanging logon messages with the counterparty
 /// 2. Advances time beyond the configured heartbeat interval
@@ -88,41 +81,3 @@ async fn test_peer_timeout() {
     tokio::time::advance(std::time::Duration::from_secs(peer_interval)).await;
     mock_counterparty.assert_disconnected().await;
 }
-
-async fn setup() -> (SessionRef<TestMessage>, MockCounterparty<TestMessage>) {
-    let config = create_session_config();
-    let counterparty_config = create_counterparty_session_config(config.clone());
-
-    let application_ref = ApplicationRef::new(MockApplication {});
-    let message_store = InMemoryMessageStore::default();
-
-    let session = SessionRef::new(config, application_ref, message_store);
-    let mock_counterparty = MockCounterparty::start(session.clone(), counterparty_config).await;
-
-    (session, mock_counterparty)
-}
-
-fn create_session_config() -> SessionConfig {
-    SessionConfig {
-        begin_string: "FIX.4.4".to_string(),
-        sender_comp_id: "dummy-initiator".to_string(),
-        target_comp_id: "dummy-acceptor".to_string(),
-        data_dictionary_path: None,
-        connection_host: "".to_string(),
-        connection_port: 0,
-        tls_config: None,
-        heartbeat_interval: HEARTBEAT_INTERVAL,
-        reconnect_interval: 30,
-        reset_on_logon: false,
-        schedule: None,
-    }
-}
-
-/// Create a session configuration for the counterparty from our configuration.
-fn create_counterparty_session_config(session_config: SessionConfig) -> SessionConfig {
-    SessionConfig {
-        sender_comp_id: session_config.target_comp_id.clone(),
-        target_comp_id: session_config.sender_comp_id.clone(),
-        ..session_config
-    }
-}