diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java index c905da090..6d0016d51 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -277,6 +278,97 @@ class CatchSilenceRatchetTest { System.out.println("DECOY_END"); } + // ==== §2 后端「静默出口成片」那行的**另一半**:三类出口必须含 throw 或显式锚点 ==== + + /** + * 任务书这一行写的是两件事:①扫描器进测试做只许减棘轮(上面那批用例);②回传/落库/扣次数 + * 三类必须含 throw 或显式锚点。②从来没被测过——{@code Site.hasAnchor()} 在扫描器里 + * 躺了几天、一个调用者都没有,而那行格子一直按"达标"计。现在把它做成真判据。 + * + *

锚点约定是 ASCII 的 {@code [tag]}:扫描器的正则是 + * {@code \[[A-Za-z0-9_.-]{3,}\]},中文方括号标签根本匹配不上。任务书里写的 + * {@code [静默降级]} 属**命名与代码不一致**,这里按代码为准,锚点用 {@code [silent-degrade]}。 + * + *

台账逐处按文件点名(只钉总数=允许"内部搬家"绕过,见本仓反复出现的那族错误)。 + */ + @Test + void threeCategoriesMustRethrowOrCarryAnchor() { + Map gap = gapLedger(tree().sites()); + assertEquals(GAP_LEDGER, gap, () -> "三类静默出口台账变了:实测 " + gap + + "(合计 " + gap.values().stream().mapToInt(Integer::intValue).sum() + ")" + + "。新增要逐处记名,收掉要连这个常量一起降。"); + assertFalse(gap.isEmpty(), "台账是空的 ⇒ 三类里一处静默出口都没扫到,这条判据恒真"); + } + + /** + * 注入自证:四种形状要判出三种结果——带 throw 放过、带锚点放过、两者都没有才记缺口, + * 无关类别连进名单都不许进。没有这条,上面那个 assertEquals 可能是"扫描器什么都不返回"的假绿。 + */ + @Test + void anchorAndThrowBothCloseTheGapOnlyWhenActuallyPresent() { + Map src = new LinkedHashMap<>(); + src.put("Feed.java", "class T { void f() { try { report(feed); } " + + "catch (Exception e) { log.warn(\"feed down\"); } } }"); + src.put("Anchored.java", "class T { void f() { try { report(feed); } " + + "catch (Exception e) { log.warn(\"[silent-degrade] feed down\"); } } }"); + src.put("Throwing.java", "class T { void f() { try { report(feed); } " + + "catch (Exception e) { throw new IllegalStateException(e); } } }"); + src.put("Unrelated.java", "class T { void f() { try { socket.close(); } " + + "catch (Exception e) { log.warn(\"x\"); } } }"); + Map gap = gapLedger(SilentCatchScanner.scanSources(src).sites()); + assertEquals(Map.of("Feed.java", 1), gap, + () -> "只该抓到『既没 throw 也没锚点』的那一处,实抓 " + gap); + } + + /** + * 三类判据:块体里出现这些字样才算回传/落库/扣次数的出口。 + * 名单刻意窄——宁可少收,也不把无关 catch 卷进台账(卷进来会让"只许减"变成没人敢动的死数)。 + */ + private static final Map CATEGORY = Map.of( + "回传", java.util.regex.Pattern.compile("回传|report|feed|Result|notify|Notify"), + "落库", java.util.regex.Pattern.compile("\\.save\\(|\\.insert|\\.update|Mapper|Repository|updateById"), + "扣次数", java.util.regex.Pattern.compile("次数|deduct|Deduct|usage|Usage|refund|Refund|balance|Balance")); + + /** + * 三类里"既没重抛也没锚点"的那些 catch,按文件计数。 + * + *

RETHROW 直接排除(那正是我们要的形状);锚点判定走 {@link Site#hasAnchor()}, + * 它看的是 rawBody——{@code body} 剥过注释,会把字符串里的 {@code [tag]} 一起剥掉, + * 于是"打了锚点"反而判成没锚点(扫描器 javadoc 里记着这条,别改回去)。 + */ + private static Map gapLedger(List sites) { + Map out = new java.util.TreeMap<>(); + for (Site s : sites) { + if (s.kind() == Kind.RETHROW) { + continue; + } + boolean hit = false; + for (java.util.regex.Pattern p : CATEGORY.values()) { + if (p.matcher(s.rawBody()).find()) { + hit = true; + break; + } + } + if (hit && !s.hasAnchor()) { + out.merge(s.file(), 1, Integer::sum); + } + } + return out; + } + + /** 10-09 实测基线:三类里"吞掉且没有锚点"的 11 处(按文件点名)。收掉一处就往下改。 */ + private static final Map GAP_LEDGER = Map.ofEntries( + Map.entry("com/nanri/aiimage/modules/convert/service/ConvertRunService.java", 1), + Map.entry("com/nanri/aiimage/modules/dedupe/service/DedupeRunService.java", 2), + Map.entry("com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java", 1), + Map.entry("com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java", 1), + Map.entry("com/nanri/aiimage/modules/deletebrand/service/DeleteBrandTaskStorageService.java", 1), + Map.entry("com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java", 1), + Map.entry("com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java", 1), + Map.entry("com/nanri/aiimage/modules/similarasin/service/SimilarAsinImagePrefetchService.java", 1), + Map.entry("com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinPipelineSupport.java", 1), + Map.entry("com/nanri/aiimage/modules/split/service/SplitRunService.java", 1)); + private static Map readTree() { Map out = new LinkedHashMap<>(); try (var walk = Files.walk(TREE)) {