move some test data file

Signed-off-by: he1pa <[email protected]>
kcl-lang · Nov 20, 2024 · 5e0736c · 5e0736c
1 parent 92e86aa
commit 5e0736c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/kclvm/tools/src/LSP/src/document_symbol.rs b/kclvm/tools/src/LSP/src/document_symbol.rs
@@ -171,7 +171,7 @@ mod tests {
     #[test]
     #[bench_test]
     fn document_symbol_test() {
-        let (file, _, _, gs) = compile_test_file("src/test_data/document_symbol.k");
+        let (file, _, _, gs) = compile_test_file("src/test_data/document_symbol/document_symbol.k");
 
         let mut res = document_symbol(file.as_str(), &gs).unwrap();
         let mut expect = vec![];

diff --git a/kclvm/tools/src/LSP/src/quick_fix.rs b/kclvm/tools/src/LSP/src/quick_fix.rs
@@ -177,7 +177,12 @@ mod tests {
     fn quick_fix_test() {
         let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
         let test_file = path.clone();
-        let test_file = test_file.join("src").join("test_data").join("quick_fix.k");
+        let test_file = test_file
+            .join("src")
+            .join("test_data")
+            .join("code_action")
+            .join("quick_fix")
+            .join("quick_fix.k");
         let file = test_file.to_str().unwrap();
 
         let diags = compile_with_params(Params {

diff --git a/...ols/src/LSP/src/test_data/load_pkg_test.k → ...ata/code_action/quick_fix/load_pkg_test.k b/...ols/src/LSP/src/test_data/load_pkg_test.k → ...ata/code_action/quick_fix/load_pkg_test.k
diff --git a/...m/tools/src/LSP/src/test_data/quick_fix.k → ...st_data/code_action/quick_fix/quick_fix.k b/...m/tools/src/LSP/src/test_data/quick_fix.k → ...st_data/code_action/quick_fix/quick_fix.k
diff --git a/...tools/src/LSP/src/test_data/diagnostics.k → ...P/src/test_data/diagnostics/diagnostics.k b/...tools/src/LSP/src/test_data/diagnostics.k → ...P/src/test_data/diagnostics/diagnostics.k
diff --git a/kclvm/tools/src/LSP/src/test_data/diagnostics/load_pkg_test.k b/kclvm/tools/src/LSP/src/test_data/diagnostics/load_pkg_test.k
@@ -0,0 +1,2 @@
+schema Person:
+    age: int
diff --git a/...s/src/LSP/src/test_data/document_symbol.k → ...st_data/document_symbol/document_symbol.k b/...s/src/LSP/src/test_data/document_symbol.k → ...st_data/document_symbol/document_symbol.k
diff --git a/kclvm/tools/src/LSP/src/tests.rs b/kclvm/tools/src/LSP/src/tests.rs
@@ -244,7 +244,7 @@ fn build_lsp_diag(
 fn build_expect_diags() -> Vec<Diagnostic> {
     let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     let mut test_file = path.clone();
-    test_file.push("src/test_data/diagnostics.k");
+    test_file.push("src/test_data/diagnostics/diagnostics.k");
     let file = test_file.to_str().unwrap();
     let expected_diags: Vec<Diagnostic> = vec![
         build_lsp_diag(
@@ -267,7 +267,7 @@ fn build_expect_diags() -> Vec<Diagnostic> {
         build_lsp_diag(
             (0, 0, 0, 10),
             format!(
-                "Cannot find the module abc from {}/src/test_data/abc",
+                "Cannot find the module abc from {}/src/test_data/diagnostics/abc",
                 path.to_str().unwrap()
             ),
             Some(DiagnosticSeverity::ERROR),
@@ -332,7 +332,7 @@ fn build_expect_diags() -> Vec<Diagnostic> {
 fn diagnostics_test() {
     let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     let mut test_file = path.clone();
-    test_file.push("src/test_data/diagnostics.k");
+    test_file.push("src/test_data/diagnostics/diagnostics.k");
     let file = test_file.to_str().unwrap();
 
     let diags = compile_with_params(Params {
@@ -350,6 +350,7 @@ fn diagnostics_test() {
         .collect::<Vec<Diagnostic>>();
 
     let expected_diags: Vec<Diagnostic> = build_expect_diags();
+
     for (get, expected) in diagnostics.iter().zip(expected_diags.iter()) {
         assert_eq!(get, expected)
     }
@@ -764,7 +765,7 @@ fn notification_test() {
     let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     let mut path = root.clone();
 
-    path.push("src/test_data/diagnostics.k");
+    path.push("src/test_data/diagnostics/diagnostics.k");
 
     let path = path.to_str().unwrap();
     let src = std::fs::read_to_string(path).unwrap();
@@ -783,7 +784,7 @@ fn notification_test() {
     );
 
     // Wait for first "textDocument/publishDiagnostics" notification
-    server.wait_for_message_cond(2, &|msg: &Message| match msg {
+    server.wait_for_message_cond(1, &|msg: &Message| match msg {
         Message::Notification(not) => not.method == "textDocument/publishDiagnostics",
         _ => false,
     });
@@ -817,7 +818,7 @@ fn close_file_test() {
     let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     let mut path = root.clone();
 
-    path.push("src/test_data/diagnostics.k");
+    path.push("src/test_data/diagnostics/diagnostics.k");
 
     let path = path.to_str().unwrap();
     let src = std::fs::read_to_string(path).unwrap();