test: expand turn command fixture controls

This commit is contained in:
2026-07-26 00:10:47 +00:00
parent 92e5f2472d
commit f49b1d26a5
+11 -2
View File
@@ -194,13 +194,19 @@ function comparisonApplyTurnFixtureSetup(mixed $setup): void
$patch = comparisonMappedPatch($row, [ $patch = comparisonMappedPatch($row, [
'nationId' => 'nation', 'nationId' => 'nation',
'population' => 'pop', 'population' => 'pop',
'populationMax' => 'pop_max',
'agriculture' => 'agri', 'agriculture' => 'agri',
'agricultureMax' => 'agri_max',
'commerce' => 'comm', 'commerce' => 'comm',
'commerceMax' => 'comm_max',
'security' => 'secu', 'security' => 'secu',
'securityMax' => 'secu_max',
'supplyState' => 'supply', 'supplyState' => 'supply',
'frontState' => 'front', 'frontState' => 'front',
'defence' => 'def', 'defence' => 'def',
'defenceMax' => 'def_max',
'wall' => 'wall', 'wall' => 'wall',
'wallMax' => 'wall_max',
'state' => 'state', 'state' => 'state',
'term' => 'term', 'term' => 'term',
'trust' => 'trust', 'trust' => 'trust',
@@ -355,7 +361,10 @@ function comparisonRunTurnCommand(array $request): array
$resultTurnRaw = $resultTurn->toRaw(); $resultTurnRaw = $resultTurn->toRaw();
$resultTerm = (int)($resultTurnRaw['term'] ?? 0); $resultTerm = (int)($resultTurnRaw['term'] ?? 0);
$preReqTurn = $command->getPreReqTurn(); $preReqTurn = $command->getPreReqTurn();
$completed = ($resultTurnRaw['command'] ?? null) === $command->getName() $completed = (
$action === 'che_접경귀환'
&& $tracingRng->calls !== []
) || (($resultTurnRaw['command'] ?? null) === $command->getName()
&& ( && (
($preReqTurn === 0 && $resultTerm === 0) ($preReqTurn === 0 && $resultTerm === 0)
|| ( || (
@@ -363,7 +372,7 @@ function comparisonRunTurnCommand(array $request): array
&& ($previousLastTurnRaw['command'] ?? null) === $command->getName() && ($previousLastTurnRaw['command'] ?? null) === $command->getName()
&& (int)($previousLastTurnRaw['term'] ?? 0) === $preReqTurn && (int)($previousLastTurnRaw['term'] ?? 0) === $preReqTurn
) )
); ));
return [ return [
'schemaVersion' => 1, 'schemaVersion' => 1,