Skip to content

Use a global test client for all unit tests #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 8, 2025
Merged

Use a global test client for all unit tests #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
03ee2cc
Gather test utilities into a single `test/` folder
DavisVaughan Jan 7, 2025
8f25d2d
Only register capabilities if the client supports at least one
DavisVaughan Jan 7, 2025
31774f1
Return comparable `Id`s, and add `initialized()` support
DavisVaughan Jan 7, 2025
335266d
Move initialization/shutdown test to integration test
DavisVaughan Jan 7, 2025
6217f2a
Use a single global test client in all unit tests
DavisVaughan Jan 7, 2025
07398e0
Enforce single tracing subscriber even during tests
DavisVaughan Jan 7, 2025
64feef0
Remove `--test-threads 1` from CI
DavisVaughan Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/test-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,4 @@ jobs:
env:
AIR_LOG_LEVEL: trace
# `--nocapture` to see our own `tracing` logs
# `--test-threads 1` to ensure `tracing` logs aren't interleaved
run: cargo test -- --nocapture --test-threads 1
run: cargo test -- --nocapture
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's nice to make CI and local testing more consistent.

3 changes: 1 addition & 2 deletions .github/workflows/test-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ jobs:
env:
AIR_LOG_LEVEL: trace
# `--nocapture` to see our own `tracing` logs
# `--test-threads 1` to ensure `tracing` logs aren't interleaved
run: cargo test -- --nocapture --test-threads 1
run: cargo test -- --nocapture
3 changes: 1 addition & 2 deletions .github/workflows/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ jobs:
env:
AIR_LOG_LEVEL: trace
# `--nocapture` to see our own `tracing` logs
# `--test-threads 1` to ensure `tracing` logs aren't interleaved
run: cargo test -- --nocapture --test-threads 1
run: cargo test -- --nocapture
2 changes: 1 addition & 1 deletion crates/lsp/src/documents.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl Document {

#[cfg(test)]
pub fn doodle_and_range(contents: &str) -> (Self, biome_text_size::TextRange) {
let (contents, range) = crate::test_utils::extract_marked_range(contents);
let (contents, range) = crate::test::extract_marked_range(contents);
let doc = Self::new(contents, None, PositionEncoding::Utf8);
(doc, range)
}
Expand Down
11 changes: 7 additions & 4 deletions crates/lsp/src/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,13 @@ pub(crate) async fn handle_initialized(
registrations.push(watch_air_toml_registration);
}

client
.register_capability(registrations)
.instrument(span.exit())
.await?;
if !registrations.is_empty() {
client
.register_capability(registrations)
.instrument(span.exit())
.await?;
}

Ok(())
}

Expand Down
Loading
Loading