From 5a9b85e821d3416f545caf694b6464b42675c6e7 Mon Sep 17 00:00:00 2001
From: hided62 <hided62@gmail.com>
Date: Sun, 26 Jul 2026 23:03:29 +0000
Subject: [PATCH] test conflict-arbitrated city conquest

---
 .../turnCommandCoreReference.integration.test.ts    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/integration-tests/test/turnCommandCoreReference.integration.test.ts b/tools/integration-tests/test/turnCommandCoreReference.integration.test.ts
index c3202ba..e3efbb2 100644
--- a/tools/integration-tests/test/turnCommandCoreReference.integration.test.ts
+++ b/tools/integration-tests/test/turnCommandCoreReference.integration.test.ts
@@ -84,6 +84,7 @@ integration('core ↔ legacy command-boundary differential', () => {
         ['live sortie supply retreat', 'fixtures/turn-differential/live-sortie-supply-retreat.json'],
         ['live sortie noncapital conquest', 'fixtures/turn-differential/live-sortie-noncapital-conquest.json'],
         ['live sortie emergency capital', 'fixtures/turn-differential/live-sortie-emergency-capital.json'],
+        ['live sortie conflict arbitration', 'fixtures/turn-differential/live-sortie-conflict-arbitration.json'],
     ])(
         '%s matches command RNG and canonical state delta',
         async (_label, fixturePath) => {
@@ -133,6 +134,18 @@ integration('core ↔ legacy command-boundary differential', () => {
                 });
                 expect(reference.after.cities.find((city) => city.id === 71)?.supplyState).toBe(1);
             }
+            if (fixturePath.endsWith('live-sortie-conflict-arbitration.json')) {
+                expect(reference.before.cities.find((city) => city.id === 70)?.conflict).toEqual({ 3: 10_000 });
+                expect(reference.after.cities.find((city) => city.id === 70)).toMatchObject({
+                    nationId: 3,
+                    conflict: {},
+                });
+                expect(reference.after.generals.find((general) => general.id === 1)?.cityId).toBe(3);
+                const arbitrationLogs = reference.after.logs.filter(
+                    (log) => (Number(log.id) || 0) > reference.before.watermarks.historyLogId
+                );
+                expect(arbitrationLogs.some((log) => String(log.text).includes('【분쟁협상】'))).toBe(true);
+            }
 
             expect(core.execution.outcome).toMatchObject({
                 requestedAction: request.action,