majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tests

Browse Source
This commit is contained in:
Alexander Medvedev
2026-08-06 14:26:27 +02:00
parent 74e7ad2909
commit 0b7e093c58
7 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/pumpkin-util/src/lib.rs
View File

@@ -57,6 +57,8 @@ macro_rules! global_path {
($path:expr) => {{ ($path:expr) => {{
use std::path::Path; use std::path::Path;
Path::new(env!("CARGO_MANIFEST_DIR")) Path::new(env!("CARGO_MANIFEST_DIR"))
.parent()
.unwrap()
.parent() .parent()
.unwrap() .unwrap()
.join(file!()) .join(file!())

2
crates/pumpkin-world/src/biome/mod.rs
View File

@@ -91,7 +91,7 @@ mod test {
} }
let expected_data: Vec<BiomeData> = let expected_data: Vec<BiomeData> =
read_data_from_file!("../../../assets/tests/biome_no_blend_no_beard_0.json"); read_data_from_file!("../../../../assets/tests/biome_no_blend_no_beard_0.json");
let seed = 0; let seed = 0;
let world_gen = WorldGenerator::Noise(Box::new(VanillaGenerator::new( let world_gen = WorldGenerator::Noise(Box::new(VanillaGenerator::new(

5
crates/pumpkin-world/src/biome/multi_noise.rs
View File

@@ -46,8 +46,9 @@ mod test {
use crate::generation::{biome_coords, positions::chunk_pos}; use crate::generation::{biome_coords, positions::chunk_pos};
use pumpkin_util::world_seed::Seed; use pumpkin_util::world_seed::Seed;
type PosToPoint = (i32, i32, i32, i64, i64, i64, i64, i64, i64); type PosToPoint = (i32, i32, i32, i64, i64, i64, i64, i64, i64);
let expected_data: Vec<PosToPoint> = let expected_data: Vec<PosToPoint> = read_data_from_file!(
read_data_from_file!("../../../assets/multi_noise_sample_no_blend_no_beard_0_0_0.json"); "../../../../assets/multi_noise_sample_no_blend_no_beard_0_0_0.json"
);
let seed = 0; let seed = 0;
let chunk_x = 0; let chunk_x = 0;

2
crates/pumpkin-world/src/chunk/format/anvil.rs
View File

@@ -1292,6 +1292,8 @@ mod tests {
fs::create_dir(&level_folder.region_folder).unwrap(); fs::create_dir(&level_folder.region_folder).unwrap();
fs::copy( fs::copy(
Path::new(env!("CARGO_MANIFEST_DIR")) Path::new(env!("CARGO_MANIFEST_DIR"))
.parent()
.unwrap()
.parent() .parent()
.unwrap() .unwrap()
.join(file!()) .join(file!())

2
crates/pumpkin-world/src/generation/biome.rs
View File

@@ -192,7 +192,7 @@ mod test {
#[test] #[test]
fn chunk_wide_blend() { fn chunk_wide_blend() {
let data: Vec<(i32, i32, i32, i32, i32, i32)> = let data: Vec<(i32, i32, i32, i32, i32, i32)> =
read_data_from_file!("../../../assets/tests/biome_mixer.json"); read_data_from_file!("../../../../assets/tests/biome_mixer.json");
let seed = hash_seed((-777i64) as u64); let seed = hash_seed((-777i64) as u64);
for (i, (x, y, z, result_x, result_y, result_z)) in data.into_iter().enumerate() { for (i, (x, y, z, result_x, result_y, result_z)) in data.into_iter().enumerate() {

38
crates/pumpkin-world/src/generation/proto_chunk_test.rs
View File

@@ -212,7 +212,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_0_0() { fn no_blend_no_beard_0_0() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_no_blend_no_beard_0_0.chunk" "../../../../assets/tests/noise_no_blend_no_beard_0_0.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -227,7 +227,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_7_4() { fn no_blend_no_beard_7_4() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_no_blend_no_beard_7_4.chunk" "../../../../assets/tests/noise_no_blend_no_beard_7_4.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -242,7 +242,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_only_cell_cache_interpolated_0_0() { fn no_blend_no_beard_only_cell_cache_interpolated_0_0() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_no_blend_no_beard_only_cell_cache_interpolated_0_0.chunk" "../../../../assets/tests/noise_no_blend_no_beard_only_cell_cache_interpolated_0_0.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -257,7 +257,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_badlands_minus595_544() { fn no_blend_no_beard_badlands_minus595_544() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_no_blend_no_beard_-595_544.chunk" "../../../../assets/tests/noise_no_blend_no_beard_-595_544.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -272,7 +272,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_frozen_ocean_minus119_183() { fn no_blend_no_beard_frozen_ocean_minus119_183() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_no_blend_no_beard_-119_183.chunk" "../../../../assets/tests/noise_no_blend_no_beard_-119_183.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -287,7 +287,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_13579_minus6_11() { fn no_blend_no_beard_13579_minus6_11() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_no_blend_no_beard_13579_-6_11.chunk" "../../../../assets/tests/noise_no_blend_no_beard_13579_-6_11.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
13579, 13579,
@@ -302,7 +302,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_13579_minus2_15() { fn no_blend_no_beard_13579_minus2_15() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_no_blend_no_beard_13579_-2_15.chunk" "../../../../assets/tests/noise_no_blend_no_beard_13579_-2_15.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
13579, 13579,
@@ -317,7 +317,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_13579_minus7_9() { fn no_blend_no_beard_13579_minus7_9() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_no_blend_no_beard_13579_-7_9.chunk" "../../../../assets/tests/noise_no_blend_no_beard_13579_-7_9.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
13579, 13579,
@@ -332,7 +332,7 @@ mod test {
#[test] #[test]
fn nether_noise_no_blend_no_beard_0_0() { fn nether_noise_no_blend_no_beard_0_0() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_nether_no_blend_no_beard_0_0.chunk" "../../../../assets/tests/noise_nether_no_blend_no_beard_0_0.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -347,7 +347,7 @@ mod test {
#[test] #[test]
fn nether_noise_no_blend_no_beard_7_4() { fn nether_noise_no_blend_no_beard_7_4() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_nether_no_blend_no_beard_7_4.chunk" "../../../../assets/tests/noise_nether_no_blend_no_beard_7_4.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -362,7 +362,7 @@ mod test {
#[test] #[test]
fn end_noise_no_blend_no_beard_0_0() { fn end_noise_no_blend_no_beard_0_0() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_end_no_blend_no_beard_0_0.chunk" "../../../../assets/tests/noise_end_no_blend_no_beard_0_0.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -377,7 +377,7 @@ mod test {
#[test] #[test]
fn end_noise_no_blend_no_beard_7_4() { fn end_noise_no_blend_no_beard_7_4() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/noise_end_no_blend_no_beard_7_4.chunk" "../../../../assets/tests/noise_end_no_blend_no_beard_7_4.chunk"
); );
verify_chunk_noise( verify_chunk_noise(
0, 0,
@@ -392,7 +392,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_surface_0_0() { fn no_blend_no_beard_surface_0_0() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/no_blend_no_beard_surface_0_0.chunk" "../../../../assets/tests/no_blend_no_beard_surface_0_0.chunk"
); );
verify_chunk_surface( verify_chunk_surface(
0, 0,
@@ -407,7 +407,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_surface_badlands_minus595_544() { fn no_blend_no_beard_surface_badlands_minus595_544() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/no_blend_no_beard_surface_badlands_-595_544.chunk" "../../../../assets/tests/no_blend_no_beard_surface_badlands_-595_544.chunk"
); );
verify_chunk_surface( verify_chunk_surface(
0, 0,
@@ -422,7 +422,7 @@ mod test {
#[test] #[test]
fn no_blend_no_beard_surface_frozen_ocean_minus119_183() { fn no_blend_no_beard_surface_frozen_ocean_minus119_183() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/no_blend_no_beard_surface_frozen_ocean_-119_183.chunk" "../../../../assets/tests/no_blend_no_beard_surface_frozen_ocean_-119_183.chunk"
); );
verify_chunk_surface( verify_chunk_surface(
0, 0,
@@ -437,7 +437,7 @@ mod test {
#[test] #[test]
fn nether_surface_no_blend_no_beard_0_0() { fn nether_surface_no_blend_no_beard_0_0() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/nether_surface_no_blend_no_beard_0_0.chunk" "../../../../assets/tests/nether_surface_no_blend_no_beard_0_0.chunk"
); );
verify_chunk_surface( verify_chunk_surface(
0, 0,
@@ -452,7 +452,7 @@ mod test {
#[test] #[test]
fn nether_surface_no_blend_no_beard_7_4() { fn nether_surface_no_blend_no_beard_7_4() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/nether_surface_no_blend_no_beard_7_4.chunk" "../../../../assets/tests/nether_surface_no_blend_no_beard_7_4.chunk"
); );
verify_chunk_surface( verify_chunk_surface(
0, 0,
@@ -467,7 +467,7 @@ mod test {
#[test] #[test]
fn end_surface_no_blend_no_beard_0_0() { fn end_surface_no_blend_no_beard_0_0() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/end_surface_no_blend_no_beard_0_0.chunk" "../../../../assets/tests/end_surface_no_blend_no_beard_0_0.chunk"
); );
verify_chunk_surface( verify_chunk_surface(
0, 0,
@@ -482,7 +482,7 @@ mod test {
#[test] #[test]
fn end_surface_no_blend_no_beard_7_4() { fn end_surface_no_blend_no_beard_7_4() {
let expected: Vec<u16> = pumpkin_util::read_data_from_file!( let expected: Vec<u16> = pumpkin_util::read_data_from_file!(
"../../../assets/tests/end_surface_no_blend_no_beard_7_4.chunk" "../../../../assets/tests/end_surface_no_blend_no_beard_7_4.chunk"
); );
verify_chunk_surface( verify_chunk_surface(
0, 0,

2
crates/pumpkin-world/src/lib.rs
View File

@@ -30,6 +30,8 @@ macro_rules! global_path {
($path:expr) => {{ ($path:expr) => {{
use std::path::Path; use std::path::Path;
Path::new(env!("CARGO_MANIFEST_DIR")) Path::new(env!("CARGO_MANIFEST_DIR"))
.parent()
.unwrap()
.parent() .parent()
.unwrap() .unwrap()
.join(file!()) .join(file!())