Compare commits

...

10 Commits

Author SHA1 Message Date
Axel Meyer
ba3e8ce64f chore(deps): bump lib-core.maps 0.5.6 -> 0.5.7
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-01 22:44:24 +02:00
Axel Meyer
ff27f3caf6 test(maps): maps_t8 round-trip + maps_t9 byte-determinism
t8 saves a map with cells_material set, verifies the JSON
contains the key, reloads, and reads the flag back. t9 saves
twice with no cells_material content and asserts byte-identity
plus absence of the cells_material key in the output.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-01 22:30:24 +02:00
Axel Meyer
52da578e3f test(maps): maps_t2-t7 slot-resolution proofs for cell-tile
Proves that previously-unreachable atlas slots become reachable
via the cell-tile material path: slot 0 isolated (t3), slot 1 end
with correct rotations (t4), slot 4 straight (t5), slot 5
tee_open (t6), slot 8 cross_open (t7).

Upgrades write_test.map.json to schema_version 3 with material
and vertices fields on surface so cell_material_slot + set_vertex
resolve correctly in the tests.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-01 22:13:36 +02:00
Axel Meyer
b68b1d4fba test(maps): maps_t1 cell-tile material round-trip + guards
Exercises set_cell_material / get_cell_material round-trip on the
write_test fixture, plus bounds rejection and unknown-layer
rejection. Confirms the new public API is wired and the guards
match the existing v3 write-API conventions.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-01 21:51:01 +02:00
Axel Meyer
c159738870 chore(deps): bump lib-core.maps 0.5.5 -> 0.5.6
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-01 17:19:07 +02:00
Axel Meyer
ba2ef2df06 chore(deps): bump to 0.5.5; track lib-core.maps 0.5.5 2026-05-30 23:40:57 +02:00
Axel Meyer
aaeb8d3650 Bump lib-core.maps-test to v0.4.0 and pin maps dep to 0.4.0
Test-lib follows the lib it exercises; the new asserts in init.lua
exercise the v0.4.0 write APIs that did not exist in 0.3.0.
2026-05-24 00:51:12 +02:00
Axel Meyer
e082a39596 Add save_to_disk round-trip and determinism asserts
Verifies the saved JSON is readable, that two successive saves
produce byte-identical output, and that re-loading the saved file
recovers the same cell values that were written before saving.
Uses engine.module.dir_of to write the round-trip fixture to the
lib maps/ directory (asset sandbox rejects absolute temp paths).
2026-05-24 00:43:31 +02:00
Axel Meyer
e399f6c6f8 Add asserts for set_roof write API
Covers value validation (rejects 2), bounds rejection, and the
basic call paths that set up roof state for the save-roundtrip
test in the next commit.
2026-05-24 00:34:18 +02:00
Axel Meyer
8453b1fc8f Add asserts for set_cell_gid write API
Covers happy-path round-trip, bounds rejection (positive and negative),
unknown-layer rejection, and on-demand layer allocation.
2026-05-24 00:25:12 +02:00
3 changed files with 310 additions and 2 deletions

284
init.lua
View File

