microsoft · T-256 · Jun 12, 2024 · Jun 12, 2024 · karthiknadig · Jun 12, 2024
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -141,7 +141,7 @@ jobs:
         run: python -m generator --plugin testdata
 
       - name: Rust Run Tests
-        run: cargo test --manifest-path tests/rust/Cargo.toml
+        run: cargo test --manifest-path pacakges/rust/lsprotocol/Cargo.toml
         shell: bash
         env:
           LSP_TEST_DATA_PATH: ${{ github.workspace }}/packages/testdata

diff --git a/generator/plugins/python/utils.py b/generator/plugins/python/utils.py
@@ -33,7 +33,7 @@ def customizations(spec: model.LSPModel) -> model.LSPModel:
     return spec
 
 
-def generate_from_spec(spec: model.LSPModel, output_dir: str, test_dir: str) -> None:
+def generate_from_spec(spec: model.LSPModel, output_dir: str, _test_dir: str) -> None:
     spec = customizations(spec)
     code = TypesCodeGenerator(spec).get_code()
 

diff --git a/generator/plugins/rust/rust_utils.py b/generator/plugins/rust/rust_utils.py
@@ -33,7 +33,7 @@ def generate_from_spec(spec: model.LSPModel, output_dir: str, test_dir: str) ->
         (output_path / file_name).write_text(code[file_name], encoding="utf-8")
 
     # update tests if exists
-    test_path = pathlib.Path(test_dir) / "src" / "main.rs"
+    test_path = pathlib.Path(output_dir) / "src" / "test.rs"
     if test_path.exists():
         generate_test_code(spec, test_path)
 

diff --git a/noxfile.py b/noxfile.py
@@ -27,6 +27,7 @@ def tests(session: nox.Session):
 
     session.log("Running tests: generator and generated Python code.")
     session.run("pytest", "./tests")
+    session.run("pytest", "./packages/python/tests")
 
 
 @nox.session()

diff --git a/tests/dotnet/lsprotocol_tests/.gitignore → packages/dotnet/lsprotocol_tests/.gitignore b/tests/dotnet/lsprotocol_tests/.gitignore → packages/dotnet/lsprotocol_tests/.gitignore
diff --git a/tests/dotnet/lsprotocol_tests/LSPTests.cs → packages/dotnet/lsprotocol_tests/LSPTests.cs b/tests/dotnet/lsprotocol_tests/LSPTests.cs → packages/dotnet/lsprotocol_tests/LSPTests.cs
diff --git a/tests/dotnet/lsprotocol_tests/Usings.cs → packages/dotnet/lsprotocol_tests/Usings.cs b/tests/dotnet/lsprotocol_tests/Usings.cs → packages/dotnet/lsprotocol_tests/Usings.cs
diff --git a/.../lsprotocol_tests/lsprotocol_tests.csproj → .../lsprotocol_tests/lsprotocol_tests.csproj b/.../lsprotocol_tests/lsprotocol_tests.csproj → .../lsprotocol_tests/lsprotocol_tests.csproj
diff --git a/packages/python/pyproject.toml b/packages/python/pyproject.toml
@@ -35,7 +35,7 @@ Issues = "https://github.com/microsoft/lsprotocol/issues"
 Source = "https://github.com/microsoft/lsprotocol"
 
 [tool.flit.sdist]
-include = ["lsprotocol/", "README.md", "LICENSE"]
+include = ["lsprotocol/", "tests/", "README.md", "LICENSE"]
 exclude = ["lsprotocol/__pycache__/", "requirements.in", "requirements.txt"]
 
 [tool.mypy]

