John McCardle
112f3571f5
The suite was reporting 331/331 while at least 82 of those tests asserted
nothing at all.
They raised during setup on APIs removed long ago -- add_layer(name=...),
GridPoint.color, mcrfpy.Animation(), entity.gridstate, mcrfpy.setScene,
assets/kenney_ice.png, GridData.compute_astar -- registered no timers, hit the
engine's auto-exit-when-no-timers path, exited 0, and were scored PASS. Their
assertions had not executed in months. test_metrics.py is the sharpest example:
the existing metrics test died on line 140 with a TypeError, which is precisely
why #341 (get_metrics counters reading 0) went unnoticed.
The engine no longer permits this (#350: a headless --exec script must call
sys.exit()), and run_tests.py no longer passes a test whose output contains a
Traceback. This commit repairs the 82 they exposed, migrating each to the
current API while preserving its original intent -- not deleting assertions to
make the command exit 0. Each repair was adversarially re-verified by a second
pass asking "is this still a test, or was it gutted?"; none were.
Two tests could not be made to pass because they were right and the engine was
wrong. Rather than paper over them they were left failing and the bugs fixed
separately in 48eef0b: DijkstraMap path order (#375) and layer-setter cache
invalidation (#376). Three integration tests had encoded the reversed Dijkstra
order as expected behavior; their assertions now state the real contract
(excludes the origin, ends at the root).
Suite: 334/334, every one of them actually asserting.
Refs #341, #350, #372
121 lines
4.1 KiB
Python
121 lines
4.1 KiB
Python
#!/usr/bin/env python3
|
|
"""Test UIGrid camera_rotation functionality"""
|
|
import mcrfpy
|
|
from mcrfpy import automation
|
|
import sys
|
|
|
|
# Create test scene
|
|
test_scene = mcrfpy.Scene("grid_rotation_test")
|
|
ui = test_scene.children
|
|
|
|
# Create background
|
|
bg = mcrfpy.Frame(pos=(0, 0), size=(800, 600), fill_color=mcrfpy.Color(30, 30, 40))
|
|
ui.append(bg)
|
|
|
|
# Create a grid with entities to visualize rotation
|
|
grid = mcrfpy.Grid(grid_size=(8, 8), pos=(50, 50), size=(300, 300))
|
|
grid.fill_color = mcrfpy.Color(60, 60, 80)
|
|
|
|
# Add some entities to visualize the rotation
|
|
for i in range(8):
|
|
entity = mcrfpy.Entity((i, 0)) # Top row
|
|
grid.entities.append(entity)
|
|
|
|
for i in range(1, 8):
|
|
entity = mcrfpy.Entity((0, i)) # Left column
|
|
grid.entities.append(entity)
|
|
|
|
# Apply camera rotation
|
|
grid.camera_rotation = 30.0 # 30 degree rotation
|
|
grid.center_camera((4, 4)) # Center on middle of grid
|
|
assert grid.camera_rotation == 30.0, "camera_rotation should round-trip"
|
|
|
|
ui.append(grid)
|
|
|
|
# Create a second grid without rotation for comparison
|
|
grid2 = mcrfpy.Grid(grid_size=(8, 8), pos=(400, 50), size=(300, 300))
|
|
grid2.fill_color = mcrfpy.Color(60, 60, 80)
|
|
|
|
# Add same entities pattern
|
|
for i in range(8):
|
|
entity = mcrfpy.Entity((i, 0))
|
|
grid2.entities.append(entity)
|
|
|
|
for i in range(1, 8):
|
|
entity = mcrfpy.Entity((0, i))
|
|
grid2.entities.append(entity)
|
|
|
|
grid2.camera_rotation = 0.0 # No rotation
|
|
grid2.center_camera((4, 4))
|
|
assert grid2.camera_rotation == 0.0, "camera_rotation=0 should round-trip"
|
|
|
|
# camera_rotation is per-view state: rotating grid must not disturb grid2
|
|
assert grid.camera_rotation == 30.0, "camera_rotation must be per-grid, not shared"
|
|
|
|
ui.append(grid2)
|
|
|
|
# Labels
|
|
label1 = mcrfpy.Caption(text="Grid with camera_rotation=30", pos=(50, 20))
|
|
ui.append(label1)
|
|
|
|
label2 = mcrfpy.Caption(text="Grid with camera_rotation=0", pos=(400, 20))
|
|
ui.append(label2)
|
|
|
|
# Create a third grid with viewport rotation (different from camera rotation)
|
|
grid3 = mcrfpy.Grid(grid_size=(6, 6), pos=(175, 400), size=(200, 150))
|
|
grid3.fill_color = mcrfpy.Color(80, 60, 60)
|
|
|
|
# Add entities
|
|
for i in range(6):
|
|
entity = mcrfpy.Entity((i, 0))
|
|
grid3.entities.append(entity)
|
|
|
|
# Apply viewport rotation (entire grid rotates)
|
|
grid3.rotation = 15.0
|
|
grid3.origin = (100, 75) # Center origin for rotation
|
|
grid3.center_camera((3, 3))
|
|
assert grid3.rotation == 15.0, "viewport rotation should round-trip"
|
|
# viewport rotation is distinct from camera rotation
|
|
assert grid3.camera_rotation == 0.0, "setting .rotation must not set .camera_rotation"
|
|
|
|
ui.append(grid3)
|
|
|
|
label3 = mcrfpy.Caption(text="Grid with viewport rotation=15 (rotates entire widget)", pos=(100, 560))
|
|
ui.append(label3)
|
|
|
|
# Test center_camera computes correct pixel center
|
|
# (GridView has no .cell_size accessor; the raw cell metrics aren't needed here --
|
|
# center_camera is verified by the relationships between the centers it produces.)
|
|
test_grid = mcrfpy.Grid(grid_size=(20, 15), pos=(0, 0), size=(320, 240))
|
|
|
|
# center_camera((0, 0)) should put tile (0,0) at view center
|
|
test_grid.center_camera((0, 0))
|
|
c0 = test_grid.center
|
|
# The center should position (0,0) in the middle of the viewport
|
|
# center = (tile_x * cell_w + cell_w/2, tile_y * cell_h + cell_h/2) mapped to view center
|
|
|
|
# center_camera at a different position should produce a different center
|
|
test_grid.center_camera((10, 7))
|
|
c1 = test_grid.center
|
|
assert c0.x != c1.x or c0.y != c1.y, "center_camera at different positions should give different centers"
|
|
# ...and it should move monotonically with the tile coordinate
|
|
assert c1.x > c0.x and c1.y > c0.y, "center_camera to a larger tile should increase the center"
|
|
|
|
# center_camera at same position twice should be idempotent
|
|
test_grid.center_camera((5, 5))
|
|
c2 = test_grid.center
|
|
test_grid.center_camera((5, 5))
|
|
c3 = test_grid.center
|
|
assert abs(c2.x - c3.x) < 0.01 and abs(c2.y - c3.y) < 0.01, "center_camera should be idempotent"
|
|
|
|
print("center_camera assertions passed")
|
|
|
|
# Activate scene
|
|
mcrfpy.current_scene = test_scene
|
|
|
|
# Advance the game loop to render, then take screenshot
|
|
mcrfpy.step(0.1)
|
|
automation.screenshot("grid_camera_rotation_test.png")
|
|
print("Screenshot saved as grid_camera_rotation_test.png")
|
|
print("PASS")
|
|
sys.exit(0)
|