Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 41 additions & 0 deletions bazel-jdt-bridge/crates/bazel-aspect/src/ide_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,45 @@ mod tests {
fn test_platforms_returns_none() {
assert_eq!(canonical_to_apparent_label("@@platforms//cpu:cpu"), None);
}

use super::ArtifactLocation;

#[test]
fn test_best_path_prefers_absolute_path() {
let loc = ArtifactLocation {
absolute_path: Some("/execroot/ws/external/maven/v1/lib.jar".to_string()),
root_path: Some("external/maven/v1".to_string()),
relative_path: Some("lib.jar".to_string()),
..Default::default()
};
assert_eq!(
loc.best_path(),
Some("/execroot/ws/external/maven/v1/lib.jar".to_string())
);
}

#[test]
fn test_best_path_falls_back_to_root_plus_relative() {
let loc = ArtifactLocation {
absolute_path: None,
root_path: Some("bazel-out/k8-fastbuild/bin".to_string()),
relative_path: Some("app/libapp.jar".to_string()),
..Default::default()
};
assert_eq!(
loc.best_path(),
Some("bazel-out/k8-fastbuild/bin/app/libapp.jar".to_string())
);
}

#[test]
fn test_best_path_relative_only() {
let loc = ArtifactLocation {
absolute_path: None,
root_path: None,
relative_path: Some("src/Main.java".to_string()),
..Default::default()
};
assert_eq!(loc.best_path(), Some("src/Main.java".to_string()));
}
}
51 changes: 51 additions & 0 deletions bazel-jdt-bridge/crates/bazel-aspect/src/text_proto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1050,4 +1050,55 @@ deps {
Some("bazel-out/bin/foo/bar-src.jar")
);
}

#[test]
fn test_parse_absolute_path_in_artifact_location() {
let input = r#"
label: "//app:app"
kind_string: "java_library"
java_ide_info {
jars {
jar {
relative_path: "lib.jar"
root_path: "external/maven/v1"
absolute_path: "external/maven/v1/lib.jar"
is_source: false
is_external: true
}
}
}
"#;
let result = parse_text_proto(input);
let jar_loc = &result.value.java_info.as_ref().unwrap().jars[0].jar;
assert_eq!(
jar_loc.absolute_path.as_deref(),
Some("external/maven/v1/lib.jar")
);
assert_eq!(jar_loc.relative_path.as_deref(), Some("lib.jar"));
assert_eq!(jar_loc.root_path.as_deref(), Some("external/maven/v1"));
}

#[test]
fn test_parse_legacy_no_absolute_path() {
let input = r#"
label: "//app:app"
kind_string: "java_library"
java_ide_info {
jars {
jar {
relative_path: "lib.jar"
root_path: "external/maven/v1"
is_source: false
}
}
}
"#;
let result = parse_text_proto(input);
let jar_loc = &result.value.java_info.as_ref().unwrap().jars[0].jar;
assert!(
jar_loc.absolute_path.is_none(),
"Legacy output without absolute_path should parse as None"
);
assert_eq!(jar_loc.relative_path.as_deref(), Some("lib.jar"));
}
}
Loading
Loading