Alpha tests diagnostics fda

server/src/threads.rs

@@ -138,6 +138,20 @@ impl <'a> SessionInfo<'a> {
             current_noqa: NoqaInfo::None,
         }
     }
+
+    /**
+     * Should only be used for tests, when sender is connected to the receiver, to verify messages that has been sent.
+     */
+    pub fn _consume_message(&self) -> Option<Message> {
+        match self.receiver.try_recv() {
+            Ok(msg) => Some(msg),
+            Err(TryRecvError::Empty) => None,
+            Err(TryRecvError::Disconnected) => {
+                error!("Session channel disconnected");
+                None
+            }
+        }
+    }
 }
 
 fn to_value<T: Serialize + std::fmt::Debug>(result: Result<Option<T>, ResponseError>) -> (Option<Value>, Option<ResponseError>) {

server/tests/data/python/diagnostics/ols01000.py

@@ -0,0 +1 @@
+def 

server/tests/data/python/diagnostics/ols01001.py

@@ -0,0 +1,6 @@
+
+class Test(a_class):
+    pass
+
+class Test2(Test):
+    pass

server/tests/data/python/diagnostics/ols01002.py

@@ -0,0 +1,7 @@
+Integer = 5
+
+class Test(Integer):
+    pass
+
+class Test2(Test):
+    pass

server/tests/data/python/diagnostics/ols01003.py

@@ -0,0 +1,12 @@
+if input():
+    class A:
+        pass
+else:
+    class A:
+        pass
+
+class Test(A):
+    pass
+
+class Test2(Test):
+    pass

server/tests/diagnostics/mod.rs

@@ -0,0 +1,5 @@
+
+pub mod ols01000;
+pub mod ols01001;
+pub mod ols01002;
+pub mod ols01003;

server/tests/diagnostics/ols01000.rs

@@ -0,0 +1,24 @@
+use std::env;
+
+use lsp_types::{DiagnosticSeverity, NumberOrString};
+use odoo_ls_server::{S, utils::PathSanitizer};
+
+use crate::setup::setup::*;
+
+#[test]
+fn test_ols01000() {
+    let mut odoo = setup_server(false);
+    let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01000.py").sanitize();
+    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    let diagnostics = get_diagnostics_for_path(&mut session, &path);
+    assert_eq!(diagnostics.len(), 1);
+    let diag = &diagnostics[0];
+    assert!(diag.code.is_some());
+    let code = match &diag.code {
+        Some(NumberOrString::String(code)) => code,
+        Some(NumberOrString::Number(num)) => panic!("Unexpected numeric code: {}", num),
+        None => panic!("Diagnostic code is None"),
+    };
+    assert!(code == &S!("OLS01000"));
+    assert!(diag.severity.is_some_and(|s| s == DiagnosticSeverity::ERROR));
+}

server/tests/diagnostics/ols01001.rs

@@ -0,0 +1,24 @@
+use std::env;
+
+use lsp_types::{DiagnosticSeverity, NumberOrString};
+use odoo_ls_server::{S, utils::PathSanitizer};
+
+use crate::setup::setup::*;
+
+#[test]
+fn test_ols01001() {
+    let mut odoo = setup_server(false);
+    let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01001.py").sanitize();
+    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    let diagnostics = get_diagnostics_for_path(&mut session, &path);
+    assert_eq!(diagnostics.len(), 1);
+    let diag = &diagnostics[0];
+    assert!(diag.code.is_some());
+    let code = match &diag.code {
+        Some(NumberOrString::String(code)) => code,
+        Some(NumberOrString::Number(num)) => panic!("Unexpected numeric code: {}", num),
+        None => panic!("Diagnostic code is None"),
+    };
+    assert!(code == &S!("OLS01001"));
+    assert!(diag.severity.is_some_and(|s| s == DiagnosticSeverity::WARNING));
+}

server/tests/diagnostics/ols01002.rs

@@ -0,0 +1,24 @@
+use std::env;
+
+use lsp_types::{DiagnosticSeverity, NumberOrString};
+use odoo_ls_server::{S, utils::PathSanitizer};
+
+use crate::setup::setup::*;
+
+#[test]
+fn test_ols01002() {
+    let mut odoo = setup_server(false);
+    let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01002.py").sanitize();
+    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    let diagnostics = get_diagnostics_for_path(&mut session, &path);
+    assert_eq!(diagnostics.len(), 1);
+    let diag = &diagnostics[0];
+    assert!(diag.code.is_some());
+    let code = match &diag.code {
+        Some(NumberOrString::String(code)) => code,
+        Some(NumberOrString::Number(num)) => panic!("Unexpected numeric code: {}", num),
+        None => panic!("Diagnostic code is None"),
+    };
+    assert!(code == &S!("OLS01002"));
+    assert!(diag.severity.is_some_and(|s| s == DiagnosticSeverity::WARNING));
+}

server/tests/diagnostics/ols01003.rs

@@ -0,0 +1,24 @@
+use std::env;
+
+use lsp_types::{DiagnosticSeverity, NumberOrString};
+use odoo_ls_server::{S, utils::PathSanitizer};
+
+use crate::setup::setup::*;
+
+#[test]
+fn test_ols01003() {
+    let mut odoo = setup_server(false);
+    let path = env::current_dir().unwrap().join("tests/data/python/diagnostics/ols01003.py").sanitize();
+    let mut session = prepare_custom_entry_point(&mut odoo, &path);
+    let diagnostics = get_diagnostics_for_path(&mut session, &path);
+    assert_eq!(diagnostics.len(), 1);
+    let diag = &diagnostics[0];
+    assert!(diag.code.is_some());
+    let code = match &diag.code {
+        Some(NumberOrString::String(code)) => code,
+        Some(NumberOrString::Number(num)) => panic!("Unexpected numeric code: {}", num),
+        None => panic!("Diagnostic code is None"),
+    };
+    assert!(code == &S!("OLS01003"));
+    assert!(diag.severity.is_some_and(|s| s == DiagnosticSeverity::WARNING));
+}

server/tests/mod.rs

@@ -1 +1,3 @@
-pub mod test_utils;
+pub mod test_utils;
+pub mod diagnostics;
+pub mod setup;

server/tests/setup/setup.rs

@@ -4,7 +4,10 @@ use std::{env, fs};
 use std::path::PathBuf;
 
 
-use lsp_types::TextDocumentContentChangeEvent;
+use lsp_server::Message;
+use lsp_types::{Diagnostic, PublishDiagnosticsParams, TextDocumentContentChangeEvent};
+use lsp_types::notification::{Notification, PublishDiagnostics};
+use odoo_ls_server::core::file_mgr::FileMgr;
 use odoo_ls_server::utils::get_python_command;
 use odoo_ls_server::{core::{config::{ConfigEntry, DiagMissingImportsMode}, entry_point::EntryPointMgr, odoo::SyncOdoo}, threads::SessionInfo, utils::PathSanitizer as _};
 
@@ -77,4 +80,23 @@ pub fn prepare_custom_entry_point<'a>(odoo: &'a mut SyncOdoo, path: &str) -> Ses
     EntryPointMgr::create_new_custom_entry_for_path(&mut session, &ep_path, &ep_path);
     SyncOdoo::process_rebuilds(&mut session, false);
     session
+}
+
+pub fn get_diagnostics_for_path(session: &mut SessionInfo, path: &str) -> Vec<Diagnostic> {
+    let mut res = vec![];
+    while let Some(msg) = session._consume_message() {
+        match msg {
+            Message::Notification(n) => {
+                if n.method == PublishDiagnostics::METHOD {
+                    let params: PublishDiagnosticsParams = serde_json::from_value(n.params).expect("Unable to parse PublishDiagnosticsParams");
+                    let params_path = FileMgr::uri2pathname(params.uri.as_str());
+                    if params_path == path {
+                        res.extend(params.diagnostics);
+                    }
+                }
+            },
+            _ => {}
+        }
+    }
+    return res;
 }