From 5cd8b183ccae32f39a75225141193478ef2cc41c Mon Sep 17 00:00:00 2001 From: Aaron Kimbrell Date: Tue, 29 Sep 2026 07:45:30 -0500 Subject: [PATCH] test(zone): use neutral names and IDs in the zone file tests The zone file tests' sample zones now use generic world IDs, file names and path names instead of ones taken from real files. What they test is unchanged. Check in game: nothing (test only). Co-Authored-By: Claude Opus 5.5 --- tests/dCommonTests/ZoneFileTests.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/dCommonTests/ZoneFileTests.cpp b/tests/dCommonTests/ZoneFileTests.cpp index 6a53294a0..9a6dbe408 100644 --- a/tests/dCommonTests/ZoneFileTests.cpp +++ b/tests/dCommonTests/ZoneFileTests.cpp @@ -130,10 +130,10 @@ TEST(ZoneFileTests, ReadsZoneBoundaries) { EXPECT_EQ(zone.zoneDesc, "Description"); } -// From LateAlpha (37) on the scene count is a u32 (some LUP zones are 37) +// From LateAlpha (37) on the scene count is a u32 TEST(ZoneFileTests, LateAlphaSceneCountIsAU32) { ZoneBytes w; - w.Put(37).Put(1).Put(20022); // version, revision, world; no spawn point before 38 + w.Put(37).Put(1).Put(1000); // version, revision, world; no spawn point before 38 w.Put(1); w.Text("scene.lvl").Put(5).Put(0).Text("Global Scene").Put(0).Put(0).Put(0); w.Put(0).Text("zone.raw").Text("Name").Text("Description"); @@ -226,15 +226,15 @@ TEST(ZoneFileTests, KeepsTheScenesTheClientLoads) { // A PrePreAlpha (30) file ends at its terrain file's name: no zone name, description, transitions or paths TEST(ZoneFileTests, PrePreAlphaHasNoZoneName) { ZoneBytes w; - w.Put(30).Put(72).Put(1).Text("scale.lvl"); // version, world, one scene: only its file - w.Put(0).Text("scale.raw"); + w.Put(30).Put(1000).Put(1).Text("scene.lvl"); // version, world, one scene: only its file + w.Put(0).Text("zone.raw"); std::istringstream stream(w.Done()); ZoneFile zone; zone.Read(stream); EXPECT_FALSE(stream.fail()); ASSERT_EQ(zone.scenes.size(), 1u); - EXPECT_EQ(zone.scenes[0].filename, "scale.lvl"); - EXPECT_EQ(zone.zoneRawPath, "scale.raw"); + EXPECT_EQ(zone.scenes[0].filename, "scene.lvl"); + EXPECT_EQ(zone.zoneRawPath, "zone.raw"); EXPECT_TRUE(zone.zoneName.empty()); EXPECT_TRUE(zone.zoneDesc.empty()); } @@ -242,15 +242,15 @@ TEST(ZoneFileTests, PrePreAlphaHasNoZoneName) { // Before path version 3 the type is a name and every waypoint has a platform's data and name/value pairs TEST(ZoneFileTests, ReadsLegacyPaths) { ZoneBytes w; - w.Put(35).Put(137).Put(1); // version, world, scene count - w.Text("lup.lvl").Put(0).Put(0).Text("Global Scene").Put(0).Put(0).Put(0); - w.Put(0).Text("lup.raw").Text("Name").Text("Description"); + w.Put(35).Put(1000).Put(1); // version, world, scene count + w.Text("scene.lvl").Put(0).Put(0).Text("Global Scene").Put(0).Put(0).Put(0); + w.Put(0).Text("zone.raw").Text("Name").Text("Description"); w.Put(0); // no transitions w.Paths().Put(1).Put(2); - w.Put(2).Wide("LavaPath").Wide("npc").Put(1).Put(0); + w.Put(2).Wide("Patrol").Wide("npc").Put(1).Put(0); w.Put(1).Point(1, 2, 3).Put(1.0f).Put(0.0f).Put(0.0f).Put(0.0f).Put(0).Put(3.0f).Put(0.5f); w.Put(1).Wide("delay").Wide("2"); - w.Put(2).Wide("Mower").Wide("platform").Put(0).Put(2); + w.Put(2).Wide("Lift").Wide("platform").Put(0).Put(2); w.Put(1).Point(4, 5, 6).Put(0.0f).Put(1.0f).Put(0.0f).Put(0.0f).Put(1).Put(7.0f).Put(1.5f).Put(0); std::istringstream stream(w.Done());