@@ -246,6 +246,290 @@ function M.run_tests(ctx)
local list = maps.list() local list = maps.list()
engine.test.equals(#list, 2, "maps.list returns 2 registered maps") engine.test.equals(#list, 2, "maps.list returns 2 registered maps")
-- ---------- v0.4.0: Write APIs — set_cell_gid ----------
-- Build a fresh v2 map for write tests (separate from earlier load-based tests).
-- maps.create only handles the v1 path (requires tilemap_table); use maps.load
-- with a fixture file for the v2 path instead.
local write_id = maps.load("maps/write_test.map.json")
maps.set_current(write_id)
-- Happy path
local gid_painted = maps.encode_gid(0, 1, 0)
maps.set_cell_gid("surface", 1, 2, gid_painted)
engine.test.equals(maps.cell_gid("surface", 1, 2), gid_painted,
"set_cell_gid writes the cell that cell_gid reads back")
-- Bounds-error: x >= w
local ok1, err1 = pcall(function() maps.set_cell_gid("surface", 4, 0, gid_painted) end)
engine.test.assert(not ok1, "set_cell_gid rejects x out of bounds")
engine.test.assert(err1 and err1:find("bounds"), "set_cell_gid bounds-error mentions 'bounds'")
-- Bounds-error: negative coord
local ok2 = pcall(function() maps.set_cell_gid("surface", -1, 0, gid_painted) end)
engine.test.assert(not ok2, "set_cell_gid rejects negative x")
-- Unknown-layer error
local ok3, err3 = pcall(function() maps.set_cell_gid("bogus_layer", 0, 0, gid_painted) end)
engine.test.assert(not ok3, "set_cell_gid rejects unknown layer")
engine.test.assert(err3 and err3:find("layer"), "unknown-layer error mentions 'layer'")
-- On-demand layer allocation
engine.test.assert(maps.cell_gid("wall", 0, 0) == 0,
"wall layer empty before any write")
maps.set_cell_gid("wall", 2, 2, gid_painted)
engine.test.equals(maps.cell_gid("wall", 2, 2), gid_painted,
"set_cell_gid auto-allocates the wall layer")
engine.test.equals(maps.cell_gid("wall", 0, 0), 0,
"auto-allocated layer initialised to all-zero except the written cell")
-- ---------- v0.4.0: set_roof ----------
-- Roof should be nil before any write. No direct cell_roof reader exists yet
-- (out of scope for v0.4.0). Verify behaviourally via JSON round-trip in Task 3.
-- Happy path: set roof cells, no assertion on read since no public reader
maps.set_roof(1, 1, 1)
maps.set_roof(1, 1, 0) -- toggle back
maps.set_roof(2, 2, 1) -- leave this one set for Task 3's round-trip test
-- Value validation
local ok_v, err_v = pcall(function() maps.set_roof(0, 0, 2) end)
engine.test.assert(not ok_v, "set_roof rejects value=2")
engine.test.assert(err_v and err_v:find("0.*1"), "set_roof error mentions 0 or 1")
-- Bounds rejection
local ok_b = pcall(function() maps.set_roof(4, 0, 1) end)
engine.test.assert(not ok_b, "set_roof rejects x out of bounds")
-- ---------- v0.4.0: save_to_disk ----------
-- Map state from Task 1+2: surface(1,2) = gid_painted, wall(2,2) = gid_painted,
-- roof(2,2) = 1. Save and re-load to verify round-trip.
-- Re-establish deterministic state (defensive — earlier asserts may have toggled).
maps.set_cell_gid("surface", 1, 2, gid_painted)
maps.set_cell_gid("wall", 2, 2, gid_painted)
maps.set_roof(2, 2, 1)
-- Pick a temp path. Use TEMP env var for Windows compatibility; fall back to
-- os.tmpname() on POSIX (where it returns a writable path).
local tmp_dir = os.getenv("TEMP") or os.getenv("TMP") or "/tmp"
-- Unique suffix via os.clock() + os.time() to avoid collisions.
local tmp_suffix = string.format("sporel_maps_test_%d_%d", os.time(), math.floor(os.clock() * 1e6) % 1000000)
local out_path = tmp_dir .. "/" .. tmp_suffix .. "_1.json"
local out_path_2 = tmp_dir .. "/" .. tmp_suffix .. "_2.json"
local rl_path = tmp_dir .. "/" .. tmp_suffix .. "_rl.json"
maps.save_to_disk("write_test", out_path)
-- Re-read raw bytes for byte-determinism test
local f1 = io.open(out_path, "r")
engine.test.assert(f1 ~= nil, "save_to_disk wrote a readable file")
local bytes_1 = f1:read("*a")
f1:close()
-- Save a second time; bytes must match exactly
maps.save_to_disk("write_test", out_path_2)
local f2 = io.open(out_path_2, "r")
local bytes_2 = f2:read("*a")
f2:close()
engine.test.equals(bytes_1, bytes_2,
"save_to_disk is byte-deterministic across calls")
-- Verify JSON has expected keys
engine.test.assert(bytes_1:find('"schema_version"') ~= nil, "saved file has schema_version key")
engine.test.assert(bytes_1:find('"surface"') ~= nil, "saved file has surface key")
engine.test.assert(bytes_1:find('"wall"') ~= nil, "saved file has wall key (auto-allocated)")
engine.test.assert(bytes_1:find('"roof"') ~= nil, "saved file has roof key (set in Task 2)")
-- Re-load (with patched id to avoid registry collision).
-- engine.asset.load_json only accepts relative (sandboxed) paths, so write
-- the round-trip file into the maps-test lib's own maps/ directory where
-- the asset resolver can find it by relative path.
local lib_dir = engine.module.dir_of("lib-core.maps-test")
local rewritten = bytes_1:gsub('"id"%s*:%s*"write_test"', '"id":"write_test_reloaded"')
local abs_rl_path = lib_dir .. "/maps/write_test_reloaded.map.json"
local rf = io.open(abs_rl_path, "w"); rf:write(rewritten); rf:close()
maps.load("maps/write_test_reloaded.map.json")
engine.test.equals(maps.cell_gid("surface", 1, 2, "write_test_reloaded"), gid_painted,
"save round-trip preserves surface cell")
engine.test.equals(maps.cell_gid("wall", 2, 2, "write_test_reloaded"), gid_painted,
"save round-trip preserves wall cell")
-- Cleanup
os.remove(out_path); os.remove(out_path_2); os.remove(abs_rl_path)
-- =====================================================================
-- 0.5.7: Cell-Tile material API tests (maps_t1)
-- =====================================================================
-- Reload the write_test map for a clean slate.
maps.set_current("write_test")
-- maps_t1: round-trip set/get
maps.set_cell_material("surface", 1, 1, true)
engine.test.equals(maps.get_cell_material("surface", 1, 1), true,
"maps_t1: set_cell_material then get_cell_material round-trips")
maps.set_cell_material("surface", 1, 1, false)
engine.test.equals(maps.get_cell_material("surface", 1, 1), false,
"maps_t1: set_cell_material(false) clears the flag")
-- Out-of-bounds rejection
local ok_oob, err_oob = pcall(function()
maps.set_cell_material("surface", -1, 0, true)
end)
engine.test.assert(not ok_oob,
"maps_t1: set_cell_material rejects negative x")
engine.test.assert(err_oob and err_oob:find("bounds"),
"maps_t1: bounds-error mentions 'bounds'")
-- Unknown-layer rejection
local ok_lay = pcall(function()
maps.set_cell_material("bogus_layer", 0, 0, true)
end)
engine.test.assert(not ok_lay,
"maps_t1: set_cell_material rejects unknown layer")
-- =====================================================================
-- maps_t2-t7: Cell-Tile slot-resolution proofs
-- =====================================================================
-- write_test is 4x4. Use v2_size for w/h reference (already declared earlier).
-- maps_t2: cell_material_slot returns a non-nil record for a
-- cells_material cell.
-- Clear the surface layer's cells_material first.
for cy = 0, v2_size.h - 1 do
for cx = 0, v2_size.w - 1 do
maps.set_cell_material("surface", cx, cy, false)
end
end
maps.set_cell_material("surface", 1, 1, true)
local rec = maps.cell_material_slot("surface", 1, 1)
engine.test.assert(rec ~= nil,
"maps_t2: cell_material_slot returns non-nil for cell-tile material")
-- maps_t3: isolated slot reachable for the first time.
-- Clear cells_material AND vertices, place an isolated paint at (2, 2).
for cy = 0, v2_size.h - 1 do
for cx = 0, v2_size.w - 1 do
maps.set_cell_material("surface", cx, cy, false)
maps.set_vertex("surface", cx, cy, false)
end
maps.set_vertex("surface", v2_size.w, cy, false)
end
for cx = 0, v2_size.w do maps.set_vertex("surface", cx, v2_size.h, false) end
maps.set_cell_material("surface", 2, 2, true)
local r3 = maps.cell_material_slot("surface", 2, 2)
engine.test.equals(r3.slot, 0, "maps_t3: slot 0 isolated reachable for first time")
engine.test.equals(r3.rot, 0, "maps_t3: isolated rot=0")
-- maps_t4: two adjacent cells → two end-caps facing each other.
maps.set_cell_material("surface", 1, 2, true)
maps.set_cell_material("surface", 2, 2, true)
local r4a = maps.cell_material_slot("surface", 1, 2)
local r4b = maps.cell_material_slot("surface", 2, 2)
engine.test.equals(r4a.slot, 1, "maps_t4: left cell is end (slot 1)")
engine.test.equals(r4a.rot, 1, "maps_t4: left end points east (rot 1)")
engine.test.equals(r4b.slot, 1, "maps_t4: right cell is end (slot 1)")
engine.test.equals(r4b.rot, 3, "maps_t4: right end points west (rot 3)")
-- maps_t5: 3-cell line → middle is straight.
maps.set_cell_material("surface", 0, 2, true)
-- already painted (1,2) and (2,2) from t4
local r5 = maps.cell_material_slot("surface", 1, 2)
engine.test.equals(r5.slot, 4, "maps_t5: middle of 3-cell line is straight (slot 4)")
-- rot may be 1 or 3 (horizontal canonical); accept both
engine.test.assert(r5.rot == 1 or r5.rot == 3,
"maps_t5: straight is horizontal (rot 1 or 3)")
-- Reset surface for t6.
for cx = 0, v2_size.w - 1 do
maps.set_cell_material("surface", cx, 2, false)
end
-- maps_t6: T-junction at (1, 2) with arms W (0, 2), E (2, 2), S (1, 3).
-- write_test is 4x4 so (1, 3) is the last row.
maps.set_cell_material("surface", 0, 2, true)
maps.set_cell_material("surface", 1, 2, true)
maps.set_cell_material("surface", 2, 2, true)
maps.set_cell_material("surface", 1, 3, true)
local r6 = maps.cell_material_slot("surface", 1, 2)
engine.test.equals(r6.slot, 5, "maps_t6: T-junction is tee_open (slot 5)")
-- Reset for t7.
for cy = 0, v2_size.h - 1 do
for cx = 0, v2_size.w - 1 do
maps.set_cell_material("surface", cx, cy, false)
end
end
-- maps_t7: 4-cell "+" at (1, 1) with N (1, 0), E (2, 1), S (1, 2), W (0, 1).
maps.set_cell_material("surface", 1, 1, true)
maps.set_cell_material("surface", 1, 0, true)
maps.set_cell_material("surface", 2, 1, true)
maps.set_cell_material("surface", 1, 2, true)
maps.set_cell_material("surface", 0, 1, true)
local r7 = maps.cell_material_slot("surface", 1, 1)
engine.test.equals(r7.slot, 8, "maps_t7: cross is cross_open (slot 8) — second previously-unreachable slot reachable")
-- Reset surface fully so later tests (if any added) start clean.
for cy = 0, v2_size.h - 1 do
for cx = 0, v2_size.w - 1 do
maps.set_cell_material("surface", cx, cy, false)
end
end
-- =====================================================================
-- maps_t8: cells_material round-trips through save_to_disk + reload
-- =====================================================================
-- Use a unique temp path so we don't collide with the earlier write_test save.
local cm_path = tmp_dir .. "/" .. tmp_suffix .. "_cm.json"
local lib_dir2 = engine.module.dir_of("lib-core.maps-test")
local cm_rl_abs = lib_dir2 .. "/maps/write_test_cm_reloaded.map.json"
maps.set_current("write_test")
maps.set_cell_material("surface", 2, 1, true)
maps.save_to_disk("write_test", cm_path)
local f = io.open(cm_path, "r")
local cm_bytes = f:read("*a"); f:close()
engine.test.assert(cm_bytes:find('"cells_material"') ~= nil,
"maps_t8: cells_material appears in serialized JSON when set")
-- Patch id + relocate so the load resolver can find it.
local cm_rewritten = cm_bytes:gsub('"id"%s*:%s*"write_test"',
'"id":"write_test_cm_reloaded"')
local rf = io.open(cm_rl_abs, "w"); rf:write(cm_rewritten); rf:close()
maps.load("maps/write_test_cm_reloaded.map.json")
engine.test.equals(maps.get_cell_material("surface", 2, 1, "write_test_cm_reloaded"), true,
"maps_t8: cells_material round-trips through save+load")
-- Cleanup
os.remove(cm_path); os.remove(cm_rl_abs)
-- =====================================================================
-- maps_t9: byte-determinism regression — a map with no cells_material
-- writes byte-identical output through the 0.5.7 serializer as it did
-- under 0.5.6.
-- =====================================================================
-- Reset surface cells_material so the save contains no cell-tile data.
maps.set_current("write_test")
for cy = 0, v2_size.h - 1 do
for cx = 0, v2_size.w - 1 do
maps.set_cell_material("surface", cx, cy, false)
end
end
local bytes_a_path = tmp_dir .. "/" .. tmp_suffix .. "_a.json"
local bytes_b_path = tmp_dir .. "/" .. tmp_suffix .. "_b.json"
maps.save_to_disk("write_test", bytes_a_path)
maps.save_to_disk("write_test", bytes_b_path)
local fa = io.open(bytes_a_path, "r"); local bytes_a = fa:read("*a"); fa:close()
local fb = io.open(bytes_b_path, "r"); local bytes_b = fb:read("*a"); fb:close()
engine.test.equals(bytes_a, bytes_b,
"maps_t9: byte-deterministic save with no cells_material content")
engine.test.assert(bytes_a:find('"cells_material"') == nil,
"maps_t9: cells_material key absent when all entries are zero")
os.remove(bytes_a_path); os.remove(bytes_b_path)
engine.exit(engine.test.failures()) engine.exit(engine.test.failures())
end end

View File

@@ -1,9 +1,9 @@
{ {
"id": "lib-core.maps-test", "id": "lib-core.maps-test",
"role": "test", "role": "test",
"version": "0.3.0", "version": "0.5.5",
"api_min": "0.1", "api_min": "0.1",
"deps": [ "deps": [
{"id": "lib-core.maps", "version": "0.3.0"} {"id": "lib-core.maps", "version": "0.5.7"}
] ]
} }

24
maps/write_test.map.json Normal file
View File

@@ -0,0 +1,24 @@
{
"schema_version": 3,
"id": "write_test",
"size": { "w": 4, "h": 4 },
"atlases": ["demo_tilemap"],
"layers": {
"surface": {
"material": "demo_tilemap",
"vertices": [
0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0, 0, 0, 0
],
"tiles": [
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0
]
}
}
}