[IMP] refactor setup_server to capture msgs from session

mmahrouss · fda-odoo · commit ce49fed74b99 · 2025-11-24T11:46:17.000+01:00
diff --git a/server/tests/diagnostics/ols01000.rs b/server/tests/diagnostics/ols01000.rs
@@ -7,9 +7,10 @@ use crate::setup::setup::*;
 
 #[test]
 fn test_ols01000() {
-    let mut odoo = setup_server(false);
+    let (mut odoo, config) = setup_server(false);
+    let mut session = create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01000.py").sanitize();
-    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    prepare_custom_entry_point(&mut session, &path);
     let diagnostics = get_diagnostics_for_path(&mut session, &path);
     assert_eq!(diagnostics.len(), 1);
     let diag = &diagnostics[0];
diff --git a/server/tests/diagnostics/ols01001.rs b/server/tests/diagnostics/ols01001.rs
@@ -7,9 +7,10 @@ use crate::{setup::setup::*, test_utils::diag_on_line};
 
 #[test]
 fn test_ols01001() {
-    let mut odoo = setup_server(false);
+    let (mut odoo, config) = setup_server(false);
+    let mut session = create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01001.py").sanitize();
-    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    prepare_custom_entry_point(&mut session, &path);
     let diagnostics = get_diagnostics_for_path(&mut session, &path);
     let diagnostics = diag_on_line(&diagnostics, 1);
     assert_eq!(diagnostics.len(), 1);
diff --git a/server/tests/diagnostics/ols01002.rs b/server/tests/diagnostics/ols01002.rs
@@ -7,9 +7,10 @@ use crate::{setup::setup::*, test_utils::diag_on_line};
 
 #[test]
 fn test_ols01002() {
-    let mut odoo = setup_server(false);
+    let (mut odoo, config) = setup_server(false);
+    let mut session = create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01002.py").sanitize();
-    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    prepare_custom_entry_point(&mut session, &path);
     let diagnostics = get_diagnostics_for_path(&mut session, &path);
     let diagnostics = diag_on_line(&diagnostics, 2);
     assert_eq!(diagnostics.len(), 1);
diff --git a/server/tests/diagnostics/ols01003.rs b/server/tests/diagnostics/ols01003.rs
@@ -7,9 +7,10 @@ use crate::setup::setup::*;
 
 #[test]
 fn test_ols01003() {
-    let mut odoo = setup_server(false);
+    let (mut odoo, config) = setup_server(false);
+    let mut session = create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01003.py").sanitize();
-    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    prepare_custom_entry_point(&mut session, &path);
     let diagnostics = get_diagnostics_for_path(&mut session, &path);
     assert_eq!(diagnostics.len(), 1);
     let diag = &diagnostics[0];
diff --git a/server/tests/diagnostics/ols01004.rs b/server/tests/diagnostics/ols01004.rs
@@ -7,9 +7,10 @@ use crate::{setup::setup::*, test_utils::diag_on_line};
 
 #[test]
 fn test_ols01004() {
-    let mut odoo = setup_server(false);
+    let (mut odoo, config) = setup_server(false);
+    let mut session = create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01004.py").sanitize();
-    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    prepare_custom_entry_point(&mut session, &path);
     let diagnostics = get_diagnostics_for_path(&mut session, &path);
     assert_eq!(diagnostics.len(), 1);
     let diagnostics = diag_on_line(&diagnostics, 33);
diff --git a/server/tests/diagnostics/ols01005.rs b/server/tests/diagnostics/ols01005.rs
@@ -7,9 +7,10 @@ use crate::{setup::setup::*, test_utils::diag_on_line};
 
 #[test]
 fn test_ols01005() {
-    let mut odoo = setup_server(false);
+    let (mut odoo, config) = setup_server(false);
+    let mut session = create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01005.py").sanitize();
-    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    prepare_custom_entry_point(&mut session, &path);
     let diagnostics = get_diagnostics_for_path(&mut session, &path);
     assert_eq!(diagnostics.len(), 1);
     let diagnostics = diag_on_line(&diagnostics, 6);
diff --git a/server/tests/diagnostics/ols01006.rs b/server/tests/diagnostics/ols01006.rs
@@ -7,9 +7,10 @@ use crate::{setup::setup::*, test_utils::diag_on_line};
 
 #[test]
 fn test_ols01006() {
-    let mut odoo = setup_server(false);
+    let (mut odoo, config) = setup_server(false);
+    let mut session = create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01006.py").sanitize();
-    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    prepare_custom_entry_point(&mut session, &path);
     let diagnostics = get_diagnostics_for_path(&mut session, &path);
     assert_eq!(diagnostics.len(), 1);
     let diagnostics = diag_on_line(&diagnostics, 14);
diff --git a/server/tests/diagnostics/ols01007.rs b/server/tests/diagnostics/ols01007.rs
@@ -6,9 +6,10 @@ use crate::{setup::setup::*, test_utils::{verify_diagnostics_against_doc}};
 
 #[test]
 fn test_ols01007() {
-    let mut odoo = setup_server(false);
+    let (mut odoo, config) = setup_server(false);
+    let mut session = create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01007.py").sanitize();
-    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    prepare_custom_entry_point(&mut session, &path);
     let diagnostics = get_diagnostics_for_path(&mut session, &path);
     let doc_diags = get_diagnostics_test_comments(&mut session, &path);
     verify_diagnostics_against_doc(diagnostics, doc_diags);
diff --git a/server/tests/setup/setup.rs b/server/tests/setup/setup.rs
@@ -16,7 +16,7 @@ use tracing::{info, level_filters::LevelFilter};
 use tracing_appender::rolling::RollingFileAppender;
 use tracing_subscriber::{fmt, layer::SubscriberExt, FmtSubscriber};
 
-pub fn setup_server(with_odoo: bool) -> SyncOdoo {
+pub fn setup_server(with_odoo: bool) -> (SyncOdoo, ConfigEntry) {
 
     let file_appender = RollingFileAppender::builder()
         .max_log_files(20) // only the most recent 5 log files will be kept
@@ -56,32 +56,27 @@ pub fn setup_server(with_odoo: bool) -> SyncOdoo {
     };
     config.python_path = python_cmd;
     config.diag_missing_imports = DiagMissingImportsMode::All;
+    (server, config)
+}
 
+pub fn create_init_session<'a>(odoo: &'a mut SyncOdoo, config: ConfigEntry) -> SessionInfo<'a> {
     let (s, r) = crossbeam_channel::unbounded();
-    let mut session = SessionInfo::new_from_custom_channel(s, r, &mut server);
+    let mut session = SessionInfo::new_from_custom_channel(s.clone(), r.clone(), odoo);
     session.sync_odoo.test_mode = true;
     SyncOdoo::init(&mut session, config);
-
-    server
-}
-
-pub fn create_session(odoo: &mut SyncOdoo) -> SessionInfo {
-    let (s, r) = crossbeam_channel::unbounded();
-    SessionInfo::new_from_custom_channel(s.clone(), r.clone(), odoo)
+    session
 }
 
-pub fn prepare_custom_entry_point<'a>(odoo: &'a mut SyncOdoo, path: &str) -> SessionInfo<'a>{
-    let mut session = create_session(odoo);
+pub fn prepare_custom_entry_point(session: &mut SessionInfo, path: &str){
     let ep_path = PathBuf::from(path).sanitize();
     let text = fs::read_to_string(path).expect("unable to read provided path");
     let content = Some(vec![TextDocumentContentChangeEvent{
         range: None,
         range_length: None,
             text: text}]);
-    EntryPointMgr::create_new_custom_entry_for_path(&mut session, &ep_path, &ep_path);
-    let (file_updated, file_info) = session.sync_odoo.get_file_mgr().borrow_mut().update_file_info(&mut session, path, content.as_ref(), Some(1), false);
-    SyncOdoo::process_rebuilds(&mut session, false);
-    session
+    EntryPointMgr::create_new_custom_entry_for_path(session, &ep_path, &ep_path);
+    let (file_updated, file_info) = session.sync_odoo.get_file_mgr().borrow_mut().update_file_info(session, path, content.as_ref(), Some(1), false);
+    SyncOdoo::process_rebuilds(session, false);
 }
 
 pub fn get_diagnostics_for_path(session: &mut SessionInfo, path: &str) -> Vec<Diagnostic> {
diff --git a/server/tests/test_basics.rs b/server/tests/test_basics.rs
@@ -14,7 +14,8 @@ mod setup;
 #[test]
 fn test_no_main_entry() {
     /* First, let's launch the server. It will setup a SyncOdoo struct, with a SyncChannel, that we can use to get the messages that the client would receive. */
-    let odoo = setup::setup::setup_server(false);
+    let (mut odoo, config) = setup::setup::setup_server(false);
+    let _ = setup::setup::create_init_session(&mut odoo, config);
     assert!(!odoo.has_main_entry);
     assert!(!odoo.has_odoo_main_entry);
     assert!(odoo.entry_point_mgr.borrow().main_entry_point.is_none());
@@ -23,18 +24,20 @@ fn test_no_main_entry() {
 
 #[test]
 fn test_custom_entry_point() {
-    let mut odoo = setup::setup::setup_server(false);
+    let (mut odoo, config) = setup::setup::setup_server(false);
+    let mut session = setup::setup::create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/expressions/assign.py");
-    let session = setup::setup::prepare_custom_entry_point(&mut odoo, path.sanitize().as_str());
+    setup::setup::prepare_custom_entry_point(&mut session, path.sanitize().as_str());
     assert!(odoo.entry_point_mgr.borrow().custom_entry_points.len() == 1);
 }
 
 
 #[test]
 fn test_assigns() {
-    let mut odoo = setup::setup::setup_server(false);
+    let (mut odoo, config) = setup::setup::setup_server(false);
+    let mut session = setup::setup::create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/expressions/assign.py").sanitize();
-    let session = setup::setup::prepare_custom_entry_point(&mut odoo, path.as_str());
+    setup::setup::prepare_custom_entry_point(&mut session, path.as_str());
     assert!(session.sync_odoo.entry_point_mgr.borrow().custom_entry_points.len() == 1);
     let a = session.sync_odoo.get_symbol(path.as_str(), &(vec![], vec![Sy!("a")]), u32::MAX);
     assert!(a.len() == 1);
@@ -145,9 +148,10 @@ fn test_assigns() {
 
 #[test]
 fn test_sections() {
-    let mut odoo = setup::setup::setup_server(false);
+    let (mut odoo, config) = setup::setup::setup_server(false);
+    let mut session = setup::setup::create_init_session(&mut odoo, config);
     let path = env::current_dir().unwrap().join("tests/data/python/expressions/sections.py").sanitize();
-    let session = setup::setup::prepare_custom_entry_point(&mut odoo, path.as_str());
+    setup::setup::prepare_custom_entry_point(&mut session, path.as_str());
     assert!(session.sync_odoo.entry_point_mgr.borrow().custom_entry_points.len() == 1);
 
     let assert_get_int_eval_values = |var_name: &str, values: HashSet<i32>|{
diff --git a/server/tests/test_get_symbol.rs b/server/tests/test_get_symbol.rs
@@ -13,12 +13,12 @@ mod test_utils;
 #[test]
 fn test_hover_on_model_field_and_method() {
     // Setup server and session with test addons
-    let mut odoo = setup::setup::setup_server(true);
+    let (mut odoo, config) = setup::setup::setup_server(true);
     let test_addons_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests").join("data").join("addons");
     let test_file = test_addons_path.join("module_1").join("models").join("base_test_models.py").sanitize();
     // Ensure the test file exists
     assert!(PathBuf::from(&test_file).exists(), "Test file does not exist: {}", test_file);
-    let mut session = setup::setup::create_session(&mut odoo);
+    let mut session = setup::setup::create_init_session(&mut odoo, config);
 
     // Use Lazy value for partner and country class names
     let partner_class_name = test_utils::PARTNER_CLASS_NAME(session.sync_odoo.full_version.as_str());
@@ -157,15 +157,15 @@ fn test_definition() {
     let odoo_path = PathBuf::from(odoo_path).sanitize();
     let odoo_path = odoo_path.as_str();
 
-    let mut odoo = setup::setup::setup_server(true);
+    let (mut odoo, config) = setup::setup::setup_server(true);
     let test_addons_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests").join("data").join("addons");
     let module1_test_file = test_addons_path.join("module_1").join("models").join("base_test_models.py").sanitize();
     let module2_test_file = test_addons_path.join("module_2").join("models").join("base_test_models.py").sanitize();
 
     // Ensure the test file exists
     assert!(PathBuf::from(&module1_test_file).exists(), "Test file does not exist: {}", module1_test_file);
     assert!(PathBuf::from(&module2_test_file).exists(), "Test file does not exist: {}", module1_test_file);
-    let mut session = setup::setup::create_session(&mut odoo);
+    let mut session = setup::setup::create_init_session(&mut odoo, config);
 
     // Use Lazy value for partner and Country class names
     let partner_class_name = test_utils::PARTNER_CLASS_NAME(session.sync_odoo.full_version.as_str());
diff --git a/server/tests/test_ls.rs b/server/tests/test_ls.rs
@@ -14,7 +14,8 @@ mod setup;
 #[test]
 fn test_structure() {
     /* First, let's launch the server. It will setup a SyncOdoo struct, with a SyncChannel, that we can use to get the messages that the client would receive. */
-    let odoo = setup::setup::setup_server(true);
+    let (mut odoo, config) = setup::setup::setup_server(true);
+    let _ = setup::setup::create_init_session(&mut odoo, config);
 
     let odoo_path = env::var("COMMUNITY_PATH").unwrap();
     let odoo_path = PathBuf::from(odoo_path).sanitize();
diff --git a/server/tests/test_setup.rs b/server/tests/test_setup.rs
@@ -20,7 +20,8 @@ fn test_setup() {
 #[test]
 fn test_start_odoo_server() {
     /* First, let's launch the server. It will setup a SyncOdoo struct, with a SyncChannel, that we can use to get the messages that the client would receive. */
-    let odoo = setup::setup::setup_server(true);
+    let (mut odoo, config) = setup::setup::setup_server(true);
+    let _ = setup::setup::create_init_session(&mut odoo, config);
 
     let odoo_path = PathBuf::from(env::var("COMMUNITY_PATH").unwrap()).sanitize();
 
