Add tree/spike unit tests and harness hooks for sculk and gateways
Unit tests pin Java HashSet bucket iteration, Fisher-Yates draw order and the seed-derived End spike layout. The oracle ignores sounds, level events and entity queries; the Rust fixture accepts end-gateway configuration; FEATURE_FILTER limits a rerun to matching features. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -197,6 +197,9 @@ impl<W: Write> PlacementContext for World<'_, '_, W> {
|
||||
(0..ny).all(|y| (0..nz).all(|z| shape.is_full(x as i32, y as i32, z as i32)))
|
||||
}))
|
||||
}
|
||||
fn configure_end_gateway(&mut self, _: [i32; 3], _: [i32; 3], _: bool) -> Result<(), PlacementQueryError> {
|
||||
Ok(())
|
||||
}
|
||||
fn world_seed(&mut self) -> Result<i64, PlacementQueryError> {
|
||||
Ok(self.seed)
|
||||
}
|
||||
|
||||
@@ -202,3 +202,19 @@ impl EndSpikeFeature {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn spike_layout_is_a_permutation_of_sizes() {
|
||||
let spikes = spikes_for_seed(0);
|
||||
assert_eq!(spikes.len(), 10);
|
||||
let mut heights: Vec<i32> = spikes.iter().map(|s| s.height).collect();
|
||||
heights.sort_unstable();
|
||||
assert_eq!(heights, (0..10).map(|s| 76 + s * 3).collect::<Vec<_>>());
|
||||
assert_eq!(spikes.iter().filter(|s| s.guarded).count(), 2);
|
||||
assert_eq!((spikes[0].center_x, spikes[0].center_z), (42, 0));
|
||||
assert_eq!(spikes_for_seed(0), spikes_for_seed(0));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -425,3 +425,39 @@ pub(crate) fn shuffle<T>(
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use horizon_core::random::{LegacyRandom, RandomSource};
|
||||
#[test]
|
||||
fn pos_set_iterates_in_java_hash_bucket_order() {
|
||||
let mut set = PosSet::default();
|
||||
let inserted = [[0, 64, 1], [1, 64, 0], [0, 65, 0], [0, 64, 0]];
|
||||
for p in inserted {
|
||||
set.insert(p);
|
||||
}
|
||||
// BlockPos.hashCode spread by h ^ (h >>> 16) into 16 buckets; ties keep
|
||||
// insertion order within a bucket.
|
||||
let mut expected = inserted.to_vec();
|
||||
expected.sort_by_key(|p| {
|
||||
let h = crate::java_hash_map::JavaKey::java_hash(&JavaPos(*p)) as u32;
|
||||
(h ^ (h >> 16)) & 15
|
||||
});
|
||||
assert_eq!(set.to_vec(), expected);
|
||||
assert_eq!(set.pop_first(), Some(expected[0]));
|
||||
assert!(!set.contains(expected[0]));
|
||||
}
|
||||
#[test]
|
||||
fn fisher_yates_matches_native_draw_order() {
|
||||
let mut values = [0, 1, 2, 3];
|
||||
shuffle(&mut values, &mut LegacyRandom::new(42)).unwrap();
|
||||
let mut reference = [0, 1, 2, 3];
|
||||
let mut random = LegacyRandom::new(42);
|
||||
for i in (2..=4).rev() {
|
||||
let j = random.next_int_bound(i).unwrap() as usize;
|
||||
reference.swap(i as usize - 1, j);
|
||||
}
|
||||
assert_eq!(values, reference);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,7 +90,8 @@ public final class VanillaTreeFeatureOracle {
|
||||
case "ensureCanWrite":return true;
|
||||
case "getRandom":return shapeRandom;
|
||||
case "scheduleTick":return null; // Edge shape updates also schedule ticks; not compared.
|
||||
case "setCurrentlyGenerating":return null;
|
||||
case "setCurrentlyGenerating":case "playSound":case "levelEvent":case "gameEvent":case "blockEvent":return null;
|
||||
case "getEntities":return java.util.List.of();
|
||||
case "getBlockEntity":{
|
||||
if(args.length!=1)break;var p=((BlockPos)args[0]).immutable();var state=get(p);
|
||||
if(state.is(Blocks.CHEST))return chests.computeIfAbsent(p,key->new ChestBlockEntity(key,state){@Override public void setLootTable(net.minecraft.resources.ResourceKey<net.minecraft.world.level.storage.loot.LootTable> table,long seed){out.println("loot "+xyz(key)+" "+table.identifier()+" "+seed);super.setLootTable(table,seed);}});
|
||||
|
||||
@@ -120,7 +120,10 @@ def main():
|
||||
rules=survival.bind_definitions(*[json.loads((build/name).read_text()) for name in ['survival-classes.json','survival-placement-classes.json','survival-support-tags.json']]);(build/'survival-rules.json').write_text(json.dumps(rules,separators=(',',':')))
|
||||
inputs=build/'inputs.txt';count=0
|
||||
with inputs.open('w',encoding='utf-8') as output:
|
||||
for fixture in corpus(facts,resources):output.write(json.dumps(fixture,separators=(',',':'))+'\n');count+=1
|
||||
only=os.environ.get('FEATURE_FILTER') # optional regex over feature names for focused reruns
|
||||
for fixture in corpus(facts,resources):
|
||||
if only and not __import__('re').search(only,fixture['feature']):continue
|
||||
output.write(json.dumps(fixture,separators=(',',':'))+'\n');count+=1
|
||||
fixtures=[inputs,*sorted(build.glob('*.nbt')),*[p for p in sorted(build.glob('*.json')) if p.name!='report.json']];tested_fixtures=fixture_hashes(fixtures)
|
||||
print(f'Prepared {count:,} feature fixtures',flush=True)
|
||||
run(['cargo','build','--release','-p','horizon-world','--example','tree_feature_fixture'],'compile-rust')
|
||||
|
||||
Reference in New Issue
Block a user