From f28d8da3a1cf031d655449446671640616e411cd Mon Sep 17 00:00:00 2001 From: l0ng-ai <24760907+l0ng-ai@users.noreply.github.com> Date: Fri, 30 Oct 2026 10:06:24 +0800 Subject: [PATCH] test(gradle): build expected launcher paths from path segments The expected paths joined "/bin" as one segment, which mixes separators on Windows. --- crates/ide-host/src/ops/build.rs | 5 ++++- crates/ide-sdk/src/tests.rs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/ide-host/src/ops/build.rs b/crates/ide-host/src/ops/build.rs index 2ee567f3..0a0f3a93 100644 --- a/crates/ide-host/src/ops/build.rs +++ b/crates/ide-host/src/ops/build.rs @@ -291,7 +291,10 @@ mod gradle_settings_tests { let model = load(root, &root.join("cache"), &settings).gradle.unwrap(); assert_eq!( model.command, - root.join("gradle-install/bin").join(if cfg!(windows) { "gradle.bat" } else { "gradle" }).to_string_lossy() + root.join("gradle-install") + .join("bin") + .join(if cfg!(windows) { "gradle.bat" } else { "gradle" }) + .to_string_lossy() ); assert_eq!(model.env["JAVA_HOME"], root.join("jdk21").to_string_lossy()); assert_eq!(model.env["GRADLE_USER_HOME"], root.join("user-home").to_string_lossy()); diff --git a/crates/ide-sdk/src/tests.rs b/crates/ide-sdk/src/tests.rs index eede589e..92fda6da 100644 --- a/crates/ide-sdk/src/tests.rs +++ b/crates/ide-sdk/src/tests.rs @@ -724,7 +724,7 @@ fn gradle_settings_precedence() { for local in [false, true] { settings.languages.java.gradle.distribution = if local { GradleDistribution::Local } else { GradleDistribution::Wrapper }; - let expected = if local { root.join("local-gradle/bin").join(plain) } else { plain.into() }; + let expected = if local { root.join("local-gradle").join("bin").join(plain) } else { plain.into() }; for explicit_java in [false, true] { for is_test in [false, true] { let mut configs =