Merge pull request #2708 from ludovic111/refactor/cut-model-library-test
🤖 Agent: verify passed. A test move only: the item_render error-order check goes from model_library's test to item_render's tests, cutting model_library -> item_render (step A of the cycle plan). pr_ready --quick green (1316 tests). Ready to merge.
This commit is contained in:
@@ -796,6 +796,33 @@ pub fn cluster_poses(state: &ItemRenderState, pose: Mat4, amount: u32, seed: i64
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// A bad item model surfaces only once items.json has loaded, so a broken
|
||||
/// items.json still reports itself first.
|
||||
#[test]
|
||||
fn item_model_errors_wait_for_the_item_definitions() -> crate::Result<()> {
|
||||
let root =
|
||||
std::env::temp_dir().join(format!("horizon-item-model-errors-{}", std::process::id()));
|
||||
let model = root.join("assets/horizon/models/INVALID.json");
|
||||
fs::create_dir_all(model.parent().unwrap())?;
|
||||
fs::write(model, "{}")?;
|
||||
let library = crate::model_library::ParsedModels::load(&root).into_item_library();
|
||||
assert!(library.is_err());
|
||||
fs::write(root.join("items.json"), "{")?;
|
||||
let load = || {
|
||||
ItemRenderer::load_with_library(&root, library.clone())
|
||||
.err()
|
||||
.unwrap()
|
||||
.to_string()
|
||||
};
|
||||
let broken_items = load();
|
||||
fs::write(root.join("items.json"), "{}")?;
|
||||
let bad_model = load();
|
||||
let _ = fs::remove_dir_all(&root);
|
||||
assert!(!broken_items.starts_with("item models:"));
|
||||
assert!(bad_model.starts_with("item models:"));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rendered_amounts_follow_the_count_bands() {
|
||||
let bands: Vec<u32> = [0, 1, 2, 16, 17, 32, 33, 48, 49, 64]
|
||||
|
||||
@@ -232,18 +232,7 @@ mod tests {
|
||||
.block_library(&fixture.0, vec!["horizon:nested/child".into()])
|
||||
.is_ok()
|
||||
);
|
||||
let library = parsed.into_item_library();
|
||||
assert!(library.is_err());
|
||||
fs::write(fixture.0.join("items.json"), "{")?;
|
||||
let load = || {
|
||||
crate::item_render::ItemRenderer::load_with_library(&fixture.0, library.clone())
|
||||
.err()
|
||||
.unwrap()
|
||||
.to_string()
|
||||
};
|
||||
assert!(!load().starts_with("item models:"));
|
||||
fs::write(fixture.0.join("items.json"), "{}")?;
|
||||
assert!(load().starts_with("item models:"));
|
||||
assert!(parsed.into_item_library().is_err());
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user