diff --git a/tests/python/__init__.py → packages/python/tests/__init__.py b/tests/python/__init__.py → packages/python/tests/__init__.py
diff --git a/tests/python/common/jsonrpc.py → packages/python/tests/common/jsonrpc.py b/tests/python/common/jsonrpc.py → packages/python/tests/common/jsonrpc.py
diff --git a/tests/python/notifications/test_exit.py → ...s/python/tests/notifications/test_exit.py b/tests/python/notifications/test_exit.py → ...s/python/tests/notifications/test_exit.py
diff --git a/tests/python/notifications/test_progress.py → ...thon/tests/notifications/test_progress.py b/tests/python/notifications/test_progress.py → ...thon/tests/notifications/test_progress.py
diff --git a/...python/requests/test_initilize_request.py → .../tests/requests/test_initilize_request.py b/...python/requests/test_initilize_request.py → .../tests/requests/test_initilize_request.py
diff --git a/...quests/test_inlay_hint_resolve_request.py → ...quests/test_inlay_hint_resolve_request.py b/...quests/test_inlay_hint_resolve_request.py → ...quests/test_inlay_hint_resolve_request.py
diff --git a/.../test_workspace_sematic_tokens_refresh.py → .../test_workspace_sematic_tokens_refresh.py b/.../test_workspace_sematic_tokens_refresh.py → .../test_workspace_sematic_tokens_refresh.py
diff --git a/...equests/test_workspace_symbols_request.py → ...equests/test_workspace_symbols_request.py b/...equests/test_workspace_symbols_request.py → ...equests/test_workspace_symbols_request.py
diff --git a/tests/python/test_cattrs_special_cases.py → ...python/tests/test_cattrs_special_cases.py b/tests/python/test_cattrs_special_cases.py → ...python/tests/test_cattrs_special_cases.py
diff --git a/tests/python/test_custom_validators.py → ...es/python/tests/test_custom_validators.py b/tests/python/test_custom_validators.py → ...es/python/tests/test_custom_validators.py
diff --git a/tests/python/test_enums.py → packages/python/tests/test_enums.py b/tests/python/test_enums.py → packages/python/tests/test_enums.py
diff --git a/tests/python/test_generated_data.py → packages/python/tests/test_generated_data.py b/tests/python/test_generated_data.py → packages/python/tests/test_generated_data.py
diff --git a/tests/python/test_import.py → packages/python/tests/test_import.py b/tests/python/test_import.py → packages/python/tests/test_import.py
diff --git a/tests/python/test_location.py → packages/python/tests/test_location.py b/tests/python/test_location.py → packages/python/tests/test_location.py
diff --git a/tests/python/test_position.py → packages/python/tests/test_position.py b/tests/python/test_position.py → packages/python/tests/test_position.py
diff --git a/tests/python/test_range.py → packages/python/tests/test_range.py b/tests/python/test_range.py → packages/python/tests/test_range.py
diff --git a/packages/rust/lsprotocol/Cargo.toml b/packages/rust/lsprotocol/Cargo.toml
@@ -14,6 +14,7 @@ keywords = ["lsp"]
 proposed=[]
 
 [dependencies]
+glob = "0.3.1"
 serde = {version ="1.0.152", features = ["derive"]}
 serde_json = "1.0.93"
 serde_repr = "0.1.10"

diff --git a/tests/rust/src/main.rs → packages/rust/lsprotocol/src/test.rs b/tests/rust/src/main.rs → packages/rust/lsprotocol/src/test.rs
@@ -4,7 +4,7 @@
 #[cfg(test)]
 mod tests {
     use glob::glob;
-    use lsprotocol::*;
+    use super::*;
     use serde::Deserialize;
     use std::fs;
 
@@ -355,7 +355,7 @@ mod tests {
         println!("Running generated data tests");
         let cwd = std::env::current_dir()
             .unwrap()
-            .join("../../packages/testdata");
+            .join("../../../../generator/plugins/testdata");
         let env_value = std::env::var("LSP_TEST_DATA_PATH")
             .unwrap_or_else(|_| cwd.to_str().unwrap().to_string());
         println!("TEST_DATA_ROOT: {}", env_value);
@@ -364,11 +364,3 @@ mod tests {
         }
     }
 }
-
-fn main() {
-    // Use data from test error report here to debug
-    // let json_data = "";
-
-    // Update the type here to debug
-    // serde_json::from_str::<lsprotocol::TextDocumentCompletionRequest>(json_data).unwrap();
-}
diff --git a/tests/rust/Cargo.toml b/tests/rust/Cargo.toml
diff --git a/tests/generator/test_model.py → tests/test_model.py b/tests/generator/test_model.py → tests/test_model.py
diff --git a/tests/generator/test_schema.py → tests/test_schema.py b/tests/generator/test_schema.py → tests/test_schema.py
@@ -6,7 +6,7 @@
 
 import jsonschema
 
-lsp_json_path = pathlib.Path(__file__).parent.parent.parent / "generator" / "lsp.json"
+lsp_json_path = pathlib.Path(__file__).parent.parent / "generator" / "lsp.json"
 lsp_schema_path = lsp_json_path.parent / "lsp.schema.json"