diff --git a/spec/verificateur/verificateur.spec.ts b/spec/verificateur/verificateur.spec.ts index 7901fe643c1d622408b8af6537c3c110834ddff0..385366ad4e509faa57bc94e171f159ebc2a43b1a 100644 --- a/spec/verificateur/verificateur.spec.ts +++ b/spec/verificateur/verificateur.spec.ts @@ -542,9 +542,11 @@ describe("vérificateur de franchissement −", () => { // les 2 premières modalités devraient tiquer sur HMin seulement (pas de jet de surface) for (let i = 0; i < 2; i++) { const r = esp.result.resultElements[i] - expect(r.log.messages.length).toBe(1); // DHMaxS, BMin, PMinS, LMinS, HMin + expect(r.log.messages.length).toBe(2); // DHMaxS, BMin, PMinS, LMinS, HMin expect(r.log.messages[0].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION); expect(r.log.messages[0].extraVar.var_criterion).toBe("HMin"); + expect(r.log.messages[1].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION); + expect(r.log.messages[1].extraVar.var_criterion).toBe("BMin"); } // les 2 dernières modalités devraient tiquer sur HMin, DHMaxS, BMin, PMinS, LMinS, HMin for (let i = 2; i < 4; i++) { @@ -553,9 +555,9 @@ describe("vérificateur de franchissement −", () => { expect(r.log.messages[0].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION); expect(r.log.messages[0].extraVar.var_criterion).toBe("HMin"); expect(r.log.messages[1].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION); - expect(r.log.messages[1].extraVar.var_criterion).toBe("DHMaxS"); + expect(r.log.messages[1].extraVar.var_criterion).toBe("BMin"); expect(r.log.messages[2].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION); - expect(r.log.messages[2].extraVar.var_criterion).toBe("BMin"); + expect(r.log.messages[2].extraVar.var_criterion).toBe("DHMaxS"); expect(r.log.messages[3].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION); expect(r.log.messages[3].extraVar.var_criterion).toBe("PMinS"); expect(r.log.messages[4].code).toBe(MessageCode.ERROR_VERIF_MISSING_CRITERION); diff --git a/src/verification/espece.ts b/src/verification/espece.ts index 24178f21ba52ba7586608625ca53e8d9a0186859..f6f917801171636a548c915ff9196cf1de91f661 100644 --- a/src/verification/espece.ts +++ b/src/verification/espece.ts @@ -422,9 +422,9 @@ export class Espece extends Nub implements Observer { hasAtLeastOneDivingJet = hasAtLeastOneDivingJet || this.hasJet(passB.downWall, StructureJetType.PLONGEANT); let cpRetPAB: Result; - let criteriaToCheck: string[] = [ /* "PVMaxPrec", "PVMaxLim", */ "HMin" ]; + let criteriaToCheck: string[] = [ /* "PVMaxPrec", "PVMaxLim", */ "HMin", "BMin" ]; if (hasAtLeastOneSurfaceJet) { - criteriaToCheck = criteriaToCheck.concat([ "DHMaxS", "BMin", "PMinS", "LMinS" ]); + criteriaToCheck = criteriaToCheck.concat([ "DHMaxS", "PMinS", "LMinS" ]); } if (hasAtLeastOneDivingJet && this.divingJetSupported === DivingJetSupport.SUPPORTED) { criteriaToCheck = criteriaToCheck.concat([ "DHMaxP", "PMinP", "LMinP" ]);