From 465ee06b7c55772cdf1d643be335520e879a056d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 19 Oct 2026 14:20:54 +0800 Subject: [PATCH] =?UTF-8?q?test(phase-3):=203C=20=E5=BF=AB=E7=85=A7?= =?UTF-8?q?=E8=87=AA=E6=88=91=E6=9B=B4=E6=AD=A3=E2=80=94=E2=80=94selectByI?= =?UTF-8?q?d=20=E6=94=B9=E6=88=90=E6=8C=89=E4=B8=BB=E9=94=AE=E5=8F=96?= =?UTF-8?q?=EF=BC=8C=E5=88=AB=E5=86=8D=E6=8B=BF=E6=9B=BF=E8=BA=AB=E7=9A=84?= =?UTF-8?q?=E5=BD=A2=E7=8A=B6=E5=BD=93=E7=8E=B0=E7=BD=91=E8=AF=AD=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上一笔 c4cf7bab 的 invalidTaskIdFallsThroughToNotFound 那格没有证到它在 message 里 声称的东西:替身写的是「selectById(any()) 一律返回那只内存任务」,于是 taskId=0 一路 跑完了整条 happy path,golden 里那 20 行证的是**测试替身的形状**,不是现网语义。 而 commit message 与用例名都写着「非法 id 一路走到『任务不存在』」——那句当时并不成立。 改法:selectById 按主键取行(Objects.equals(id, TASK_ID) ? task : null),非法 id 在 锁外预检就得到「任务不存在」;用例改名 invalidTaskIdRejectedAsNotFound。 现在那一格读出来是 task.load id=0 status=- / thrown code=- message=任务不存在 / lockAcquire=0 outsideLock=0 —— 这支没有 requireTaskId 那一格这件事,第一次被真证住。 其余 14 段 case 逐字节未动(diff 只有这一格),说明替身收紧没有波及其他形状。 门禁:CollectDataSubmitResultSnapshotTest 5 例(写模式)+非写模式复跑 4 passed/1 skipped, golden 跨两个 JVM 逐字节相同。 --- .../CollectDataSubmitResultSnapshotTest.java | 15 ++++++----- .../golden/submit-result-snapshot.txt | 26 +++---------------- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/collectdata/service/support/CollectDataSubmitResultSnapshotTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/collectdata/service/support/CollectDataSubmitResultSnapshotTest.java index ca1927324..f7673313e 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/collectdata/service/support/CollectDataSubmitResultSnapshotTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/collectdata/service/support/CollectDataSubmitResultSnapshotTest.java @@ -230,10 +230,13 @@ class CollectDataSubmitResultSnapshotTest { }).when(payloadStorage).deletePayloadIfPresent(anyString()); when(fileTaskMapper.selectById(any())).thenAnswer(invocation -> { - f.events.add("task.load id=" + invocation.getArgument(0) + " status=" - + dash(f.task == null ? null : f.task.getStatus()) + " module=" - + dash(f.task == null ? null : f.task.getModuleType())); - return f.task; + // 内存任务表按主键取:写 `return f.task` 会让「非法 taskId」这一格证的是替身的形状, + // 不是现网语义(现网 selectById(0) 查不到行 ⇒ 走「任务不存在」)。 + Object id = invocation.getArgument(0); + FileTaskEntity loaded = java.util.Objects.equals(id, TASK_ID) ? f.task : null; + f.events.add("task.load id=" + id + " status=" + dash(loaded == null ? null : loaded.getStatus()) + + " module=" + dash(loaded == null ? null : loaded.getModuleType())); + return loaded; }); doAnswer(invocation -> { FileTaskEntity task = invocation.getArgument(0); @@ -529,8 +532,8 @@ class CollectDataSubmitResultSnapshotTest { busy.lockAvailable = false; appendCase(sb, "lockBusyRejected", busy, TASK_ID, request(1, 2, false, null, rawRow("B024", "kw-n"))); - // 14. taskId 非法:这支没做「taskId 不合法」那格校验——非法 id 走的是「任务不存在」 - appendCase(sb, "invalidTaskIdFallsThroughToNotFound", running("RUNNING"), 0L, + // 14. taskId 非法:这支压根没有「taskId 不合法」那一格,非法 id 在锁外预检得到的是「任务不存在」 + appendCase(sb, "invalidTaskIdRejectedAsNotFound", running("RUNNING"), 0L, request(1, 2, false, null, rawRow("B025", "kw-o"))); return sb.toString(); diff --git a/backend-java/src/test/resources/collectdata/golden/submit-result-snapshot.txt b/backend-java/src/test/resources/collectdata/golden/submit-result-snapshot.txt index 8d64eef54..c11c5c019 100644 --- a/backend-java/src/test/resources/collectdata/golden/submit-result-snapshot.txt +++ b/backend-java/src/test/resources/collectdata/golden/submit-result-snapshot.txt @@ -244,27 +244,9 @@ lock.acquire taskId=1001 waitMillis=5000 -> busy thrown: BusinessException code=40902 message=任务正在处理,请稍后再试 counters lockAcquire=1 outsideLock=4 taskUpdate=0 resultUpdate=0 resultInsert=0 chunkInsert=0 scopeWrite=0 jobEnqueue=0 -== case=invalidTaskIdFallsThroughToNotFound +== case=invalidTaskIdRejectedAsNotFound storage.ensure sharedWrite=true -task.load id=0 status=RUNNING module=COLLECT_DATA -outsideLock filter rows=1 owner=7 dedupe=0 invalid=0 -outsideLock brandFilter accepted=1 rejected=0 queryFailed=0 -outsideLock asinCache.write country=- taskId=0 rows=1 -outsideLock recheck.enqueue n=0 -lock.acquire taskId=0 waitMillis=5000 -task.load id=0 status=RUNNING module=COLLECT_DATA -result.selectOne -> id=2001 -chunk.selectOne -> none -payload.storeResult key=chunk-1 len=127 hash=291c0ca80f2c -resultItem.upsert chunk=1 accepted=1 ref=rustfs:result-chunk-1 -payload.storeChunk idx=1 len=127 hash=291c0ca80f2c -chunk.insert scope=sub-1 idx=1/2 payload=rustfs:chunk-1 payloadHash=291c0ca80f2cd6a87cff2dad9e7dbf122f6111e9dc930c0f8dcbcc7f74bf8f46 -scope.selectOne -> none -chunk.count -> 0 -scope.insert chunkTotal=2 received=0 completed=0 lastError=- stateJson={"phase":"RECEIVED"} -task.update id=1001 status=RUNNING errorMessage=- successFileCount=- failedFileCount=- finishedAt=- resultJson.len=333 resultJson.hash=2f13867b410c -task.load id=0 status=RUNNING module=COLLECT_DATA -thrown: none -vo: taskId=1001 resultId=2001 chunk=1/2 done=false receivedRows=1 currentChunkRows=1 dedupeFiltered=0 invalidFiltered=0 brandRejected=0 brandQueryFailed=0 finalRows=1 taskStatus=RUNNING -counters lockAcquire=1 outsideLock=4 taskUpdate=1 resultUpdate=0 resultInsert=0 chunkInsert=1 scopeWrite=1 jobEnqueue=0 +task.load id=0 status=- module=- +thrown: BusinessException code=- message=任务不存在 +counters lockAcquire=0 outsideLock=0 taskUpdate=0 resultUpdate=0 resultInsert=0 chunkInsert=0 scopeWrite=0 jobEnqueue=0